diff --git a/src/main/java/com/iflytop/handacid/app/common/utils/UsbDriverUtil.java b/src/main/java/com/iflytop/handacid/app/common/utils/UsbDriverUtil.java index 6eb59d2..7ad6389 100644 --- a/src/main/java/com/iflytop/handacid/app/common/utils/UsbDriverUtil.java +++ b/src/main/java/com/iflytop/handacid/app/common/utils/UsbDriverUtil.java @@ -5,6 +5,7 @@ import java.io.File; public class UsbDriverUtil { /** * 查找 win U盘路径 + * * @return U盘路径,如果找不到返回null */ public static String findWinPath() { @@ -12,7 +13,7 @@ public class UsbDriverUtil { File[] roots = File.listRoots(); for (File root : roots) { // 检查是否为可移动驱动器(U盘) - if (root.getTotalSpace() > 0 && root.getTotalSpace() < 64L * 1024 * 1024 * 1024) { // 小于64GB认为是U盘 + if (root.getTotalSpace() > 0 && root.getTotalSpace() > 32L * 1024 * 1024 * 1024) { // 大于64GB认为是U盘 String rootPath = root.getAbsolutePath(); // 检查是否可写 if (root.canWrite()) { @@ -25,9 +26,10 @@ public class UsbDriverUtil { /** * 查找Linux U盘路径 + * * @return U盘路径,如果找不到返回null */ - public static String findLinuxPath(){ + public static String findLinuxPath() { // Linux/Mac系统查找/media或/run/media下的可移动设备 String[] mediaPaths = {"/media", "/run/media"}; for (String mediaPath : mediaPaths) { diff --git a/src/main/java/com/iflytop/handacid/app/controller/AuditRecordController.java b/src/main/java/com/iflytop/handacid/app/controller/AuditRecordController.java index c5bfc4a..3f46e95 100644 --- a/src/main/java/com/iflytop/handacid/app/controller/AuditRecordController.java +++ b/src/main/java/com/iflytop/handacid/app/controller/AuditRecordController.java @@ -1,5 +1,6 @@ package com.iflytop.handacid.app.controller; +import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.iflytop.handacid.app.common.utils.UsbDriverUtil; import com.iflytop.handacid.common.base.BasePageQuery; @@ -46,7 +47,9 @@ public class AuditRecordController { @PostMapping("/page") @Operation(summary = "获取分页数据") public PageResult getPage(BasePageQuery query) { - return PageResult.success(auditRecordService.page(new Page<>(query.getPageNum(), query.getPageSize()))); + Page page = new Page<>(query.getPageNum(), query.getPageSize()); + page.addOrder(OrderItem.desc("id")); + return PageResult.success(auditRecordService.page(page)); } @GetMapping("/{id}") diff --git a/src/main/java/com/iflytop/handacid/app/controller/ReceiveRecordController.java b/src/main/java/com/iflytop/handacid/app/controller/ReceiveRecordController.java index ecc5f2a..ee03a52 100644 --- a/src/main/java/com/iflytop/handacid/app/controller/ReceiveRecordController.java +++ b/src/main/java/com/iflytop/handacid/app/controller/ReceiveRecordController.java @@ -1,8 +1,10 @@ package com.iflytop.handacid.app.controller; +import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.iflytop.handacid.app.common.utils.UsbDriverUtil; import com.iflytop.handacid.common.base.BasePageQuery; +import com.iflytop.handacid.common.model.entity.AuditRecord; import com.iflytop.handacid.common.model.entity.ReceiveRecord; import com.iflytop.handacid.common.result.PageResult; import com.iflytop.handacid.common.result.Result; @@ -44,7 +46,9 @@ public class ReceiveRecordController { @PostMapping("/page") @Operation(summary = "获取分页数据") public PageResult getPage(@RequestBody BasePageQuery query) { - return PageResult.success(receiveRecordService.page(new Page<>(query.getPageNum(), query.getPageSize()))); + Page page = new Page<>(query.getPageNum(), query.getPageSize()); + page.addOrder(OrderItem.desc("id")); + return PageResult.success(receiveRecordService.page(page)); } @GetMapping("/{id}")