From c772c9cd81611ae637de74c0f3e2fc3f90ea8c07 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Mon, 2 Feb 2026 16:36:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E7=89=88bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/njcn/common/pojo/constant/PatternRegex.java | 2 +-
 .../njcn/device/pq/mapper/mapping/PqsTransformerMapper.xml    | 3 ++-
 .../njcn/device/pq/service/impl/PqsTflgployServiceImpl.java   | 4 ++--
 .../device/service/impl/TerminalVersionServiceImpl.java       | 2 +-
 .../com/njcn/device/line/mapper/mapping/LineDetailMapper.xml  | 2 +-
 .../java/com/njcn/device/line/mapper/mapping/LineMapper.xml   | 3 ++-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java
index c4b6a6224..3fa22b1e4 100644
--- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java
+++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java
@@ -258,7 +258,7 @@ public interface PatternRegex {
     /**
      * 任意字符，长度在1-20位，常用于名称、编码等常规录入
      */
-    String ALL_CHAR_1_20 = "^[-_A-Za-z0-9\\u4e00-\\u9fa5]{1,20}$";
+    String ALL_CHAR_1_20 = "^[-_A-Za-z0-9\\u4e00-\\u9fa5]{1,32}$";
 
     String SPECIALCHARACTER ="[<>%'%;()&+/\\\\-\\\\\\\\_|@*?#$!,.]|html";
 
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqsTransformerMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqsTransformerMapper.xml
index 064b0c61d..74d016264 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqsTransformerMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqsTransformerMapper.xml
@@ -15,6 +15,7 @@
             STATUS = 1
     </select>
     <select id="sortTransformer" resultType="java.lang.Integer">
-        select IFNULL(max(pqs_transformer.sort),0) from pqs_transformer order by update_time desc
+        select IFNULL(max(pqs_transformer.sort),0) from pqs_transformer
+<!--        order by update_time desc-->
     </select>
 </mapper>
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsTflgployServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsTflgployServiceImpl.java
index 997d5d7d8..f20a776b5 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsTflgployServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsTflgployServiceImpl.java
@@ -119,7 +119,7 @@ public class PqsTflgployServiceImpl extends ServiceImpl<PqsTflgployMapper, PqsTf
     }
 
     private void addList(TflgployParam param, PqsTflgploy tflgploy, boolean save, List<PqsTflgployass> info) {
-        if(save){
+//        if(save){
             List<String> tfIndexs = param.getTfIndexs();
             if(CollUtil.isNotEmpty(tfIndexs)){
                 PqsTflgployass ass;
@@ -129,7 +129,7 @@ public class PqsTflgployServiceImpl extends ServiceImpl<PqsTflgployMapper, PqsTf
                     ass.setTfIndex(tfIndex);
                     info.add(ass);
                 }
-            }
+//            }
 
         }
     }
diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/TerminalVersionServiceImpl.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/TerminalVersionServiceImpl.java
index 46fc0b327..6d4f8bd4f 100644
--- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/TerminalVersionServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/TerminalVersionServiceImpl.java
@@ -38,7 +38,7 @@ public class TerminalVersionServiceImpl implements TerminalVersionService {
 
         List<TerminalVersionVO> devList = terminalVersionMapper.getTerminalVersionInfo(terminalMainQueryParam);
         if(CollectionUtil.isEmpty(devList)){
-            throw new BusinessException(DeviceResponseEnum.DEVICE_EMPTY);
+            return devList;
         }
         List<String> subIndexes = devList.stream().map(TerminalVersionVO::getPid).collect(Collectors.toList());
         List<TerminalVersionVO> subList =terminalVersionMapper.getPqLineGdAndSubList(subIndexes);
diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineDetailMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineDetailMapper.xml
index 610c44294..b3f4aab7b 100644
--- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineDetailMapper.xml
+++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineDetailMapper.xml
@@ -43,7 +43,7 @@
         a.name lineName,
         c.Time_Interval,
         d.Scale AS scale,
-        c.Obj_Id obyId,
+        c.Obj_Id objId,
         c.Big_Obj_Type bigObjType
         from pq_line a
         inner join pq_line b on a.pid = b.id
diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml
index 0a448d6f2..9a1f0b077 100644
--- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml
+++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml
@@ -1269,7 +1269,8 @@
         SELECT
             voltage.id as id,
             sub.id as pid,
-            concat( sub.NAME, " ", voltage.NAME )  as name,
+<!--        兼容国产数据库-->
+            concat( sub.NAME, ' ', voltage.NAME )  as name,
             voltage.Sort as sort
         FROM
             pq_line voltage