终端重要日志功能开发

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<LineMapper, Line> 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());

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)

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

pqs-harmonic/harmonic-boot/src/main/resources/com/njcn/harmonic/mapper/mapping/PmsTemProcessApprovalMapper.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.harmonic.mapper.upload.PmsTemProcessApprovalMapper">
-
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    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
-  </sql>
-</mapper>