From f7fb8d036a558477f32f435c21c9b89de80d5d7a Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Thu, 10 Apr 2025 10:24:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=88=E7=AB=AF=E9=87=8D=E8=A6=81=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pq/service/impl/TerminalBaseServiceImpl.java | 2 +- .../harmonic/controller/HistoryResultController.java | 2 +- .../harmonic-boot/src/main/resources/bootstrap.yml | 4 ++-- .../mapper/mapping/PmsTemProcessApprovalMapper.xml | 11 ----------- 4 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 pqs-harmonic/harmonic-boot/src/main/resources/com/njcn/harmonic/mapper/mapping/PmsTemProcessApprovalMapper.xml diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java index 25a731383..6bddd5cd7 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java @@ -3732,7 +3732,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple if (flag) { PqsTerminalLogs pqsTerminalLogs = new PqsTerminalLogs(); - pqsTerminalLogs.setOperateType(Param.UPDATE_ZN); + pqsTerminalLogs.setOperateType(Param.UPDATE); pqsTerminalLogs.setTerminalType(DEVICE_LEVEL.getCode()); pqsTerminalLogs.setState(DataStateEnum.ENABLE.getCode()); pqsTerminalLogs.setObjIndex(devicePO.getId()); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HistoryResultController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HistoryResultController.java index aa598b15c..6f35ef862 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HistoryResultController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HistoryResultController.java @@ -53,7 +53,7 @@ public class HistoryResultController extends BaseController { private final IRStatLimitRateDService limitRateDService; private final OracleResultService oracleResultService; - @Value("${History.DataSource}") + @Value("${History.DataSource:0}") private Integer HistoryDataSource; @OperateInfo(info = LogEnum.BUSINESS_COMMON) diff --git a/pqs-harmonic/harmonic-boot/src/main/resources/bootstrap.yml b/pqs-harmonic/harmonic-boot/src/main/resources/bootstrap.yml index db9f602b3..19cb511ff 100644 --- a/pqs-harmonic/harmonic-boot/src/main/resources/bootstrap.yml +++ b/pqs-harmonic/harmonic-boot/src/main/resources/bootstrap.yml @@ -35,8 +35,8 @@ spring: - data-id: share-config.yaml refresh: true #数据中心使用 -# - data-Id: share-config-datasource-db.yaml -# refresh: true + #- data-Id: share-config-datasource-db.yaml + # refresh: true #PMS使用 - data-Id: share-config-harmonic-db.yaml refresh: true diff --git a/pqs-harmonic/harmonic-boot/src/main/resources/com/njcn/harmonic/mapper/mapping/PmsTemProcessApprovalMapper.xml b/pqs-harmonic/harmonic-boot/src/main/resources/com/njcn/harmonic/mapper/mapping/PmsTemProcessApprovalMapper.xml deleted file mode 100644 index 5b8dd5395..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/resources/com/njcn/harmonic/mapper/mapping/PmsTemProcessApprovalMapper.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - obj_id, temp_user_dossier_id, approval_join_user_id, approval_join_user_name, approval_advise, - create_time, update_time, legacy_problem, rectification_status, rectification_time, - rectification_user_id, rectification_user_name, rectification_measure - - \ No newline at end of file