微调

detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java

@@ -1435,11 +1435,11 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
         DictType dictType = dictTypeService.getByCode(EX_FACTORY_DEV_TYPE);
         if (ObjectUtil.isNotNull(dictType)) {
             List<DictData> dictDataList = dictDataService.getDictDataByTypeId(dictType.getId());
-            DictData targetDictData = dictDataList.stream().filter(dictData -> dictData.getCode().equals(pqDevVO.getDevType())).findFirst().orElse(null);
+            DictData targetDictData = dictDataList.stream().filter(dictData -> dictData.getCode().equals(devType.getName())).findFirst().orElse(null);
             if (ObjectUtil.isNotNull(targetDictData)) {
                 String name = devType.getName();
-                name = name.substring(0, name.lastIndexOf(StrUtil.C_UNDERLINE));
+                name = name.substring(0, name.lastIndexOf(StrUtil.DASHED));
-                baseModelMap.put(prefix + BaseReportKeyEnum.DEV_TYPE.getKey() + suffix, name + "(" + targetDictData.getCode() + ")");
+                baseModelMap.put(prefix + BaseReportKeyEnum.DEV_TYPE.getKey() + suffix, name + "(" + targetDictData.getValue() + ")");
             }
         }
 

entrance/src/main/resources/application.yml

@@ -6,12 +6,12 @@ spring:
   datasource:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://192.168.1.24:13306/pqs9100_bj?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
+#      url: jdbc:mysql://192.168.1.24:13306/pqs91002?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
+#      username: root
+#      password: njcnpqs
+      url: jdbc:mysql://192.168.1.24:13306/pqs9100_2f?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
       username: root
       password: njcnpqs
-#      url: jdbc:mysql://localhost:3306/pqs91001?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=CTT
-#      username: root
-#      password: root
       #初始化建立物理连接的个数、最小、最大连接数
       initial-size: 5
       min-idle: 5
@@ -49,10 +49,10 @@ phaseAngle:
 
 socket:
   source:
-    ip: 192.168.1.125
+    ip: 127.0.0.1
     port: 62000
   device:
-    ip: 192.168.1.125
+    ip: 127.0.0.1
     port: 61000
 #  source:
 #    ip: 192.168.1.121