diff --git a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java index d8f320b1..5caa5f50 100644 --- a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java @@ -1435,11 +1435,11 @@ public class PqReportServiceImpl extends ServiceImpl i DictType dictType = dictTypeService.getByCode(EX_FACTORY_DEV_TYPE); if (ObjectUtil.isNotNull(dictType)) { List 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)); - baseModelMap.put(prefix + BaseReportKeyEnum.DEV_TYPE.getKey() + suffix, name + "(" + targetDictData.getCode() + ")"); + name = name.substring(0, name.lastIndexOf(StrUtil.DASHED)); + baseModelMap.put(prefix + BaseReportKeyEnum.DEV_TYPE.getKey() + suffix, name + "(" + targetDictData.getValue() + ")"); } } diff --git a/entrance/src/main/resources/application.yml b/entrance/src/main/resources/application.yml index 0738c7cf..6baa8ae2 100644 --- a/entrance/src/main/resources/application.yml +++ b/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 diff --git a/entrance/src/main/resources/model/NPQS-580.docx b/entrance/src/main/resources/model/NPQS-580.docx index 361c6c5c..651907e1 100644 Binary files a/entrance/src/main/resources/model/NPQS-580.docx and b/entrance/src/main/resources/model/NPQS-580.docx differ diff --git a/entrance/src/main/resources/model/NPQS680.docx b/entrance/src/main/resources/model/NPQS680.docx index fb8e7730..aaddbfe4 100644 Binary files a/entrance/src/main/resources/model/NPQS680.docx and b/entrance/src/main/resources/model/NPQS680.docx differ diff --git a/entrance/src/main/resources/model/PQ-COM.docx b/entrance/src/main/resources/model/PQ-COM.docx index a421ec07..5ee5f840 100644 Binary files a/entrance/src/main/resources/model/PQ-COM.docx and b/entrance/src/main/resources/model/PQ-COM.docx differ diff --git a/entrance/src/main/resources/model/PQV-700.docx b/entrance/src/main/resources/model/PQV-700.docx index a230d05e..8af5ad8e 100644 Binary files a/entrance/src/main/resources/model/PQV-700.docx and b/entrance/src/main/resources/model/PQV-700.docx differ diff --git a/entrance/src/main/resources/model/njcn_882.docx b/entrance/src/main/resources/model/njcn_882.docx index 96aaf094..99bd3781 100644 Binary files a/entrance/src/main/resources/model/njcn_882.docx and b/entrance/src/main/resources/model/njcn_882.docx differ diff --git a/entrance/src/main/resources/model/njcn_882A.docx b/entrance/src/main/resources/model/njcn_882A.docx index 13ad3073..0d2912d0 100644 Binary files a/entrance/src/main/resources/model/njcn_882A.docx and b/entrance/src/main/resources/model/njcn_882A.docx differ diff --git a/entrance/src/main/resources/model/njcn_882B1.docx b/entrance/src/main/resources/model/njcn_882B1.docx index 895a3b2f..3baba57d 100644 Binary files a/entrance/src/main/resources/model/njcn_882B1.docx and b/entrance/src/main/resources/model/njcn_882B1.docx differ diff --git a/entrance/src/main/resources/model/njcn_882B2.docx b/entrance/src/main/resources/model/njcn_882B2.docx index 19fb0a78..312aa679 100644 Binary files a/entrance/src/main/resources/model/njcn_882B2.docx and b/entrance/src/main/resources/model/njcn_882B2.docx differ diff --git a/entrance/src/main/resources/model/njcn_882B3.docx b/entrance/src/main/resources/model/njcn_882B3.docx index cc155213..c5843c6a 100644 Binary files a/entrance/src/main/resources/model/njcn_882B3.docx and b/entrance/src/main/resources/model/njcn_882B3.docx differ diff --git a/entrance/src/main/resources/model/njcn_882B4.docx b/entrance/src/main/resources/model/njcn_882B4.docx index 0c7d191c..fd664180 100644 Binary files a/entrance/src/main/resources/model/njcn_882B4.docx and b/entrance/src/main/resources/model/njcn_882B4.docx differ diff --git a/entrance/src/main/resources/model/njcn_882B5.docx b/entrance/src/main/resources/model/njcn_882B5.docx index 8758bc59..05a21b9d 100644 Binary files a/entrance/src/main/resources/model/njcn_882B5.docx and b/entrance/src/main/resources/model/njcn_882B5.docx differ diff --git a/entrance/src/main/resources/model/njcn_882B6.docx b/entrance/src/main/resources/model/njcn_882B6.docx index 326f7874..a0616806 100644 Binary files a/entrance/src/main/resources/model/njcn_882B6.docx and b/entrance/src/main/resources/model/njcn_882B6.docx differ