From cd78ad0588a9efa91e1c88f6a7e842d807e1ab14 Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Thu, 9 Jan 2025 10:34:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/device/pojo/param/PqDevParam.java  |  2 +-
 .../device/service/impl/PqDevServiceImpl.java | 21 +++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java b/device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java
index a619be27..22119ac3 100644
--- a/device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java
+++ b/device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java
@@ -174,7 +174,7 @@ public class PqDevParam {
     @EqualsAndHashCode(callSuper = true)
     public static class QueryParam extends BaseParam {
         @ApiModelProperty("名称")
-        //@Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = DevValidMessage.NAME_FORMAT_ERROR)
+//        @Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = DevValidMessage.NAME_FORMAT_ERROR)
         private String name;
 
         @ApiModelProperty(value = "设备模式，字典表（数字、模拟、比对）")
diff --git a/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java b/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java
index e73c250c..91e6b545 100644
--- a/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java
+++ b/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java
@@ -224,7 +224,11 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
 
     @Override
     public List<Map<String, Object>> listUnbound(String pattern) {
-        List<PqDev> pqDevList = this.lambdaQuery().eq(PqDev::getPattern, pattern).eq(PqDev::getState, DataStateEnum.ENABLE.getCode()).isNull(PqDev::getPlanId).list();
+        List<PqDev> pqDevList = this.lambdaQuery()
+                .eq(PqDev::getPattern, pattern)
+                .eq(PqDev::getState, DataStateEnum.ENABLE.getCode())
+                .isNull(PqDev::getPlanId)
+                .orderByAsc(PqDev::getCreateTime).list();
         List<Map<String, Object>> result = pqDevList.stream().map(pqDev -> {
             Map<String, Object> map = new HashMap<>();
             map.put("id", pqDev.getId());
@@ -243,7 +247,9 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
                 .eq(ObjectUtil.isNotNull(param.getCheckResult()), PqDev::getCheckResult, param.getCheckResult())
                 .eq(ObjectUtil.isNotNull(param.getCheckResult()), PqDev::getCheckResult, param.getCheckResult())
                 .eq(ObjectUtil.isNotNull(param.getReportState()), PqDev::getReportState, param.getReportState())
-                .eq(PqDev::getState, DataStateEnum.ENABLE.getCode()).list();
+                .eq(PqDev::getState, DataStateEnum.ENABLE.getCode())
+                .orderByAsc(PqDev::getCreateTime)
+                .list();
 //        List<Map<String, Object>> result = pqDevList.stream().map(pqDev -> {
 //            Map<String, Object> map = new HashMap<>();
 //            map.put("id", pqDev.getId());
@@ -297,7 +303,10 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
 
     @Override
     public List<PqDev> listUnchecked() {
-        return this.lambdaQuery().eq(PqDev::getCheckState, CheckStateEnum.UNCHECKED.getValue()).eq(PqDev::getState, DataStateEnum.ENABLE.getCode()).list();
+        return this.lambdaQuery()
+                .eq(PqDev::getCheckState, CheckStateEnum.UNCHECKED.getValue())
+                .eq(PqDev::getState, DataStateEnum.ENABLE.getCode())
+                .orderByAsc(PqDev::getCreateTime).list();
     }
 
     @Override
@@ -411,11 +420,11 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
 
         for (PreDetection preDetection : preDetections) {
             List<PreDetection.MonitorListDTO> monitorList = preDetection.getMonitorList();
-            if(CollUtil.isEmpty(monitorList)){
+            if (CollUtil.isEmpty(monitorList)) {
                 PreDetection.MonitorListDTO monitorListDTO;
                 for (int i = 1; i <= preDetection.getDevChns(); i++) {
-                    monitorListDTO=new PreDetection.MonitorListDTO();
-                    monitorListDTO.setLineId(preDetection.getDevIP()+"_"+i);
+                    monitorListDTO = new PreDetection.MonitorListDTO();
+                    monitorListDTO.setLineId(preDetection.getDevIP() + "_" + i);
                     monitorListDTO.setLine(i);
                     monitorListDTO.setPt(1);
                     monitorListDTO.setPt(1);