diff --git a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/po/CarryCapacityResultPO.java b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/po/CarryCapacityResultPO.java
index 1a4a2c623..9940e9de6 100644
--- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/po/CarryCapacityResultPO.java
+++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/po/CarryCapacityResultPO.java
@@ -92,7 +92,7 @@ public class CarryCapacityResultPO extends BaseEntity {
     /**
      * 是否删除（0，无效，1有效）
      */
-    @TableField(value = "`status`")
+    @TableField(value = "status")
     private Integer status;
 
     @TableField(value = "evaluate_type")
diff --git a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/po/CarryCapacityStrategyDhlPO.java b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/po/CarryCapacityStrategyDhlPO.java
index 59f3ff800..cde889f6b 100644
--- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/po/CarryCapacityStrategyDhlPO.java
+++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/po/CarryCapacityStrategyDhlPO.java
@@ -31,7 +31,7 @@ public class CarryCapacityStrategyDhlPO extends BaseEntity {
     /**
      * 充电桩，电弧炉，电气化铁路
      */
-    @TableField(value = "`type`")
+    @TableField(value = "type")
     private String type;
 
     /**
diff --git a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/po/CarryCapacityStrategyPO.java b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/po/CarryCapacityStrategyPO.java
index 54cfbdc43..60d62bb9b 100644
--- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/po/CarryCapacityStrategyPO.java
+++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/po/CarryCapacityStrategyPO.java
@@ -22,7 +22,7 @@ public class CarryCapacityStrategyPO  extends BaseEntity {
     /**
      * 总承载能力评估结果（1-安全，2-III级预警，3-II级预警，4-I 级预警）
      */
-    @TableField(value = "`result`")
+    @TableField(value = "result")
     private Integer result;
 
     /**
@@ -40,7 +40,7 @@ public class CarryCapacityStrategyPO  extends BaseEntity {
     /**
      * 数量
      */
-    @TableField(value = "`count`")
+    @TableField(value = "count")
     private Integer count;
 
     /**
diff --git a/pqs-common/common-redis/src/main/java/com/njcn/redis/config/RedisConfig.java b/pqs-common/common-redis/src/main/java/com/njcn/redis/config/RedisConfig.java
index 8398a6a42..e9ff5b1a7 100644
--- a/pqs-common/common-redis/src/main/java/com/njcn/redis/config/RedisConfig.java
+++ b/pqs-common/common-redis/src/main/java/com/njcn/redis/config/RedisConfig.java
@@ -38,7 +38,7 @@ public class RedisConfig {
         Jackson2JsonRedisSerializer<Object> jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<>(Object.class);
         ObjectMapper objectMapper = new ObjectMapper();
         // 指定要序列化的域(field,get,set)，访问修饰符(public,private,protected)
-        //解决Java 8 date/time type `java.time.Instant` not supported
+        //解决Java 8 date/time type java.time.Instant not supported
         objectMapper.registerModule(new JavaTimeModule());
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         objectMapper.registerModule(new SimpleModule().addDeserializer(Instant.class, new InstantDateDeserializer()));
diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLedgerDeptClient.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLedgerDeptClient.java
index 43d1b37b8..190acb9bb 100644
--- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLedgerDeptClient.java
+++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLedgerDeptClient.java
@@ -3,16 +3,11 @@ package com.njcn.device.biz.commApi;
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.biz.commApi.fallback.CommLedgerDeptClientFallbackFactory;
-import com.njcn.device.biz.commApi.fallback.CommTerminalGeneralClientFallbackFactory;
-import com.njcn.device.biz.pojo.dto.*;
-import com.njcn.device.biz.pojo.param.DeptGetLineParam;
 import com.njcn.user.pojo.po.Dept;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLineClient.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLineClient.java
index ac671e7e3..773821822 100644
--- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLineClient.java
+++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLineClient.java
@@ -27,7 +27,7 @@ import java.util.List;
 public interface CommLineClient {
 
     /**
-     * @param id
+     * @param id id
      * @Description: 获取监测点信息
      * @Author: wr
      * @Date: 2023/9/22 11:11
diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java
index 4cb0cfbb7..b88178846 100644
--- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java
+++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java
@@ -1,8 +1,6 @@
 package com.njcn.device.biz.commApi;
 
-import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.ServerInfo;
-import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.biz.commApi.fallback.CommTerminalGeneralClientFallbackFactory;
@@ -12,8 +10,6 @@ import com.njcn.device.biz.pojo.param.MonitorGetParam;
 import com.njcn.device.biz.pojo.param.SubstationParam;
 import com.njcn.device.biz.pojo.po.Overlimit;
 import com.njcn.device.biz.pojo.po.PqsDeviceUnit;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/RunFlagEnum.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/RunFlagEnum.java
index f489ee3fe..72c8ce892 100644
--- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/RunFlagEnum.java
+++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/RunFlagEnum.java
@@ -4,6 +4,10 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 
+/**
+ * @author hongawen
+ */
+
 @Getter
 @AllArgsConstructor
 public enum RunFlagEnum {
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/component/TerminalLoggerAspect.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/component/TerminalLoggerAspect.java
index eb46f918b..43e3717da 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/component/TerminalLoggerAspect.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/component/TerminalLoggerAspect.java
@@ -14,10 +14,8 @@ import com.njcn.device.pms.pojo.param.*;
 import com.njcn.device.pms.pojo.po.*;
 import com.njcn.device.pms.service.majornetwork.IDistributionMonitorService;
 import com.njcn.device.pms.service.majornetwork.ITerminalLogService;
-import com.njcn.device.pms.service.majornetwork.ITerminalService;
 import com.njcn.web.utils.RequestUtil;
 import io.netty.util.concurrent.FastThreadLocal;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
@@ -25,11 +23,8 @@ import org.aspectj.lang.annotation.*;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.security.auth.Subject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.lang.reflect.Method;
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml
index 5c75a175d..dda364098 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml
@@ -7,10 +7,10 @@
         SELECT DISTINCT
         monitor.Org_Id AS orgId,
         monitor.Org_Name AS orgName,
-        monitor.`Powerr_Id` AS powerId,
-        monitor.`Powerr_Name` AS powerName,
+        monitor.Powerr_Id AS powerId,
+        monitor.Powerr_Name AS powerName,
         monitor.id AS monitorId,
-        monitor.`Name` AS monitorName,
+        monitor.Name AS monitorName,
         monitor.Line_Id,
         monitor.Line_Name,
         pdm.Monitor_Sort AS monitorSort,
@@ -29,8 +29,8 @@
         ((
         SELECT
         pm.id,
-        pm.`Name`,
-        pm.`Status`,
+        pm.Name,
+        pm.Status,
         pm.Org_Id,
         pm.Org_Name,
         pm.Powerr_Id,
@@ -52,8 +52,8 @@
         (
         SELECT
         ppd.id,
-        ppd.`Name`,
-        ppd.`Status`,
+        ppd.Name,
+        ppd.Status,
         ppd.Org_Id,
         ppd.Org_Name,
         ppd.Power_Station_Id,
@@ -66,8 +66,8 @@
         (
         SELECT
         ppc.id,
-        ppc.`Name`,
-        ppc.`Status`,
+        ppc.Name,
+        ppc.Status,
         ppc.Org_Id,
         ppc.Org_Name,
         ppc.Power_Station_Id,
@@ -82,8 +82,8 @@
         (
         SELECT
         ppgu.id,
-        ppgu.`Name`,
-        ppgu.`Status`,
+        ppgu.Name,
+        ppgu.Status,
         ppgu.Org_Id,
         ppgu.Org_Name,
         ppgu.Power_Station_Id,
@@ -97,8 +97,8 @@
         )) AS monitor
         INNER JOIN pms_distribution_monitor AS pdm ON monitor.id = pdm.Monitor_Id
         WHERE
-        monitor.`Status` = 1
-        AND pdm.`Status` = 1
+        monitor.Status = 1
+        AND pdm.Status = 1
         AND monitor.Org_Id IN
         <foreach collection="deptIdList" item="orgId" open="(" close=")" separator=",">
             #{orgId}
@@ -131,17 +131,17 @@
             AND pdm.If_Power_User = #{pwPmsMonitorParam.ifPowerUser}
         </if>
         <if test="pwPmsMonitorParam.monitorName !=null and pwPmsMonitorParam.monitorName != ''">
-            AND monitor.`Name` LIKE CONCAT('%',#{pwPmsMonitorParam.monitorName},'%')
+            AND monitor.Name LIKE CONCAT('%',#{pwPmsMonitorParam.monitorName},'%')
         </if>
     </select>
     <select id="getPwPhotovoltaicMonitorList" resultType="com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO">
         SELECT DISTINCT
         monitor.Org_Id AS orgId,
         monitor.Org_Name AS orgName,
-        monitor.`Powerr_Id` AS powerId,
-        monitor.`Powerr_Name` AS powerName,
+        monitor.Powerr_Id AS powerId,
+        monitor.Powerr_Name AS powerName,
         monitor.id AS monitorId,
-        monitor.`Name` AS monitorName,
+        monitor.Name AS monitorName,
         monitor.Line_Id,
         monitor.Line_Name,
         pdm.Monitor_Sort AS monitorSort,
@@ -158,8 +158,8 @@
         ((
         SELECT
         pm.id,
-        pm.`Name`,
-        pm.`Status`,
+        pm.Name,
+        pm.Status,
         pm.Org_Id,
         pm.Org_Name,
         pm.Powerr_Id,
@@ -180,8 +180,8 @@
         (
         SELECT
         ppd.id,
-        ppd.`Name`,
-        ppd.`Status`,
+        ppd.Name,
+        ppd.Status,
         ppd.Org_Id,
         ppd.Org_Name,
         ppd.Power_Station_Id,
@@ -194,8 +194,8 @@
         ) AS monitor
         INNER JOIN pms_distribution_monitor AS pdm ON monitor.id = pdm.Monitor_Id
         WHERE
-        monitor.`Status` = 1
-        AND pdm.`Status` = 1
+        monitor.Status = 1
+        AND pdm.Status = 1
         AND monitor.Org_Id IN
         <foreach collection="deptIdList" item="orgId" open="(" close=")" separator=",">
             #{orgId}
@@ -228,7 +228,7 @@
             AND pdm.If_Power_User = #{pwPmsMonitorParam.ifPowerUser}
         </if>
         <if test="pwPmsMonitorParam.monitorName !=null and pwPmsMonitorParam.monitorName != ''">
-            AND monitor.`Name` LIKE CONCAT('%',#{pwPmsMonitorParam.monitorName},'%')
+            AND monitor.Name LIKE CONCAT('%',#{pwPmsMonitorParam.monitorName},'%')
         </if>
     </select>
 
@@ -239,26 +239,26 @@
     <select id="getPwMonitorName" resultType="com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO">
         select
             id as monitorId,
-            `Name` as monitorName
+            Name as monitorName
         from
             ((
                  SELECT
                      pm.id,
-                     pm.`Name`
+                     pm.Name
                  FROM
                      pms_monitor AS pm
              ) UNION ALL
              (
                  SELECT
                      ppd.id,
-                     ppd.`Name`
+                     ppd.Name
                  FROM
                      pms_power_distributionarea AS ppd
              ) UNION ALL
              (
                  SELECT
                      ppc.id,
-                     ppc.`Name`
+                     ppc.Name
                  FROM
                      pms_power_client  as ppc
 
@@ -266,7 +266,7 @@
              (
                  SELECT
                      ppgu.id,
-                     ppgu.`Name`
+                     ppgu.Name
                  FROM
                      pms_power_generation_user AS ppgu
              )
@@ -280,15 +280,15 @@
            </if>
        </where>
         <if test="name !=null and name != ''">
-            AND `Name` LIKE CONCAT('%',#{name},'%')
+            AND Name LIKE CONCAT('%',#{name},'%')
         </if>
     </select>
     <select id="getPwMonitorDataNewList" resultType="com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO">
         SELECT
             pdm.Org_Id AS orgId,
             ps.Org_Name AS orgName,
-            pdm.`Power_Station_Id` AS powerId,
-            ps.`Power_Name` AS powerName,
+            pdm.Power_Station_Id AS powerId,
+            ps.Power_Name AS powerName,
             pdm.Monitor_Id AS monitorId,
             pdm.Line_Id,
             pdm.Monitor_Sort AS monitorSort,
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml
index 3cb1e6a2b..fa5b02427 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml
@@ -23,7 +23,7 @@
                 Org_Id as Org_Id ,
                 Voltage_Level as Voltage_Level,
                 1 as If_Power_User,
-                (select sd.id from sys_dict_data sd INNER JOIN sys_dict_type st on st.id=sd.Type_Id where sd.`Code`="Run" and st.`Code`="Line_State") as Monitor_State,
+                (select sd.id from sys_dict_data sd INNER JOIN sys_dict_type st on st.id=sd.Type_Id where sd.Code="Run" and st.Code="Line_State") as Monitor_State,
                 now() as Created_Date,
                 1 as Status,
                 now() as Create_Time,
@@ -58,7 +58,7 @@
             Org_Id as Org_Id ,
             Voltage_Level as Voltage_Level,
             1 as If_Power_User,
-            (select sd.id from sys_dict_data sd INNER JOIN sys_dict_type st on st.id=sd.Type_Id where sd.`Code`="Run" and st.`Code`="Line_State") as Monitor_State,
+            (select sd.id from sys_dict_data sd INNER JOIN sys_dict_type st on st.id=sd.Type_Id where sd.Code="Run" and st.Code="Line_State") as Monitor_State,
             now() as Created_Date,
             1 as Status,
             now() as Create_Time,
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml
index fc3a7eb81..59a128e77 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml
@@ -95,14 +95,14 @@
         pm.Powerr_Id AS powerId,
         pm.Powerr_Name AS powerName,
         pm.Id AS monitorId,
-        pm.`Name` AS monitorName,
+        pm.Name AS monitorName,
         pm.Voltage_Level AS monitorVoltageLevel,
         pm.Monitor_Type AS monitorType,
         pm.Monitor_State AS monitorState
         FROM
         pms_monitor AS pm
         WHERE
-        pm.`Status` = 1
+        pm.Status = 1
         AND pm.Id IN
         <foreach collection="pmsMonitorInfoParam.monitorIds" item="item" open="(" close=")" separator=",">
             #{item}
@@ -126,7 +126,7 @@
             </foreach>
         </if>
         <if test="pmsMonitorInfoParam.monitorName != null and pmsMonitorInfoParam.monitorName != ''">
-            AND pm.`Name` LIKE CONCAT('%',#{pmsMonitorInfoParam.monitorName},'%')
+            AND pm.Name LIKE CONCAT('%',#{pmsMonitorInfoParam.monitorName},'%')
         </if>
     </select>
     <select id="getMonitorTerminal" resultType="com.njcn.device.pms.pojo.vo.MonitorVO">
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixWireMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixWireMapper.xml
index f6d7ad29b..d2133beda 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixWireMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixWireMapper.xml
@@ -13,14 +13,14 @@
         pg.id AS generatrixId,
         pm.Line_Name AS generatrixName,
         pm.Id AS monitorId,
-        pm.`Name` AS monitorName,
+        pm.Name AS monitorName,
         pg.Scale AS generatrixVoltageLevel
         FROM
         pms_generatrix_wire AS pg
         LEFT JOIN pms_monitor AS pm ON pm.line_id = pg.id
         WHERE
-        pm.`Status` = 1
-        AND pg.`Status` =1
+        pm.Status = 1
+        AND pg.Status =1
         AND pg.id IN
         <foreach collection="pmsGeneratrixParam.generatrixIds" item="item" open="(" close=")" separator=",">
             #{item}
@@ -54,8 +54,8 @@
         pms_generatrix_wire AS pg
         LEFT JOIN pms_statation_stat AS pss ON pg.station_id = pss.Power_Id
         WHERE
-        pg.`Status` = 1
-        AND pss.`Status` = 1
+        pg.Status = 1
+        AND pss.Status = 1
         <if test="param.powerStationId != null and param.powerStationId !=''">
                     AND pss.Power_Id = #{param.powerStationId}
         </if>
@@ -83,8 +83,8 @@
         pms_generatrix_wire AS pg
         LEFT JOIN pms_statation_stat AS pss ON pg.station_id = pss.Power_Id
         WHERE
-        pg.`Status` = 1
-        AND pss.`Status` = 1
+        pg.Status = 1
+        AND pss.Status = 1
         <if test="param.generatrixIds != null and param.generatrixIds.size() >0 ">
             AND pg.id IN
             <foreach collection="param.generatrixIds" item="item" open="(" close=")" separator=",">
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerDistributionareaMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerDistributionareaMapper.xml
index 4387ce575..29e44ab2c 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerDistributionareaMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerDistributionareaMapper.xml
@@ -6,7 +6,7 @@
     <select id="selectPVCapacity" resultType="com.njcn.device.pms.pojo.vo.PVCapacity">
         SELECT
         sum( P_Capacity ) AS sumCount,
-        ( SELECT sum( `Photovoltaic_Capacity` ) FROM pms_power_distributionarea
+        ( SELECT sum( Photovoltaic_Capacity ) FROM pms_power_distributionarea
             <where>
                 org_id IN
                 <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
@@ -15,7 +15,7 @@
                 AND STATUS = 1
             </where>
         ) AS sumOrgCount,
-        ( SELECT sum( `Photovoltaic_Capacity` ) FROM pms_power_distributionarea
+        ( SELECT sum( Photovoltaic_Capacity ) FROM pms_power_distributionarea
             <where>
                 org_id IN
                 <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatSubstationMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatSubstationMapper.xml
index 8bd8f24d8..9eace8b99 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatSubstationMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatSubstationMapper.xml
@@ -6,7 +6,7 @@
     <select id="getMonitorInfo" resultType="com.njcn.device.pms.pojo.po.PmsMonitorPO">
         SELECT
         id,
-        `Name`,
+        Name,
         Org_Name AS orgName,
         Org_Id AS orgId,
         Operation_Name AS operationName,
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml
index 018945a32..f699b6403 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml
@@ -5,7 +5,7 @@
     <select id="selectList" resultType="com.njcn.device.pms.pojo.vo.SpecialAnalysisMonitorVO$SpecialAnalysisVO">
         SELECT
             pm.Id,
-            pm.`Name`,
+            pm.Name,
             pm.Org_Name,
             pm.Org_Id,
             pm.Powerr_Name,
@@ -20,9 +20,9 @@
         LEFT JOIN pms_statation_stat ps ON pm.Powerr_Id = ps.Power_Id
         LEFT JOIN pms_special_monitor psm ON  pm.Id = psm.id
         <where>
-            pm.`Status` = 1
-            AND ps.`Status` = 1
-            AND pm.`Monitor_State` = #{status}
+            pm.Status = 1
+            AND ps.Status = 1
+            AND pm.Monitor_State = #{status}
             <if test="deptIdList != null and  deptIdList.size > 0">
                 AND pm.Org_Id IN
                 <foreach collection='deptIdList' item='item' index="index" open='(' separator=',' close=')'>
@@ -99,7 +99,7 @@
                  sum(t.Smelting_Load_Capacity) as capacity4
              FROM  pms_statistics_special_monitor t
             <where>
-                AND t.`Status` = 1
+                AND t.Status = 1
                 <if test="deptIdList != null and  deptIdList.size > 0">
                     AND t.Org_Id IN
                     <foreach collection='deptIdList' item='item' index="index" open='(' separator=',' close=')'>
@@ -126,7 +126,7 @@
                 sum(t.Smelting_Load_Capacity) as capacity4
             FROM  pms_statistics_special_monitor t
             <where>
-                AND t.`Status` = 1
+                AND t.Status = 1
                 <if test="deptIdList != null and  deptIdList.size > 0">
                     AND t.Org_Id IN
                     <foreach collection='deptIdList' item='item' index="index" open='(' separator=',' close=')'>
@@ -154,7 +154,7 @@
                 sum(t.Smelting_Load_Capacity) as capacity4
             FROM  pms_statistics_special_monitor t
             <where>
-                AND t.`Status` = 1
+                AND t.Status = 1
                 <if test="deptIdList != null and  deptIdList.size > 0">
                     AND t.Org_Id IN
                     <foreach collection='deptIdList' item='item' index="index" open='(' separator=',' close=')'>
@@ -185,7 +185,7 @@
             resultType="com.njcn.device.pms.pojo.vo.SpecialAnalysisMonitorVO$SpecialAnalysisRailwayVO">
         SELECT
             DISTINCT pts.Id,
-            pts.`Name`,
+            pts.Name,
             pts.Org_Name,
             pts.Railway_Line_Name,
             pts.Org_Id,
@@ -200,8 +200,8 @@
         LEFT JOIN pms_statation_stat ps ON pts.Power_Id = ps.Power_Id
         LEFT JOIN pms_traction_station_expand ptse ON ptse.traction_Station_Id = pts.Id
         <where>
-            pts.`Status` = 1
-            AND ps.`Status` = 1
+            pts.Status = 1
+            AND ps.Status = 1
             <if test="deptIdList != null and  deptIdList.size > 0">
                 AND pts.Org_Id IN
                 <foreach collection='deptIdList' item='item' index="index" open='(' separator=',' close=')'>
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml
index c345567ec..44d7e8f59 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml
@@ -11,7 +11,7 @@
         pm.Powerr_Name AS powerName,
         pgw.name AS busBarName,
         pm.Id AS monitorId,
-        pm.`Name` AS monitorName,
+        pm.Name AS monitorName,
         pss.Voltage_Level AS powerVoltageLevel
         FROM
         pms_monitor AS pm
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/TractionStationMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/TractionStationMapper.xml
index ae8b94f88..78f256b1c 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/TractionStationMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/TractionStationMapper.xml
@@ -6,8 +6,8 @@
     <select id="getPmsTractionStationInfo" resultType="com.njcn.device.pms.pojo.dto.PmsTractionStationDTO">
         SELECT
         pts.Id AS id,
-        pts.`NAME` AS name,
-        ptse.`railway_type` AS railwayType,
+        pts.NAME AS name,
+        ptse.railway_type AS railwayType,
         pts.Org_Name AS orgName,
         pts.Org_Id AS orgId,
         pts.Operation_Name AS operationName,
@@ -24,7 +24,7 @@
         pts.Created_Date AS createdDate,
         pts.User_Tag AS userTag,
         pts.Is_Up_To_Grid AS isUpToGrid,
-        pts.`STATUS` AS `status`,
+        pts.STATUS AS status,
         pts.Create_By AS createBy,
         pts.Create_Time AS createTime,
         pts.Update_By AS updateBy,
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PqsDeviceUnitMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PqsDeviceUnitMapper.xml
index 70f2002f1..4d868fa73 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PqsDeviceUnitMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PqsDeviceUnitMapper.xml
@@ -6,7 +6,7 @@
         SELECT
             dev.id as  id,
             dev.pid as pid,
-            dev.NAME as `name`,
+            dev.NAME as name,
             pd.Run_Flag as devFlag,
             b.*
         FROM
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatIntegrityDMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatIntegrityDMapper.xml
index d02d7e87a..2ca4cae14 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatIntegrityDMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatIntegrityDMapper.xml
@@ -37,7 +37,7 @@
             CONVERT (
                     SUM( real_time )* 100 / SUM( due_time ),
                     DECIMAL ( 15, 2 )) AS integrityRate,
-            sum( real_time ) `realTime`,
+            sum( real_time ) realTime,
             sum( due_time ) dueTime
         FROM
             r_stat_integrity_d
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineDetailMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineDetailMapper.java
index fc9f98ca7..34192a98f 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineDetailMapper.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineDetailMapper.java
@@ -43,10 +43,10 @@ public interface LineDetailMapper extends BaseMapper<LineDetail> {
      * @return 结果
      */
     List<LineDetailDataVO> getLineDetailInfo(@Param("lineIds") List<String> lineIds);
-    @Select ("select count(1) from pq_line a where a.`Level`=4 and SUBSTRING_INDEX(SUBSTRING_INDEX(a.Pids, ',', 4),',',-1)=#{subIndex}")
+    @Select ("select count(1) from pq_line a where a.Level=4 and SUBSTRING_INDEX(SUBSTRING_INDEX(a.Pids, ',', 4),',',-1)=#{subIndex}")
     Integer getDeviceCountBySubstation(@Param("subIndex")String subIndex);
 
-    @Select ("select count(1) from pq_line a where a.`Level`=6 and SUBSTRING_INDEX(SUBSTRING_INDEX(a.Pids, ',', 4),',',-1)=#{subIndex}")
+    @Select ("select count(1) from pq_line a where a.Level=6 and SUBSTRING_INDEX(SUBSTRING_INDEX(a.Pids, ',', 4),',',-1)=#{subIndex}")
     Integer getLineCountBySubstation(@Param("subIndex")String subIndex);
 
 
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java
index 9a6937b3d..bccefe71c 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java
@@ -389,7 +389,7 @@ public interface LineMapper extends BaseMapper<Line> {
             "\tpq_line,\n" +
             "\tpq_device\n" +
             "WHERE\n" +
-            "\tpq_line.`Level` = 6\n" +
+            "\tpq_line.Level = 6\n" +
             "AND SUBSTRING_INDEX(\n" +
             "\tSUBSTRING_INDEX(pq_line.Pids, ',', 5),\n" +
             "\t',' ,- 1\n" +
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmMapper.xml
index 1c499dbe6..27a6acd72 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmMapper.xml
@@ -10,7 +10,7 @@ FROM
 		SELECT
 			d.NAME type,
 			d.id typeId,
-			d.`Level`,
+			d.Level,
 			max( a.Occurred_Time ) occurredTime,
 			c.NAME subName,
 			b.NAME devLineName,
@@ -63,7 +63,7 @@ FROM
 		SELECT
 			f.NAME type,
 		    f.id typeId,
-			f.`Level`,
+			f.Level,
 			max(a.Occurred_Time) occurredTime,
 			e.NAME subName,
 			b.NAME devLineName,
@@ -125,7 +125,7 @@ ORDER BY
 		SELECT
 		a.id,
 		a.occurred_time,
-		b.`level`,
+		b.level,
 		a.Remark,
 		a.flag,
 		b.name type,
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmStrategyMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmStrategyMapper.xml
index c8673a4bc..f3f45a052 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmStrategyMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmStrategyMapper.xml
@@ -5,14 +5,14 @@
 
     <select id="getAlarmStrategyData" resultType="AlarmStrategyVO">
         SELECT
-        A.`Id` id,
-        B.`Name` name,
-        A.`Integrity_Value` integrityValue,
-        A.`Online_Value` onlineValue,
-        A.`Offtime_Value` offTimeValue,
-        A.`Warn_Value` warnValue,
-        A.`Update_Time` updateTime,
-        C.`Name` updateBy
+        A.Id id,
+        B.Name name,
+        A.Integrity_Value integrityValue,
+        A.Online_Value onlineValue,
+        A.Offtime_Value offTimeValue,
+        A.Warn_Value warnValue,
+        A.Update_Time updateTime,
+        C.Name updateBy
         FROM
         pqs_alarm_strategy A,
         sys_dict_data B,
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml
index 26cb3fa8e..37a0082ce 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml
@@ -24,7 +24,7 @@
         <if test="type == 1">
             pq_dept_line.id unitId,
             point.id pointId,
-            lineDetail.Time_Interval as `interval`,
+            lineDetail.Time_Interval as interval,
             lineDetail.load_type lineTag,
             dic.id voltageLevel,
             dev.id devId,
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevFuctionMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevFuctionMapper.xml
index 2cb640828..38eb53f4e 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevFuctionMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevFuctionMapper.xml
@@ -13,11 +13,11 @@
     <select id="selectLineTable" resultType="com.njcn.device.pq.pojo.po.DevFuction">
         SELECT pd.id "lineId" FROM pq_device pd
                               inner join pq_line pl on pd.id = pl.id
-        where pl.`Level` = 4
+        where pl.Level = 4
     </select>
     <select id="selectDictTable" resultType="com.njcn.device.pq.pojo.po.DevFuction">
         select sdd.id "fucName" from sys_dict_type sdt
                                inner join sys_dict_data sdd on sdd.Type_Id = sdt.Id
-        where sdt.`Code` = 'Dev_Fun'
+        where sdt.Code = 'Dev_Fun'
     </select>
 </mapper>
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceOnlineDataMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceOnlineDataMapper.xml
index a9a9d61d1..f167a115f 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceOnlineDataMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceOnlineDataMapper.xml
@@ -5,9 +5,9 @@
 
     <select id="getMinDeviceLevel" resultType="DeviceOnlineDataDTO">
         SELECT
-		a.`Id` deviceId,
-		e.`Line_Grade` lineGrade,
-		f.`Name` levelName,
+		a.Id deviceId,
+		e.Line_Grade lineGrade,
+		f.Name levelName,
 		MIN(f.Algo_Describe)
 		FROM
 		pq_line a,
@@ -32,7 +32,7 @@
 
 	<select id="getMinDeviceLevelById" resultType="DeviceOnlineDataDTO">
 		SELECT
-		a.`Id` deviceId,e.`Line_Grade` lineGrade,f.`Name` levelName,MIN(f.Algo_Describe)
+		a.Id deviceId,e.Line_Grade lineGrade,f.Name levelName,MIN(f.Algo_Describe)
 		FROM
 		pq_line a,
 		pq_line b,
@@ -50,11 +50,11 @@
 
     <select id="getDeviceFatherData" resultType="DeviceOnlineTabVO">
 		SELECT
-		a.`Id` deviceId,
-		a.`Name` deviceName,
-		b.`Name` subName,
-		c.`Name` gdName,
-		e.`Name` provinceName
+		a.Id deviceId,
+		a.Name deviceName,
+		b.Name subName,
+		c.Name gdName,
+		e.Name provinceName
 		FROM
 		pq_line a,
 		pq_line b,
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml
index 540aa02c8..9ea9a9544 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml
@@ -32,7 +32,7 @@
             </foreach>
               AND
           </if>
-          A1.`Level` = 6 AND A1.Id = B.Id AND
+          A1.Level = 6 AND A1.Id = B.Id AND
           A1.Pid = A2.Id AND A2.Pid = A3.Id AND A3.Id = C.Id AND
           C.Dev_Model = 1 AND C.Dev_Data_Type IN (1,2) AND C.Run_Flag = 0 AND A1.Id = D.Id
     </select>
@@ -56,7 +56,7 @@
 
 
     <select id="getMonitorDetail" resultType="com.njcn.device.biz.pojo.dto.LineDevGetDTO">
-        select a.id pointId,a.name pointName,b.Time_Interval `interval`
+        select a.id pointId,a.name pointName,b.Time_Interval interval
         from pq_line a
         inner join pq_line_detail b on a.id=b.id
         where a.id = #{monitorId}
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml
index 15aab3a83..5b5f8f970 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml
@@ -46,10 +46,10 @@
         DISTINCT
         sub.id,
         sub.pid,
-        sub.`Level`,
+        sub.Level,
         sub.sort,
-        sub.`Name`,
-        sdd.`Name` AS subScale
+        sub.Name,
+        sdd.Name AS subScale
         FROM
         pq_line line
         INNER JOIN pq_line wire ON line.pid = wire.id
@@ -70,18 +70,18 @@
         line.Id as 'id',
         line.pid as 'pid',
         line.Pids as 'pids',
-        line.`Name` AS 'name',
-        line.`Level`as 'Level',
+        line.Name AS 'name',
+        line.Levelas 'Level',
         pd.Update_Time AS 'updateTime',
         line.Sort as 'sort',
         pd.Com_Flag as 'ComFlag',
-        sdd.`Name` AS 'LineScale',
-        device.`Name` AS 'deviceName',
+        sdd.Name AS 'LineScale',
+        device.Name AS 'deviceName',
         pd.IP AS 'ip',
-        msdd.`Name` AS 'manufacturer',
-        pldsdd.`Name` AS 'lineGradeName',
-        pldsdd.`id` AS 'lineGrade',
-        pldsdd.Algo_Describe AS `algoDescribe`,
+        msdd.Name AS 'manufacturer',
+        pldsdd.Name AS 'lineGradeName',
+        pldsdd.id AS 'lineGrade',
+        pldsdd.Algo_Describe AS algoDescribe,
         pld.Load_Type AS 'loadType'
         FROM
         pq_line AS line
@@ -92,9 +92,9 @@
         LEFT JOIN sys_dict_data AS sdd ON sdd.id = pv.Scale
         LEFT JOIN pq_line_detail AS pld ON line.id = pld.Id
         LEFT JOIN sys_dict_data AS pldsdd ON pld.Line_Grade = pldsdd.id
-        LEFT JOIN sys_dict_data AS msdd ON pd.Manufacturer = msdd.`id`
+        LEFT JOIN sys_dict_data AS msdd ON pd.Manufacturer = msdd.id
         WHERE
-        line.`Level` = 6
+        line.Level = 6
         AND
         line.id in
         <foreach collection="lineIndexes" item="item" open="(" close=")" separator=",">
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
index 801542aed..aaf42ef3e 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
@@ -448,18 +448,18 @@
     <select id="getBaseLineInfo" resultType="BaseLineInfo">
 <!--        SELECT-->
 <!--        line.Id,-->
-<!--        area.`Name` provincialName,-->
-<!--        gd.`Name` gdName,-->
-<!--        substation.`Name` subName,-->
-<!--        subscale.`Name` subScale,-->
-<!--        device.`Name` deviceName,-->
+<!--        area.Name provincialName,-->
+<!--        gd.Name gdName,-->
+<!--        substation.Name subName,-->
+<!--        subscale.Name subScale,-->
+<!--        device.Name deviceName,-->
 <!--        pqdevice.IP networkParam,-->
 <!--        pqdevice.Com_Flag comState,-->
-<!--        factory.`Name` factoryName,-->
+<!--        factory.Name factoryName,-->
 <!--        pqdevice.Update_Time time,-->
-<!--        voltage.`Name` subvName,-->
-<!--        scale.`Name` subvScale,-->
-<!--        line.`Name` lineName,-->
+<!--        voltage.Name subvName,-->
+<!--        scale.Name subvScale,-->
+<!--        line.Name lineName,-->
 <!--        line.Sort-->
 <!--        FROM-->
 <!--        pq_line line,-->
@@ -497,18 +497,18 @@
 
         select
             line.Id,
-            line.`Name` lineName,
-            area.`Name` provincialName,
-            gd.`Name` gdName,
-            substation.`Name` subName,
-            subscale.`Name` subScale,
-            device.`Name` deviceName,
+            line.Name lineName,
+            area.Name provincialName,
+            gd.Name gdName,
+            substation.Name subName,
+            subscale.Name subScale,
+            device.Name deviceName,
             voltage.Name subvName,
             subvscale.Name subvScale,
             pqdevice.IP networkParam,
             pqdevice.Com_Flag comState,
             pqdevice.Update_Time time,
-            factory.`Name` factoryName
+            factory.Name factoryName
         from
             pq_line line,
             pq_line voltage,
@@ -537,25 +537,25 @@
             and device.Id = pqdevice.Id
             and pqdevice.Manufacturer = factory.id
             and substation.Id = pqsubstation.Id
-            and pqsubstation.`Scale` = subscale.Id
+            and pqsubstation.Scale = subscale.Id
             and voltage.Id = pqvoltage.Id
-            and pqvoltage.`Scale` = subvscale.Id
+            and pqvoltage.Scale = subvscale.Id
     </select>
 
 
     <select id="getBaseLineAreaInfo" resultType="AreaLineInfoVO">
         SELECT
         line.Id lineId,
-        line.`Name` lineName,
-        gd.`Name` gdName,
+        line.Name lineName,
+        gd.Name gdName,
         substation.id subId,
-        substation.`Name` subName,
+        substation.Name subName,
         subscale.name subScale,
         pqdevice.IP ip,
-        factory.`Name` manufacturer,
+        factory.Name manufacturer,
         voltage.id voltageId,
-        voltage.`Name` voltageName,
-        scale.`Name` voltageScale,
+        voltage.Name voltageName,
+        scale.Name voltageScale,
         pqdevice.run_flag,
         pqdevice.com_flag,
         pqsubstation.Lng,
@@ -649,8 +649,8 @@
 
     <select id="getSubstationInfo" resultType="PollutionSubstationDTO">
         SELECT A.id,
-               A.`Name` name,
-               C.`Name` voltageLevel
+               A.Name name,
+               C.Name voltageLevel
         FROM pq_line A,
              pq_substation B,
              sys_dict_data C
@@ -662,7 +662,7 @@
     <select id="getLineInfo" resultType="PollutionLineDTO">
         SELECT
         A.Id,
-        A.`Name`,
+        A.Name,
         A1.Name busBar,
         A3.Name substation,
         A3.Id substationId,
@@ -707,10 +707,10 @@
     <select id="getWarningSub" resultType="WarningSubstationDTO">
         SELECT
         A1.Id,
-        A1.`Name` subName,
-        B.`Name` scale,
-        A2.`Name` city,
-        D.`Name` province
+        A1.Name subName,
+        B.Name scale,
+        A2.Name city,
+        D.Name province
         FROM
         pq_line A1,
         pq_line A2,
@@ -723,21 +723,21 @@
         <foreach item="item" collection="list" separator="," open="(" close=")">
             #{item}
         </foreach>
-        AND A1.Pid = A2.Id AND A2.Pid = A3.Id AND A3.`Name` = D.Area_Code AND A1.Id = C.Id AND C.Scale = B.Id
+        AND A1.Pid = A2.Id AND A2.Pid = A3.Id AND A3.Name = D.Area_Code AND A1.Id = C.Id AND C.Scale = B.Id
     </select>
 
     <select id="getOverLimitLineInfo" resultType="OverLimitLineDTO">
         SELECT
         A1.id,
-        A1.`Name` lineName,
-        C1.`Name` lineScale,
-        C2.`Name` loadType,
+        A1.Name lineName,
+        C1.Name lineScale,
+        C2.Name loadType,
         D.Obj_Name lineObjectName,
         D.Monitor_Id monitorNumber,
-        A4.`Name` subName,
-        C3.`Name` subScale,
-        A5.`Name` cityCompany,
-        F.`Name` provinceCompany,
+        A4.Name subName,
+        C3.Name subScale,
+        A5.Name cityCompany,
+        F.Name provinceCompany,
         dev.Manufacturer
         FROM
         pq_line A1,
@@ -761,7 +761,7 @@
         </foreach>
         AND A1.Pid = A2.Id AND A2.Id = B.Id AND B.Scale = C1.Id AND A1.Id = D.Id AND D.Load_Type = C2.Id
         AND A2.Pid = A3.Id AND A3.Pid = A4.Id AND A4.Pid = A5.Id AND A4.Id = E.Id AND E.Scale = C3.Id
-        AND A5.Pid = A6.Id AND A6.`Name` = F.Area_Code and A3.id = dev.id
+        AND A5.Pid = A6.Id AND A6.Name = F.Area_Code and A3.id = dev.id
     </select>
 
     <select id="getDeviceStatus" resultType="LineStateVO">
@@ -802,7 +802,7 @@
         Id,
         Pid,
         Pids,
-        `Name`
+        Name
         FROM
         pq_line
         WHERE
@@ -817,7 +817,7 @@
         A.Id,
         A.Pid,
         A.Pids,
-        A.`Name` name,
+        A.Name name,
         D.run_flag runFlag,
         D.com_flag comFlag
         FROM
@@ -972,8 +972,8 @@
         Id,
         Pid,
         Pids,
-        `level`,
-        `Name`
+        level,
+        Name
         FROM
         pq_line
         WHERE
@@ -1018,7 +1018,7 @@
             pq_line_detail B,
             pq_device C
         WHERE
-            A1.`Level` = 6 AND A1.Id = B.Id AND
+            A1.Level = 6 AND A1.Id = B.Id AND
             A1.Pid = A2.Id AND A2.Pid = A3.Id AND A3.Id = C.Id AND
             C.Dev_Model = 1 AND C.Dev_Data_Type IN (1,2) AND C.Run_Flag = 0
     </select>
@@ -1156,7 +1156,7 @@
     <select id="getLineBySubStation" resultType="com.njcn.device.biz.pojo.dto.LineDevGetDTO">
         SELECT
         pq_line.id pointId,
-        lineDetail.Time_Interval `interval`,
+        lineDetail.Time_Interval interval,
         dev.id devId,
         device.com_flag
         FROM
@@ -1177,7 +1177,7 @@
     </select>
 
     <select id="getMonitorListDetail" resultType="com.njcn.device.biz.pojo.dto.LineDevGetDTO">
-        select line.id pointId,dev.id devId,0 type,1 lineType,lineDetail.Time_Interval as `interval`
+        select line.id pointId,dev.id devId,0 type,1 lineType,lineDetail.Time_Interval as interval
                from pq_line line
         inner join pq_line_detail lineDetail on line.id = lineDetail.id
         inner join pq_line subv on line.pid = subv.id
@@ -1726,7 +1726,7 @@
             left join pq_line pl6 on pl5.pId = pl6.Id
             left join pq_voltage pv on pv.Id = pl2.Id
             left join pq_device pd on pl3.Id = pd.Id
-            left join sys_dict_data sdd on pv.`Scale` = sdd.Id
+            left join sys_dict_data sdd on pv.Scale = sdd.Id
         <where>
             <if test="ids!=null and ids.size() > 0">
                 pl.Id IN
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LogManageMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LogManageMapper.xml
index 0ebbf1583..8c9297016 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LogManageMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LogManageMapper.xml
@@ -5,9 +5,9 @@
 
     <select id="getDeviceLogData" resultType="DeviceLogVO">
         SELECT
-        A.`Name` name,
-        B.`Name` type,
-        C.`Name` updateBy
+        A.Name name,
+        B.Name type,
+        C.Name updateBy
         FROM
         pq_line A,
         sys_dict_data B,
@@ -18,9 +18,9 @@
         AND C.Id = #{updateBys}
     </select>
 <!--        SELECT-->
-<!--        A.`Name` name,-->
-<!--        B.`Name` type,-->
-<!--        C.`Name` updateBy-->
+<!--        A.Name name,-->
+<!--        B.Name type,-->
+<!--        C.Name updateBy-->
 <!--        FROM-->
 <!--        pq_line A,-->
 <!--        sys_dict_data B,-->
@@ -40,9 +40,9 @@
 
     <select id="getEventLogData" resultType="EventLogVO">
         SELECT
-        A.`Name` line,
-        A3.`Name` substation,
-        A4.`Name` powerCompany
+        A.Name line,
+        A3.Name substation,
+        A4.Name powerCompany
         FROM
         pq_line A,
         pq_line A1,
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqsDeviceUnitMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqsDeviceUnitMapper.xml
index 70f2002f1..4d868fa73 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqsDeviceUnitMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqsDeviceUnitMapper.xml
@@ -6,7 +6,7 @@
         SELECT
             dev.id as  id,
             dev.pid as pid,
-            dev.NAME as `name`,
+            dev.NAME as name,
             pd.Run_Flag as devFlag,
             b.*
         FROM
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqsTerminalLogsMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqsTerminalLogsMapper.xml
index 3d75237c4..ef779337b 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqsTerminalLogsMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqsTerminalLogsMapper.xml
@@ -4,13 +4,13 @@
 
     <!--<select id="getList" resultType="com.njcn.device.pq.pojo.vo.LogsListVO">
         SELECT
-        sdd.`Name` "type",
+        sdd.Name "type",
         ptl.Create_By "updateBy",
         ptl.Create_Time "updateTime",
-        ptl.`Terminal_Describe` "remark"
+        ptl.Terminal_Describe "remark"
         FROM
         pqs_terminal_logs ptl
-        LEFT JOIN sys_dict_data sdd ON sdd.Id = ptl.`Terminal_Type`
+        LEFT JOIN sys_dict_data sdd ON sdd.Id = ptl.Terminal_Type
         <where>
             <if test="logsListParam.searchBeginTime != null and logsListParam.searchBeginTime != ''">
                 and date_format(ptl.Create_Time,'%y%m%d') &gt;= date_format(#{logsListParam.searchBeginTime},'%y%m%d')
@@ -30,13 +30,13 @@
     </select>-->
     <select id="getList" resultType="com.njcn.device.pq.pojo.vo.LogsListVO">
         SELECT
-        sdd.`Name` "type",
+        sdd.Name "type",
         ptl.Create_By "updateBy",
         ptl.Create_Time "updateTime",
-        ptl.`Terminal_Describe` "remark"
+        ptl.Terminal_Describe "remark"
         FROM
         pqs_terminal_logs ptl
-        LEFT JOIN sys_dict_data sdd ON sdd.Id = ptl.`Terminal_Type`
+        LEFT JOIN sys_dict_data sdd ON sdd.Id = ptl.Terminal_Type
         <where>
             <if test="logsListParam.searchBeginTime != null and logsListParam.searchBeginTime != ''">
                 and date_format(ptl.Create_Time,'%y%m%d') &gt;= date_format(#{logsListParam.searchBeginTime},'%y%m%d')
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml
index e1e2c6fe6..a8b590a87 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml
@@ -5,17 +5,17 @@
 
     <select id="getVersion" resultType="VersionVO">
         SELECT
-        A.`Id` id,
-        B.`Name` devType,
-        A.`Name` name,
-        A.`Protocol` protocol,
-        A.`Date` date,
-        C.`Name` updateBy,
-        A.`Update_Time` updateTime,
-        A.`Remark` remark,
-        A.`Version_Type` versionType,
-        A.`Version_Flag` versionFlag,
-        A.`File_Name` fileName
+        A.Id id,
+        B.Name devType,
+        A.Name name,
+        A.Protocol protocol,
+        A.Date date,
+        C.Name updateBy,
+        A.Update_Time updateTime,
+        A.Remark remark,
+        A.Version_Type versionType,
+        A.Version_Flag versionFlag,
+        A.File_Name fileName
         FROM
         cld_version A,
         sys_dict_data B,
@@ -27,13 +27,13 @@
             AND A.Dev_Type = #{devType}
         </if>
         <if test="searchValue != null and searchValue != ''">
-            AND (A.`Name` like concat('%',#{searchValue},'%') or A.`Protocol` like concat('%',#{searchValue},'%') or A.`Remark` like concat('%',#{searchValue},'%'))
+            AND (A.Name like concat('%',#{searchValue},'%') or A.Protocol like concat('%',#{searchValue},'%') or A.Remark like concat('%',#{searchValue},'%'))
         </if>
     </select>
 
     <select id="getProgramVersionById" resultType="ShowVersionVO">
         SELECT
-        `File` file
+        File file
         FROM
         cld_version
         WHERE Id = #{id}
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatIntegrityDMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatIntegrityDMapper.xml
index 201474bb9..a5c011b66 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatIntegrityDMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatIntegrityDMapper.xml
@@ -5,7 +5,7 @@
     <select id="getLineIntegrityRate" resultType="LineDataIntegrity">
         select  line_index lineId,
                 avg(real_time/due_time)*100 integrityData,
-                sum(real_time) `real`,
+                sum(real_time) real,
                 sum(due_time) due
         from r_stat_integrity_d
         where line_index in
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RateOfFlowMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RateOfFlowMapper.xml
index 145111f1a..b61c1a828 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RateOfFlowMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RateOfFlowMapper.xml
@@ -5,14 +5,14 @@
 
     <select id="getRateOfFlowData" resultType="RateOfFlowVO">
         SELECT
-        A.`Id` id,
-        A.`Name` name,
-        A.`Type` type,
-        A.`Flag` flag,
-        A.`Combo_Type` comboType,
-        A.`Flow` flow,
-        B.`Name` updateBy,
-        A.`Update_Time` updateTime
+        A.Id id,
+        A.Name name,
+        A.Type type,
+        A.Flag flag,
+        A.Combo_Type comboType,
+        A.Flow flow,
+        B.Name updateBy,
+        A.Update_Time updateTime
         FROM
         cld_flow_meal A,
         sys_user B
@@ -28,14 +28,14 @@
 
     <select id="getRateOfFlowFlag" resultType="RateOfFlowVO">
         SELECT
-        `Id` id,
-        `Name` name,
-        `Type` type,
-        `Flag` flag,
-        `Combo_Type` comboType,
-        `Flow` flow,
-        `Update_By` updateBy,
-        `Update_Time` updateTime
+        Id id,
+        Name name,
+        Type type,
+        Flag flag,
+        Combo_Type comboType,
+        Flow flow,
+        Update_By updateBy,
+        Update_Time updateTime
         FROM
         cld_flow_meal
         WHERE Type =0 AND Flag =1
@@ -51,14 +51,14 @@
 
     <select id="getFlowStrategy" resultType="FlowStrategyVO">
         SELECT
-        A.`Id` id,
-        A.`Name` name,
-        A.`Flag` flag,
-        C.`Name` updateBy,
-        A.`Update_Time` updateTime,
-        B1.`Value` comPerData,
-        B2.`Value` warnPerData,
-        B3.`Value` alertPerData
+        A.Id id,
+        A.Name name,
+        A.Flag flag,
+        C.Name updateBy,
+        A.Update_Time updateTime,
+        B1.Value comPerData,
+        B2.Value warnPerData,
+        B3.Value alertPerData
         FROM
         cld_flow_strategy A,
         cld_flow_strategy_dic B1,
@@ -74,11 +74,11 @@
 
     <select id="getStrategyFlag" resultType="FlowStrategyVO">
         SELECT
-        `Id` id,
-        `Name` name,
-        `Flag` flag,
-        `Update_By` updateBy,
-        `Update_Time` updateTime
+        Id id,
+        Name name,
+        Flag flag,
+        Update_By updateBy,
+        Update_Time updateTime
         FROM
         cld_flow_strategy
         WHERE Flag =1
@@ -94,17 +94,17 @@
 
     <select id="getFlowStrategyById" resultType="ShowFlowStrategyVO">
         SELECT
-        A.`Id` id,
-        A.`Name` name,
-        A.`Flag` flag,
-        C.`Name` updateBy,
-        A.`Update_Time` updateTime,
-        A.`Com_Per` com,
-        A.`Warn_Per` warn,
-        A.`Alert_Per` alert,
-        B1.`Value` comPerData,
-        B2.`Value` warnPerData,
-        B3.`Value` alertPerData
+        A.Id id,
+        A.Name name,
+        A.Flag flag,
+        C.Name updateBy,
+        A.Update_Time updateTime,
+        A.Com_Per com,
+        A.Warn_Per warn,
+        A.Alert_Per alert,
+        B1.Value comPerData,
+        B2.Value warnPerData,
+        B3.Value alertPerData
         FROM
         cld_flow_strategy A,
         cld_flow_strategy_dic B1,
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/SubstationMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/SubstationMapper.xml
index db27dcf0b..0766560f4 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/SubstationMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/SubstationMapper.xml
@@ -75,7 +75,7 @@
                     line.id AS lineId,
                     line.NAME AS lineName,
                     lineDetail.Power_Substation_Name AS powerSubstationName,
-                    ( SELECT id FROM pq_line WHERE `Name` = lineDetail.Power_Substation_Name ) AS Power_Substation_id
+                    ( SELECT id FROM pq_line WHERE Name = lineDetail.Power_Substation_Name ) AS Power_Substation_id
                 FROM
                     pq_line line,
                     pq_line voltage,
@@ -96,7 +96,7 @@
                   AND line.id = lineDetail.id
                   AND vg.Id = voltage.id
                 ORDER BY
-                    substation.`Name`
+                    substation.Name
             ) cc
         WHERE
             Power_Substation_id IS NULL;
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/SuperDataMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/SuperDataMapper.xml
index e7581463f..44c614511 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/SuperDataMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/SuperDataMapper.xml
@@ -4,11 +4,11 @@
 
 
     <select id="getPointSuper" resultType="com.njcn.device.pq.pojo.param.SuperDataParam">
-        SELECT pl.`Name`  AS "mName",
-               pl1.`Name` AS "pName",
-               pl2.`Name` AS "devName",
-               pl3.`Name` AS "subName",
-               pl4.`Name` AS "urbanName"
+        SELECT pl.Name  AS "mName",
+               pl1.Name AS "pName",
+               pl2.Name AS "devName",
+               pl3.Name AS "subName",
+               pl4.Name AS "urbanName"
         FROM pq_line pl
                  LEFT JOIN pq_line pl1 ON pl.Pid = pl1.Id
                  LEFT JOIN pq_line pl2 ON pl1.Pid = pl2.Id
@@ -18,9 +18,9 @@
     </select>
     <select id="getDeviceSuper" resultType="com.njcn.device.pq.pojo.param.SuperDataParam">
             SELECT
-                pl.`Name` AS "devName",
-                pl1.`Name` AS "subName",
-                pl2.`Name` AS "urbanName"
+                pl.Name AS "devName",
+                pl1.Name AS "subName",
+                pl2.Name AS "urbanName"
             FROM
                 pq_line pl
                     LEFT JOIN pq_line pl1 ON pl.Pid = pl1.Id
@@ -30,7 +30,7 @@
     </select>
 
     <select id="getBaseReam" resultType="com.njcn.device.pq.pojo.param.BaseReamParam">
-        SELECT cdm.Line_Id "id",cdm.Base_Meal_Id "baseMealId",cdm.Ream_Meal_Id "extendMealId",cfm.`Name` "baseMealName",cfm1.`Name` "extendMealName",cfm.Flow "baseMealFlow",cfm1.Flow "extendMealFlow"
+        SELECT cdm.Line_Id "id",cdm.Base_Meal_Id "baseMealId",cdm.Ream_Meal_Id "extendMealId",cfm.Name "baseMealName",cfm1.Name "extendMealName",cfm.Flow "baseMealFlow",cfm1.Flow "extendMealFlow"
         FROM cld_dev_meal cdm
 
                  left join cld_flow_meal cfm on cdm.Base_Meal_Id = cfm.Id
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalOnlineRateDataMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalOnlineRateDataMapper.xml
index 5e56eaf3e..4576a59b0 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalOnlineRateDataMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalOnlineRateDataMapper.xml
@@ -29,13 +29,13 @@
         SELECT
         device.id,
         device.pid,
-        device.`Name`,
-        device.`Name` AS dataName,
-        device.`Level`,
+        device.Name,
+        device.Name AS dataName,
+        device.Level,
         device.Sort,
         pdevice.ip,
         pdevice.Com_Flag AS comFlag,
-        sddManufacturer.`Name` AS manufacturer,
+        sddManufacturer.Name AS manufacturer,
         pdevice.Update_Time AS updateTime,
         min(sddLineGrade.Algo_Describe) as algoDescribe
         FROM
@@ -47,7 +47,7 @@
         LEFT JOIN pq_device AS pdevice ON device.id = pdevice.id
         LEFT JOIN sys_dict_data AS sddManufacturer ON pdevice.Manufacturer = sddManufacturer.id
         WHERE
-        device.`Level` = 4
+        device.Level = 4
         AND device.id in
         <foreach collection="devIds" item="item" open="(" close=")" separator=",">
             #{item}
@@ -58,12 +58,12 @@
         group by
         device.id,
         device.pid,
-        device.`Name`,
-        device.`Level`,
+        device.Name,
+        device.Level,
         device.Sort,
         pdevice.ip,
         pdevice.Com_Flag,
-        sddManufacturer.`Name`,
+        sddManufacturer.Name,
         pdevice.Update_Time
 
     </select>
@@ -111,10 +111,10 @@
         SELECT
         sub.id,
         sub.pid,
-        sub.`Level`,
+        sub.Level,
         sub.sort,
-        sub.`Name`,
-        sdd.`Name` AS subScale
+        sub.Name,
+        sdd.Name AS subScale
         FROM
         pq_line sub
         LEFT JOIN pq_substation AS psub ON sub.id = psub.id
@@ -132,16 +132,16 @@
         line.Id as 'id',
         line.pid as 'pid',
         line.Pids as 'pids',
-        line.`Name` AS 'name',
-        line.`Level`as 'Level',
+        line.Name AS 'name',
+        line.Levelas 'Level',
         line.Update_Time AS 'updateTime',
         line.Sort as 'sort',
         pd.Call_Flag as 'ComFlag',
-        sdd.`Name` AS 'LineScale',
-        device.`Name` AS 'deviceName',
+        sdd.Name AS 'LineScale',
+        device.Name AS 'deviceName',
         pd.IP AS 'ip',
-        msdd.`Name` AS 'manufacturer',
-        pldsdd.`Name` AS 'lineGrade',
+        msdd.Name AS 'manufacturer',
+        pldsdd.Name AS 'lineGrade',
         pld.Load_Type AS 'loadType'
         FROM
         pq_line AS line
@@ -152,9 +152,9 @@
         LEFT JOIN sys_dict_data AS sdd ON sdd.id = pv.Scale
         LEFT JOIN pq_line_detail AS pld ON line.id = pld.Id
         LEFT JOIN sys_dict_data AS pldsdd ON pld.Line_Grade = pldsdd.id
-        LEFT JOIN sys_dict_data AS msdd ON pd.Manufacturer = msdd.`id`
+        LEFT JOIN sys_dict_data AS msdd ON pd.Manufacturer = msdd.id
         WHERE
-        line.`Level` = 6
+        line.Level = 6
         AND
         line.id in
         <foreach collection="lineIndexes" item="item" open="(" close=")" separator=",">
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java
index f922a800e..39d09ea16 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java
@@ -93,9 +93,9 @@ public class GridDiagramServiceImpl implements GridDiagramService {
         List<RStatIntegrityD> onIntegrityByIds = new ArrayList<>();
         if (CollUtil.isNotEmpty(lineIdsAll)) {
             //监测点完整性
-            onIntegrityByIds.addAll(integrityDMapper.selectList(new QueryWrapper<RStatIntegrityD>().select("sum(real_time) as `realTime`,sum(due_time) as dueTime,line_index as lineIndex").in(CollUtil.isNotEmpty(lineIdsAll), "line_index", lineIdsAll).ge(StrUtil.isNotBlank(param.getSearchBeginTime()), "time_id", DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime()))).le(StrUtil.isNotBlank(param.getSearchEndTime()), "time_id", DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime()))).groupBy("line_index")));
+            onIntegrityByIds.addAll(integrityDMapper.selectList(new QueryWrapper<RStatIntegrityD>().select("sum(real_time) as realTime,sum(due_time) as dueTime,line_index as lineIndex").in(CollUtil.isNotEmpty(lineIdsAll), "line_index", lineIdsAll).ge(StrUtil.isNotBlank(param.getSearchBeginTime()), "time_id", DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime()))).le(StrUtil.isNotBlank(param.getSearchEndTime()), "time_id", DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime()))).groupBy("line_index")));
             //终端在线率
-            onlineRateByDevIds.addAll(onLineRateDMapper.selectList(new QueryWrapper<RStatOnlinerateD>().select("sum(online_min) as `onlineMin`,sum(offline_min) as offlineMin,dev_index as devIndex").in(CollUtil.isNotEmpty(devIdsAll), "dev_index", devIdsAll).ge(StrUtil.isNotBlank(param.getSearchBeginTime()), "time_id", DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime()))).le(StrUtil.isNotBlank(param.getSearchEndTime()), "time_id", DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime()))).groupBy("dev_index")));
+            onlineRateByDevIds.addAll(onLineRateDMapper.selectList(new QueryWrapper<RStatOnlinerateD>().select("sum(online_min) as onlineMin,sum(offline_min) as offlineMin,dev_index as devIndex").in(CollUtil.isNotEmpty(devIdsAll), "dev_index", devIdsAll).ge(StrUtil.isNotBlank(param.getSearchBeginTime()), "time_id", DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime()))).le(StrUtil.isNotBlank(param.getSearchEndTime()), "time_id", DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime()))).groupBy("dev_index")));
         }
 
         Map<String, DeptGetChildrenMoreDTO> deptLineMap = deptGetChildrenMoreDTOS.stream().collect(Collectors.toMap(DeptGetChildrenMoreDTO::getUnitId, Function.identity()));
@@ -350,7 +350,7 @@ public class GridDiagramServiceImpl implements GridDiagramService {
         List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(param.getDeviceInfoParam(), Stream.of(0).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList()));
         List<String> devIDs = generalDeviceDTOList.stream().flatMap(x -> x.getDeviceIndexes().stream()).distinct().collect(Collectors.toList());
         List<RStatOnlinerateD> onlinerateDS = onLineRateDMapper.selectList(new QueryWrapper<RStatOnlinerateD>()
-                .select("sum(online_min) as `onlineMin`,sum(offline_min) as offlineMin,dev_index as devIndex")
+                .select("sum(online_min) as onlineMin,sum(offline_min) as offlineMin,dev_index as devIndex")
                 .in(CollUtil.isNotEmpty(devIDs), "dev_index", devIDs)
                 .ge(StrUtil.isNotBlank(param.getSearchBeginTime()), "time_id", DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())))
                 .le(StrUtil.isNotBlank(param.getSearchEndTime()), "time_id", DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())))
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwEventCategoryDetailsMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwEventCategoryDetailsMapper.xml
index bbefb6fb7..fa7489c0b 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwEventCategoryDetailsMapper.xml
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwEventCategoryDetailsMapper.xml
@@ -207,7 +207,7 @@
             duration AS duration,
             feature_amplitude AS featureAmplitude
         FROM
-            `r_mp_event_detail`
+            r_mp_event_detail
              where start_time between #{startTime} and #{endTime}
     </select>
 
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwEventDistributionStatisticsMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwEventDistributionStatisticsMapper.xml
index ba4337464..1948aa431 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwEventDistributionStatisticsMapper.xml
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwEventDistributionStatisticsMapper.xml
@@ -12,7 +12,7 @@
             duration AS duration,
             feature_amplitude AS featureAmplitude
         FROM
-            `r_mp_event_detail`
+            r_mp_event_detail
     </select>
 
     <!--获取监测点电压暂降和短时中断分布情况-->
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwRStatOrgMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwRStatOrgMapper.xml
index 1ec02469c..e2cb5f4b6 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwRStatOrgMapper.xml
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwRStatOrgMapper.xml
@@ -34,7 +34,7 @@
         SELECT
         <include refid="query_field"></include>
         FROM
-        `r_stat_org_y`
+        r_stat_org_y
         WHERE
         <include refid="query_where"></include>
     </select>
@@ -44,7 +44,7 @@
         SELECT
         <include refid="query_field"></include>
         FROM
-        `r_stat_org_q`
+        r_stat_org_q
         WHERE
         <include refid="query_where"></include>
     </select>
@@ -54,7 +54,7 @@
         SELECT
         <include refid="query_field"></include>
         FROM
-        `r_stat_org_m`
+        r_stat_org_m
         WHERE
         <include refid="query_where"></include>
     </select>
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwRmpEventDetailMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwRmpEventDetailMapper.xml
index e0252fa4a..cfd2d6f72 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwRmpEventDetailMapper.xml
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwRmpEventDetailMapper.xml
@@ -89,12 +89,12 @@
         SELECT
             rmed.measurement_point_id AS lineId,
             rmed.start_time AS startTime,
-            line.`Name` AS lineName,
-            gd.`Name` AS gdName,
+            line.Name AS lineName,
+            gd.Name AS gdName,
             substation.id AS subId,
-            substation.`Name` AS subName,
+            substation.Name AS subName,
             pqdevice.IP AS ip,
-            scale.`Name` AS scale,
+            scale.Name AS scale,
             typeDict.name AS advanceType,
             reasonDict.name AS advanceReason,
             rmed.event_type AS eventType,
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/EventDetailMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/EventDetailMapper.xml
index 2acd36106..40acc1546 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/EventDetailMapper.xml
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/EventDetailMapper.xml
@@ -18,9 +18,9 @@
     <select id="ListEventType" resultType="com.njcn.event.pojo.vo.GeneralVO">
         SELECT
          id,
-        sum(IF(`event_type` =#{condMap.Voltage_Dip}, num, 0)) as sagsCount,
-        sum(IF(`event_type` = #{condMap.Short_Interruptions}, num, 0)) as breakCount,
-        sum(IF(`event_type` = #{condMap.Voltage_Rise}, num, 0)) as upCount
+        sum(IF(event_type =#{condMap.Voltage_Dip}, num, 0)) as sagsCount,
+        sum(IF(event_type = #{condMap.Short_Interruptions}, num, 0)) as breakCount,
+        sum(IF(event_type = #{condMap.Voltage_Rise}, num, 0)) as upCount
         from(
             SELECT
             measurement_point_id AS id,
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/EventDistributionStatisticsMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/EventDistributionStatisticsMapper.xml
index dbee5d857..f3efe5c4e 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/EventDistributionStatisticsMapper.xml
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/EventDistributionStatisticsMapper.xml
@@ -209,7 +209,7 @@
             duration*1000 AS duration,
             feature_amplitude*100 AS featureAmplitude
         FROM
-            `r_mp_event_detail`
+            r_mp_event_detail
         WHERE
             measurement_point_id IN
         <foreach collection="monitorIdList" item="item" open="(" close=")" separator=",">
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml
index 03b523d2f..932b2c521 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml
@@ -102,7 +102,7 @@
     <select id="getMiddleDown" resultType="com.njcn.device.pq.pojo.vo.EventVO">
         SELECT
         ed.start_time  "time",
-        pl.`Name` "name",
+        pl.Name "name",
         ed.advance_reason reason,
         ed.advance_type "type",
         ed.feature_amplitude amplitude,
@@ -141,9 +141,9 @@
         )) base,
         IFNULL( cfm2.flow, 0 ) ream,
         IFNULL( cmf.Actual_Value, 0 ) statusValue,
-        pl1.`Name` "name",
+        pl1.Name "name",
         pd.IP ip,
-        pd.`Port` "port",
+        pd.Port "port",
         case
         when pd.Com_Flag = '0' then '通讯中断'
         when pd.Com_Flag = '1' then '通讯正常'
@@ -171,8 +171,8 @@
     </select>
 
     <select id="getMiddleLimitRate" resultType="com.njcn.device.pq.pojo.vo.MiddleLimitRateVO">
-            select pl.`Name` mName,
-            pl3.`Name` subName,
+            select pl.Name mName,
+            pl3.Name subName,
             t.count from pq_line pl
             inner join(select rslr.my_index,
             sum(rslr.all_time)  count
@@ -201,7 +201,7 @@
         rshom.org_no "id",
         round(avg(rshom.over_limit_measurement_ratio_accrued),2) avg
         from r_stat_harmonic_org_m rshom
-        left join sys_dict_data sdd on rshom.data_type = sdd.Id and sdd.`Code` = 'Mainnet_Point'
+        left join sys_dict_data sdd on rshom.data_type = sdd.Id and sdd.Code = 'Mainnet_Point'
         WHERE
         rshom.org_no IN
         <foreach collection="indexIds" item="item" open="(" close=")" separator=",">
@@ -272,7 +272,7 @@
     <select id="getMiddleDownChind" resultType="com.njcn.device.pq.pojo.vo.EventVO">
         SELECT
         ed.start_time  "time",
-               pl.`Name` "name",
+               pl.Name "name",
                ed.advance_reason reason,
                ed.advance_type "type",
                ed.feature_amplitude amplitude,
@@ -294,8 +294,8 @@
     </select>
 
     <select id="getMiddleLimitRateChild" resultType="com.njcn.device.pq.pojo.vo.MiddleLimitRateVO">
-        select pl.`Name` mName,
-        pl3.`Name` subName,
+        select pl.Name mName,
+        pl3.Name subName,
         t.count from pq_line pl
         inner join(select rslr.my_index,
         sum(rslr.all_time)  count
@@ -333,9 +333,9 @@
         )) base,
         IFNULL( cfm2.flow, 0 ) ream,
         IFNULL( cmf.Actual_Value, 0 ) statusValue,
-        pl1.`Name` "name",
+        pl1.Name "name",
         pd.IP ip,
-        pd.`Port` "port",
+        pd.Port "port",
         case
         when pd.Com_Flag = '0' then '通讯中断'
         when pd.Com_Flag = '1' then '通讯正常'
@@ -363,7 +363,7 @@
 
     <select id="eventLists" resultType="com.njcn.device.pq.pojo.vo.EventVO">
             SELECT
-            ed.event_id as eventId, ed.start_time  "time",pl.`Name` "name",ed.advance_reason reason,ed.advance_type "type",ed.feature_amplitude amplitude,ed.duration
+            ed.event_id as eventId, ed.start_time  "time",pl.Name "name",ed.advance_reason reason,ed.advance_type "type",ed.feature_amplitude amplitude,ed.duration
             from pq_line pl
             left join r_mp_event_detail ed on pl.id = ed.measurement_point_id
             <where>
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/PmsMonitorMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/PmsMonitorMapper.xml
index d0ee9448a..87240cfce 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/PmsMonitorMapper.xml
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/PmsMonitorMapper.xml
@@ -6,7 +6,7 @@
     <select id="getMonitorInfo" resultType="com.njcn.event.pojo.po.PmsMonitorPO">
         SELECT
         id,
-        `Name`,
+        Name,
         Org_Name AS orgName,
         Org_Id AS orgId,
         Operation_Name AS operationName,
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventYMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventYMapper.xml
index a8f06a7cb..ead88b10f 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventYMapper.xml
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventYMapper.xml
@@ -51,9 +51,9 @@
         SELECT
         org_no as orgId,
         measurement_type_class as eventType,
-        SUM(IF(`event_type`=#{map.dip},event_count,0)) as eventCount,
-        SUM(IF(`event_type`=#{map.rise},event_count,0)) as riseCount,
-        SUM(IF(`event_type`=#{map.interrupt},event_count,0)) as interruptCount
+        SUM(IF(event_type=#{map.dip},event_count,0)) as eventCount,
+        SUM(IF(event_type=#{map.rise},event_count,0)) as riseCount,
+        SUM(IF(event_type=#{map.interrupt},event_count,0)) as interruptCount
         FROM
         <if test="param != null and  param.type == 1">
             r_stat_event_y
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/TransientMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/TransientMapper.xml
index 2da248247..83cf398ce 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/TransientMapper.xml
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/TransientMapper.xml
@@ -5,12 +5,12 @@
 
     <select id="getTransientData" resultType="TransientVO">
         SELECT
-        B.`Id` id,
-        B.`Name` name,
-        B4.`Name` powerCompany,
-        B3.`Name` substation,
-        D.`Name` voltageLevel,
-        E.`IP` networkParam
+        B.Id id,
+        B.Name name,
+        B4.Name powerCompany,
+        B3.Name substation,
+        D.Name voltageLevel,
+        E.IP networkParam
         FROM
         pq_line B,
         pq_voltage C,
@@ -36,8 +36,8 @@
 
     <!--    <select id="getTransientDataById" resultType="TransientVO">-->
     <!--        SELECT-->
-    <!--        A.`Name` name,-->
-    <!--        A3.`Name` substation-->
+    <!--        A.Name name,-->
+    <!--        A3.Name substation-->
     <!--        FROM-->
     <!--        pq_line A,-->
     <!--        pq_line A1,-->
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusbarHarmnicDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusbarHarmnicDPO.java
index acdd267ce..c70934e56 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusbarHarmnicDPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusbarHarmnicDPO.java
@@ -63,13 +63,13 @@ public class RDimBusbarHarmnicDPO   {
     /**
      * 0稳态指标1.暂态指标'
      */
-    @MppMultiId(value = "`Level`")
+    @MppMultiId(value = "Level")
     private Integer level;
 
     /**
      * 超标次数）
      */
-    @TableField(value = "`limit_count`")
+    @TableField(value = "limit_count")
     private Integer limitCount;
 
     /**
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/ClearPathUtil.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/ClearPathUtil.java
index b21898e7b..da04367e2 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/ClearPathUtil.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/ClearPathUtil.java
@@ -93,8 +93,8 @@ public class ClearPathUtil {
                 return '<';
             case '>':
                 return '>';
-            case '`':
-                return '`';
+            case '':
+                return '';
             case '\\':
                 return '/';
             case 'I':
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/mapping/RDimBusbarHarmnicDPOMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/mapping/RDimBusbarHarmnicDPOMapper.xml
index dac3a0f0d..66f58ff0d 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/mapping/RDimBusbarHarmnicDPOMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/mapping/RDimBusbarHarmnicDPOMapper.xml
@@ -20,7 +20,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    Org_Id, Statis_Date, BusBar_Id, Target_type, Voltage_level, `Level`, `limit count`,
-    Statis_count, `State`, Create_By, Create_Time, Update_By, Update_Time
+    Org_Id, Statis_Date, BusBar_Id, Target_type, Voltage_level, Level, limit count,
+    Statis_count, State, Create_By, Create_Time, Update_By, Update_Time
   </sql>
 </mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/mapping/RDimStationHarmnicDPOMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/mapping/RDimStationHarmnicDPOMapper.xml
index 8c05519c8..340638dac 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/mapping/RDimStationHarmnicDPOMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/mapping/RDimStationHarmnicDPOMapper.xml
@@ -15,7 +15,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    Org_Id, Statis_Date, `Station Id`, Target_type, `Level`, Monitor_Tag, Voltage_level,
+    Org_Id, Statis_Date, Station Id, Target_type, Level, Monitor_Tag, Voltage_level,
     limit_count, Statis_count
   </sql>
 </mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/LargeScreenMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/LargeScreenMapper.xml
index fe2f757d0..913a655e6 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/LargeScreenMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/LargeScreenMapper.xml
@@ -7,7 +7,7 @@
         rshom.org_no "id",
         round(avg(rshom.over_limit_measurement_ratio_accrued),2) avg
         from r_stat_harmonic_org_m rshom
-        left join sys_dict_data sdd on rshom.data_type = sdd.Id and sdd.`Code` = 'Mainnet_Point'
+        left join sys_dict_data sdd on rshom.data_type = sdd.Id and sdd.Code = 'Mainnet_Point'
         WHERE
         rshom.org_no IN
         <foreach collection="indexIds" item="item" open="(" close=")" separator=",">
@@ -27,7 +27,7 @@
         rshom.measurement_type_class "id",
         round(avg(rshom.over_limit_measurement_ratio_accrued),2) avg
         from r_stat_harmonic_m rshom
-        left join sys_dict_data sdd on rshom.data_type = sdd.Id and sdd.`Code` = 'Mainnet_Point'
+        left join sys_dict_data sdd on rshom.data_type = sdd.Id and sdd.Code = 'Mainnet_Point'
         WHERE
         rshom.measurement_type_class IN
         <foreach collection="indexIds" item="item" open="(" close=")" separator=",">
@@ -43,7 +43,7 @@
     </select>
 
     <select id="getPowerOrder" resultType="com.njcn.device.pq.pojo.vo.PowerOrderVO">
-        select t.*, pl.`Name` "name"
+        select t.*, pl.Name "name"
         from (
         SELECT rsdhpd.line_id "id", round(max(rsdhpd.p), 0) "max"
         FROM r_stat_data_harmpower_p_d rsdhpd
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/DeptTempMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/DeptTempMapper.xml
index c9ca265af..0d4657e99 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/DeptTempMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/DeptTempMapper.xml
@@ -23,7 +23,7 @@
     <select id="getDeptTempByTempId" resultType="SysDeptTempVO">
         SELECT
             a.*,
-            b.`Name` deptName
+            b.Name deptName
         FROM
             sys_dept_temp a
             LEFT JOIN sys_dept b ON a.dept_id = b.id
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/HarmonicMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/HarmonicMapper.xml
index 4f448b364..be9fcb6be 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/HarmonicMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/HarmonicMapper.xml
@@ -7,16 +7,16 @@
             A.Id,
             A.Pid,
             A.Pids,
-            A.`Name` name,
+            A.Name name,
             A.State,
             A.Sort,
             A.Level,
-            D.`Name` voltageLevel,
-            D1.`Name` factoryName,
+            D.Name voltageLevel,
+            D1.Name factoryName,
             C.IP networkParam,
             C.Update_Time time,
-            A2.`Name` deviceName,
-            D2.`Name` loadType
+            A2.Name deviceName,
+            D2.Name loadType
         FROM
             pq_line A,
             pq_voltage B,
@@ -68,7 +68,7 @@
             A.id,
             A.Pid,
             A.Pids,
-            A.`Name`,
+            A.Name,
             A.Sort,
             A.Level level
         FROM
@@ -86,10 +86,10 @@
             A.id,
             A.Pid,
             A.Pids,
-            A.`Name`,
+            A.Name,
             A.Sort,
             A.Level level,
-            C.`Name` voltageLevel
+            C.Name voltageLevel
         FROM
             pq_line A,
             pq_substation B,
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/IntegrityMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/IntegrityMapper.xml
index 1ccedd32a..eca021f9c 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/IntegrityMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/IntegrityMapper.xml
@@ -8,16 +8,16 @@
             line.Id,
             line.Pid,
             line.Pids,
-            line.`Name` NAME,
+            line.Name NAME,
             line.Sort,
             line.LEVEL,
-            scale.`Name` voltageLevel,
-            factory.`Name` factoryName,
+            scale.Name voltageLevel,
+            factory.Name factoryName,
             pqdevice.IP networkParam,
             pqdevice.Update_Time time,
             pqdevice.Com_Flag state,
-            device.`Name` deviceName,
-            loadtype.`Name` loadType
+            device.Name deviceName,
+            loadtype.Name loadType
         FROM
             pq_line line,
             pq_line_detail lineDetail,
@@ -48,7 +48,7 @@
             A.id,
             A.Pid,
             A.Pids,
-            A.`Name`,
+            A.Name,
             A.Sort,
             A.Level level
         FROM
@@ -65,10 +65,10 @@
             A.id,
             A.Pid,
             A.Pids,
-            A.`Name`,
+            A.Name,
             A.Sort,
             A.Level level,
-            C.`Name` voltageLevel
+            C.Name voltageLevel
         FROM
             pq_line A,
             pq_substation B,
@@ -88,7 +88,7 @@
         A.Pids,
         A.Sort,
         A.Level level,
-        B.`Name` name
+        B.Name name
         FROM
         pq_line A,
         sys_area B
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/OnlineRateDataMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/OnlineRateDataMapper.xml
index 0b4a99b75..3da053286 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/OnlineRateDataMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/OnlineRateDataMapper.xml
@@ -11,10 +11,10 @@
             A.State,
             A.Sort,
             A.Level,
-            B.`IP` networkParam,
-            B.`Update_Time` time,
-            D.`Name` factoryName,
-            A.`Name` deviceName
+            B.IP networkParam,
+            B.Update_Time time,
+            D.Name factoryName,
+            A.Name deviceName
         FROM
             pq_line A,
             pq_device B,
@@ -50,9 +50,9 @@
 <!--            A.Id,-->
 <!--            A.Pid,-->
 <!--            A.Pids,-->
-<!--            A.`Name` name,-->
+<!--            A.Name name,-->
 <!--            A.Sort,-->
-<!--            A.`Level` level,-->
+<!--            A.Level level,-->
 <!--        FROM-->
 <!--            pq_line A,-->
 <!--            pq_line A1,-->
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPollutionDPOMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPollutionDPOMapper.xml
index fcd50a972..9d4920aa4 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPollutionDPOMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPollutionDPOMapper.xml
@@ -11,13 +11,13 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    line_id, data_date, pollution_type, `value`
+    line_id, data_date, pollution_type, value
   </sql>
   <update id="updateBatch" parameterType="java.util.List">
     <!--@mbg.generated-->
     update r_mp_pollution_d
     <trim prefix="set" suffixOverrides=",">
-      <trim prefix="`value` = case" suffix="end,">
+      <trim prefix="value = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           when line_id = #{item.lineId,jdbcType=VARCHAR} then #{item.value,jdbcType=FLOAT}
         </foreach>
@@ -72,7 +72,7 @@
   <insert id="batchInsert" parameterType="map">
     <!--@mbg.generated-->
     insert into r_mp_pollution_d
-    (line_id, data_date, pollution_type, `value`)
+    (line_id, data_date, pollution_type, value)
     values
     <foreach collection="list" item="item" separator=",">
       (#{item.lineId,jdbcType=VARCHAR}, #{item.dataDate,jdbcType=TIMESTAMP}, #{item.pollutionType,jdbcType=VARCHAR}, 
@@ -82,7 +82,7 @@
   <insert id="insertOrUpdate" parameterType="com.njcn.harmonic.pojo.po.RMpPollutionDPO">
     <!--@mbg.generated-->
     insert into r_mp_pollution_d
-    (line_id, data_date, pollution_type, `value`)
+    (line_id, data_date, pollution_type, value)
     values
     (#{lineId,jdbcType=VARCHAR}, #{dataDate,jdbcType=TIMESTAMP}, #{pollutionType,jdbcType=VARCHAR}, 
       #{value,jdbcType=FLOAT})
@@ -90,7 +90,7 @@
     line_id = #{lineId,jdbcType=VARCHAR}, 
     data_date = #{dataDate,jdbcType=TIMESTAMP}, 
     pollution_type = #{pollutionType,jdbcType=VARCHAR}, 
-    `value` = #{value,jdbcType=FLOAT}
+    value = #{value,jdbcType=FLOAT}
   </insert>
   <insert id="insertOrUpdateSelective" parameterType="com.njcn.harmonic.pojo.po.RMpPollutionDPO">
     <!--@mbg.generated-->
@@ -106,7 +106,7 @@
         pollution_type,
       </if>
       <if test="value != null">
-        `value`,
+        value,
       </if>
     </trim>
     values
@@ -136,7 +136,7 @@
         pollution_type = #{pollutionType,jdbcType=VARCHAR},
       </if>
       <if test="value != null">
-        `value` = #{value,jdbcType=FLOAT},
+        value = #{value,jdbcType=FLOAT},
       </if>
     </trim>
   </insert>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataIDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataIDMapper.xml
index 59a7f0196..168f5e14e 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataIDMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataIDMapper.xml
@@ -4,13 +4,13 @@
 
     <select id="getINeg" resultType="com.njcn.harmonic.pojo.po.day.RStatDataIDPO">
         select
-            `time` time,
+            time time,
             line_id lineId,
             avg(i_neg) iNeg
         from
             r_stat_data_i_d
         where
-            `time` between #{startTime} and #{endTime}
+            time between #{startTime} and #{endTime}
             and phasic_type in ('A','B','C')
             and value_type = 'MAX'
             and line_id IN
@@ -19,17 +19,17 @@
             </foreach>
             and quality_flag = 0
         group by
-            `time`,line_id
+            time,line_id
     </select>
     <select id="getI" resultType="com.njcn.harmonic.pojo.po.day.RStatDataIDPO">
         select
-        `time` time,
+        time time,
         line_id lineId,
         avg(i_neg) iNeg
         from
         r_stat_data_i_d
         where
-        `time` between #{startTime} and #{endTime}
+        time between #{startTime} and #{endTime}
         and phasic_type in ('A','B','C')
         and value_type = 'MAX'
         and line_id IN
@@ -38,6 +38,6 @@
         </foreach>
         and quality_flag = 0
         group by
-        `time`,line_id
+        time,line_id
     </select>
 </mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataInharmVDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataInharmVDMapper.xml
index f80048c80..dc5d51b83 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataInharmVDMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataInharmVDMapper.xml
@@ -5,13 +5,13 @@
 
     <select id="getV" resultType="com.njcn.harmonic.pojo.po.day.RStatDataInharmVDPO">
         select
-            `time` time,
+            time time,
             line_id lineId,
             avg(v_1) v1
         from
         r_stat_data_inharm_v_d
         where
-            `time` between #{startTime} and #{endTime}
+            time between #{startTime} and #{endTime}
             and phasic_type in ('A','B','C')
             and value_type = 'MAX'
             and line_id IN
@@ -20,6 +20,6 @@
             </foreach>
             and quality_flag = 0
         group by
-            `time`,line_id
+            time,line_id
     </select>
 </mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataPltDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataPltDMapper.xml
index cd108b187..180a47dc4 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataPltDMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataPltDMapper.xml
@@ -4,13 +4,13 @@
 
     <select id="getPlt" resultType="com.njcn.harmonic.pojo.po.day.RStatDataPltDPO">
         select
-            `time` time,
+            time time,
             line_id lineId,
             avg(plt) plt
         from
             r_stat_data_plt_d
         where
-            `time` between #{startTime} and #{endTime}
+            time between #{startTime} and #{endTime}
             and phasic_type in ('A','B','C')
             and value_type = 'MAX'
             and line_id IN
@@ -19,7 +19,7 @@
             </foreach>
             and quality_flag = 0
         group by
-            `time`,line_id
+            time,line_id
     </select>
 
 </mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataVDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataVDMapper.xml
index 3656f4e00..f9d788fbe 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataVDMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataVDMapper.xml
@@ -4,14 +4,14 @@
 
     <select id="getFreqDev" resultType="com.njcn.harmonic.pojo.po.RStatDataVD">
         select
-            `time` time,
+            time time,
             line_id lineId,
             avg(abs(freq_dev)) freqDev,
             avg(v_unbalance) vUnbalance
         from
             r_stat_data_v_d
         where
-            `time` between #{startTime} and #{endTime}
+            time between #{startTime} and #{endTime}
             and phasic_type = 'T'
             and value_type = 'MAX'
             and line_id IN
@@ -20,18 +20,18 @@
             </foreach>
             and quality_flag = 0
         group by
-            `time`,line_id
+            time,line_id
     </select>
 
     <select id="getVuDev" resultType="com.njcn.harmonic.pojo.po.RStatDataVD">
         select
-            `time` time,
+            time time,
             line_id lineId,
             avg(vu_dev) vuDev
         from
             r_stat_data_v_d
         where
-            `time` between #{startTime} and #{endTime}
+            time between #{startTime} and #{endTime}
             and phasic_type in ('A','B','C')
             and value_type = 'MAX'
             and line_id IN
@@ -40,18 +40,18 @@
             </foreach>
             and quality_flag = 0
         group by
-            `time`,line_id
+            time,line_id
     </select>
 
     <select id="getVthd" resultType="com.njcn.harmonic.pojo.po.RStatDataVD">
         select
-            `time` time,
+            time time,
             line_id lineId,
             avg(v_thd) vThd
         from
             r_stat_data_v_d
         where
-            `time` between #{startTime} and #{endTime}
+            time between #{startTime} and #{endTime}
             and phasic_type in ('A','B','C')
             and value_type = 'CP95'
             and line_id IN
@@ -60,18 +60,18 @@
             </foreach>
             and quality_flag = 0
         group by
-            `time`,line_id
+            time,line_id
     </select>
 
     <select id="getUnbalance" resultType="com.njcn.harmonic.pojo.po.RStatDataVD">
         select
-        `time` time,
+        time time,
         line_id lineId,
         avg(v_unbalance) vUnbalance
         from
         r_stat_data_v_d
         where
-        `time` between #{startTime} and #{endTime}
+        time between #{startTime} and #{endTime}
         and phasic_type = 'T'
         and value_type = 'CP95'
         and line_id IN
@@ -80,17 +80,17 @@
         </foreach>
         and quality_flag = 0
         group by
-        `time`,line_id
+        time,line_id
     </select>
     <select id="getV" resultType="com.njcn.harmonic.pojo.po.RStatDataVD">
         select
-        `time` time,
+        time time,
         line_id lineId,
         avg(v_1) v1
         from
         r_stat_data_v_d
         where
-        `time` between #{startTime} and #{endTime}
+        time between #{startTime} and #{endTime}
         and phasic_type = 'T'
         and value_type = 'CP95'
         and line_id IN
@@ -99,7 +99,7 @@
         </foreach>
         and quality_flag = 0
         group by
-        `time`,line_id
+        time,line_id
     </select>
 
 </mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitRateDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitRateDMapper.xml
index 1b6d3a623..b53f4830c 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitRateDMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitRateDMapper.xml
@@ -189,7 +189,7 @@
         IFNULL(TRUNCATE ((1- (
         sum( flicker_overtime )+ sum( flicker_all_time )+ sum( freq_dev_overtime )+ sum( voltage_dev_overtime )+ sum( ubalance_overtime )+ sum( uaberrance_overtime )+ sum( i_neg_overtime )+ sum( uharm_2_overtime )+ sum( uharm_3_overtime )+ sum( uharm_4_overtime )+ sum( uharm_5_overtime )+ sum( uharm_6_overtime )+ sum( uharm_7_overtime )+ sum( uharm_8_overtime )+ sum( uharm_9_overtime )+ sum( uharm_10_overtime )+ sum( uharm_11_overtime )+ sum( uharm_12_overtime )+ sum( uharm_13_overtime )+ sum( uharm_14_overtime )+ sum( uharm_15_overtime )+ sum( uharm_16_overtime )+ sum( uharm_17_overtime )+ sum( uharm_18_overtime )+ sum( uharm_19_overtime )+ sum( uharm_20_overtime )+ sum( uharm_21_overtime )+ sum( uharm_22_overtime )+ sum( uharm_23_overtime )+ sum( uharm_24_overtime )+ sum( uharm_25_overtime )+ sum( iharm_2_overtime )+ sum( iharm_3_overtime )+ sum( iharm_4_overtime )+ sum( iharm_5_overtime )+ sum( iharm_6_overtime )+ sum( iharm_7_overtime )+ sum( iharm_8_overtime )+ sum( iharm_9_overtime )+ sum( iharm_10_overtime )+ sum( iharm_11_overtime )+ sum( iharm_12_overtime )+ sum( iharm_13_overtime )+ sum( iharm_14_overtime )+ sum( iharm_15_overtime )+ sum( iharm_16_overtime )+ sum( iharm_17_overtime )+ sum( iharm_18_overtime )+ sum( iharm_19_overtime )+ sum( iharm_20_overtime )+ sum( iharm_21_overtime )+ sum( iharm_22_overtime )+ sum( iharm_23_overtime )+ sum( iharm_24_overtime )+ sum( iharm_25_overtime )+ sum( inuharm_1_overtime )+ sum( inuharm_2_overtime )+ sum( inuharm_3_overtime )+ sum( inuharm_4_overtime )+ sum( inuharm_5_overtime )+ sum( inuharm_6_overtime )+ sum( inuharm_7_overtime )+ sum( inuharm_8_overtime )+ sum( inuharm_9_overtime )+ sum( inuharm_10_overtime )+ sum( inuharm_11_overtime )+ sum( inuharm_12_overtime )+ sum( inuharm_13_overtime )+ sum( inuharm_14_overtime )+ sum( inuharm_15_overtime )+ sum( inuharm_16_overtime )) /(
         SUM( all_time )* 71 )
-        )* 100,2),0) `data`
+        )* 100,2),0) data
         FROM
         r_stat_limit_rate_d
         <where>
@@ -208,7 +208,7 @@
             </if>
         </where>
         GROUP BY
-        `time`
+        time
     </select>
     <select id="getSumPassRateList" resultType="com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO">
         SELECT
@@ -303,7 +303,7 @@
             </if>
         </where>
         GROUP BY
-            `my_index`
+            my_index
     </select>
 
     <select id="getAssessTargetRate" resultType="com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO">
@@ -409,7 +409,7 @@
                     + inuharm_1_overtime + inuharm_2_overtime + inuharm_3_overtime + inuharm_4_overtime + inuharm_5_overtime + inuharm_6_overtime + inuharm_7_overtime + inuharm_8_overtime + inuharm_9_overtime + inuharm_10_overtime + inuharm_11_overtime + inuharm_12_overtime + inuharm_13_overtime + inuharm_14_overtime + inuharm_15_overtime + inuharm_16_overtime
             ) as allTime
         from
-            `r_stat_limit_rate_d`
+            r_stat_limit_rate_d
         <where>
             and time_id between #{statTime} and #{endTime}
             <if test=" ids != null and ids.size > 0">
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml
index ef0a873b6..12e81d123 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml
@@ -471,7 +471,7 @@
                      )
                  ) AS allOvertime
              FROM
-                 `r_stat_limit_rate_d`
+                 r_stat_limit_rate_d
                     <where>
                         and time_id between #{startTime} and #{endTime}
                         <if test=" ids != null and ids.size > 0">
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetMapper.xml
index 9bd058c96..3e9602cc2 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetMapper.xml
@@ -161,6 +161,6 @@
             </if>
         </where>
         GROUP BY
-        `my_index`
+        my_index
     </select>
 </mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionOrgDPOMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionOrgDPOMapper.xml
index 074f3bcbb..a5bdd8741 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionOrgDPOMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionOrgDPOMapper.xml
@@ -11,13 +11,13 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    org_id, data_date, pollution_type, `value`
+    org_id, data_date, pollution_type, value
   </sql>
   <update id="updateBatch" parameterType="java.util.List">
     <!--@mbg.generated-->
     update r_stat_pollution_org_d
     <trim prefix="set" suffixOverrides=",">
-      <trim prefix="`value` = case" suffix="end,">
+      <trim prefix="value = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           when org_id = #{item.orgId,jdbcType=VARCHAR} then #{item.value,jdbcType=FLOAT}
         </foreach>
@@ -31,7 +31,7 @@
   <insert id="batchInsert" parameterType="map">
     <!--@mbg.generated-->
     insert into r_stat_pollution_org_d
-    (org_id, data_date, pollution_type, `value`)
+    (org_id, data_date, pollution_type, value)
     values
     <foreach collection="list" item="item" separator=",">
       (#{item.orgId,jdbcType=VARCHAR}, #{item.dataDate,jdbcType=TIMESTAMP}, #{item.pollutionType,jdbcType=VARCHAR}, 
@@ -41,7 +41,7 @@
   <insert id="insertOrUpdate" parameterType="com.njcn.harmonic.pojo.po.RStatPollutionOrgDPO">
     <!--@mbg.generated-->
     insert into r_stat_pollution_org_d
-    (org_id, data_date, pollution_type, `value`)
+    (org_id, data_date, pollution_type, value)
     values
     (#{orgId,jdbcType=VARCHAR}, #{dataDate,jdbcType=TIMESTAMP}, #{pollutionType,jdbcType=VARCHAR}, 
       #{value,jdbcType=FLOAT})
@@ -49,7 +49,7 @@
     org_id = #{orgId,jdbcType=VARCHAR}, 
     data_date = #{dataDate,jdbcType=TIMESTAMP}, 
     pollution_type = #{pollutionType,jdbcType=VARCHAR}, 
-    `value` = #{value,jdbcType=FLOAT}
+    value = #{value,jdbcType=FLOAT}
   </insert>
   <insert id="insertOrUpdateSelective" parameterType="com.njcn.harmonic.pojo.po.RStatPollutionOrgDPO">
     <!--@mbg.generated-->
@@ -65,7 +65,7 @@
         pollution_type,
       </if>
       <if test="value != null">
-        `value`,
+        value,
       </if>
     </trim>
     values
@@ -95,7 +95,7 @@
         pollution_type = #{pollutionType,jdbcType=VARCHAR},
       </if>
       <if test="value != null">
-        `value` = #{value,jdbcType=FLOAT},
+        value = #{value,jdbcType=FLOAT},
       </if>
     </trim>
   </insert>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionOrgMPOMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionOrgMPOMapper.xml
index 1d1182ac5..cad5d3653 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionOrgMPOMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionOrgMPOMapper.xml
@@ -11,7 +11,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    org_id, data_date, pollution_type, `value`
+    org_id, data_date, pollution_type, value
   </sql>
   <update id="updateBatch" parameterType="java.util.List">
     <!--@mbg.generated-->
@@ -22,7 +22,7 @@
           when org_id = #{item.orgId,jdbcType=VARCHAR} then #{item.pollutionType,jdbcType=VARCHAR}
         </foreach>
       </trim>
-      <trim prefix="`value` = case" suffix="end,">
+      <trim prefix="value = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           when org_id = #{item.orgId,jdbcType=VARCHAR} then #{item.value,jdbcType=FLOAT}
         </foreach>
@@ -36,7 +36,7 @@
   <insert id="batchInsert" parameterType="map">
     <!--@mbg.generated-->
     insert into r_stat_pollution_org_m
-    (org_id, data_date, pollution_type, `value`)
+    (org_id, data_date, pollution_type, value)
     values
     <foreach collection="list" item="item" separator=",">
       (#{item.orgId,jdbcType=VARCHAR}, #{item.dataDate,jdbcType=TIMESTAMP}, #{item.pollutionType,jdbcType=VARCHAR}, 
@@ -46,7 +46,7 @@
   <insert id="insertOrUpdate" parameterType="com.njcn.harmonic.pojo.po.RStatPollutionOrgMPO">
     <!--@mbg.generated-->
     insert into r_stat_pollution_org_m
-    (org_id, data_date, pollution_type, `value`)
+    (org_id, data_date, pollution_type, value)
     values
     (#{orgId,jdbcType=VARCHAR}, #{dataDate,jdbcType=TIMESTAMP}, #{pollutionType,jdbcType=VARCHAR}, 
       #{value,jdbcType=FLOAT})
@@ -54,7 +54,7 @@
     org_id = #{orgId,jdbcType=VARCHAR}, 
     data_date = #{dataDate,jdbcType=TIMESTAMP}, 
     pollution_type = #{pollutionType,jdbcType=VARCHAR}, 
-    `value` = #{value,jdbcType=FLOAT}
+    value = #{value,jdbcType=FLOAT}
   </insert>
   <insert id="insertOrUpdateSelective" parameterType="com.njcn.harmonic.pojo.po.RStatPollutionOrgMPO">
     <!--@mbg.generated-->
@@ -70,7 +70,7 @@
         pollution_type,
       </if>
       <if test="value != null">
-        `value`,
+        value,
       </if>
     </trim>
     values
@@ -100,7 +100,7 @@
         pollution_type = #{pollutionType,jdbcType=VARCHAR},
       </if>
       <if test="value != null">
-        `value` = #{value,jdbcType=FLOAT},
+        value = #{value,jdbcType=FLOAT},
       </if>
     </trim>
   </insert>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionOrgQPOMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionOrgQPOMapper.xml
index 97b0be8d3..e17c425eb 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionOrgQPOMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionOrgQPOMapper.xml
@@ -11,13 +11,13 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    org_id, data_date, pollution_type, `value`
+    org_id, data_date, pollution_type, value
   </sql>
   <update id="updateBatch" parameterType="java.util.List">
     <!--@mbg.generated-->
     update r_stat_pollution_org_q
     <trim prefix="set" suffixOverrides=",">
-      <trim prefix="`value` = case" suffix="end,">
+      <trim prefix="value = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           when org_id = #{item.orgId,jdbcType=VARCHAR} then #{item.value,jdbcType=FLOAT}
         </foreach>
@@ -31,7 +31,7 @@
   <insert id="batchInsert" parameterType="map">
     <!--@mbg.generated-->
     insert into r_stat_pollution_org_q
-    (org_id, data_date, pollution_type, `value`)
+    (org_id, data_date, pollution_type, value)
     values
     <foreach collection="list" item="item" separator=",">
       (#{item.orgId,jdbcType=VARCHAR}, #{item.dataDate,jdbcType=TIMESTAMP}, #{item.pollutionType,jdbcType=VARCHAR}, 
@@ -41,7 +41,7 @@
   <insert id="insertOrUpdate" parameterType="com.njcn.harmonic.pojo.po.RStatPollutionOrgQPO">
     <!--@mbg.generated-->
     insert into r_stat_pollution_org_q
-    (org_id, data_date, pollution_type, `value`)
+    (org_id, data_date, pollution_type, value)
     values
     (#{orgId,jdbcType=VARCHAR}, #{dataDate,jdbcType=TIMESTAMP}, #{pollutionType,jdbcType=VARCHAR}, 
       #{value,jdbcType=FLOAT})
@@ -49,7 +49,7 @@
     org_id = #{orgId,jdbcType=VARCHAR}, 
     data_date = #{dataDate,jdbcType=TIMESTAMP}, 
     pollution_type = #{pollutionType,jdbcType=VARCHAR}, 
-    `value` = #{value,jdbcType=FLOAT}
+    value = #{value,jdbcType=FLOAT}
   </insert>
   <insert id="insertOrUpdateSelective" parameterType="com.njcn.harmonic.pojo.po.RStatPollutionOrgQPO">
     <!--@mbg.generated-->
@@ -65,7 +65,7 @@
         pollution_type,
       </if>
       <if test="value != null">
-        `value`,
+        value,
       </if>
     </trim>
     values
@@ -95,7 +95,7 @@
         pollution_type = #{pollutionType,jdbcType=VARCHAR},
       </if>
       <if test="value != null">
-        `value` = #{value,jdbcType=FLOAT},
+        value = #{value,jdbcType=FLOAT},
       </if>
     </trim>
   </insert>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionOrgYPOMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionOrgYPOMapper.xml
index 965382f2d..c1fa50190 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionOrgYPOMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionOrgYPOMapper.xml
@@ -11,13 +11,13 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    org_id, data_date, pollution_type, `value`
+    org_id, data_date, pollution_type, value
   </sql>
   <update id="updateBatch" parameterType="java.util.List">
     <!--@mbg.generated-->
     update r_stat_pollution_org_y
     <trim prefix="set" suffixOverrides=",">
-      <trim prefix="`value` = case" suffix="end,">
+      <trim prefix="value = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           when org_id = #{item.orgId,jdbcType=VARCHAR} then #{item.value,jdbcType=FLOAT}
         </foreach>
@@ -31,7 +31,7 @@
   <insert id="batchInsert" parameterType="map">
     <!--@mbg.generated-->
     insert into r_stat_pollution_org_y
-    (org_id, data_date, pollution_type, `value`)
+    (org_id, data_date, pollution_type, value)
     values
     <foreach collection="list" item="item" separator=",">
       (#{item.orgId,jdbcType=VARCHAR}, #{item.dataDate,jdbcType=TIMESTAMP}, #{item.pollutionType,jdbcType=VARCHAR}, 
@@ -41,7 +41,7 @@
   <insert id="insertOrUpdate" parameterType="com.njcn.harmonic.pojo.po.RStatPollutionOrgYPO">
     <!--@mbg.generated-->
     insert into r_stat_pollution_org_y
-    (org_id, data_date, pollution_type, `value`)
+    (org_id, data_date, pollution_type, value)
     values
     (#{orgId,jdbcType=VARCHAR}, #{dataDate,jdbcType=TIMESTAMP}, #{pollutionType,jdbcType=VARCHAR}, 
       #{value,jdbcType=FLOAT})
@@ -49,7 +49,7 @@
     org_id = #{orgId,jdbcType=VARCHAR}, 
     data_date = #{dataDate,jdbcType=TIMESTAMP}, 
     pollution_type = #{pollutionType,jdbcType=VARCHAR}, 
-    `value` = #{value,jdbcType=FLOAT}
+    value = #{value,jdbcType=FLOAT}
   </insert>
   <insert id="insertOrUpdateSelective" parameterType="com.njcn.harmonic.pojo.po.RStatPollutionOrgYPO">
     <!--@mbg.generated-->
@@ -65,7 +65,7 @@
         pollution_type,
       </if>
       <if test="value != null">
-        `value`,
+        value,
       </if>
     </trim>
     values
@@ -95,7 +95,7 @@
         pollution_type = #{pollutionType,jdbcType=VARCHAR},
       </if>
       <if test="value != null">
-        `value` = #{value,jdbcType=FLOAT},
+        value = #{value,jdbcType=FLOAT},
       </if>
     </trim>
   </insert>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionSubstationDPOMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionSubstationDPOMapper.xml
index e64a9a8e9..88d5c1e4a 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionSubstationDPOMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionSubstationDPOMapper.xml
@@ -11,13 +11,13 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    substation_id, data_date, pollution_type, `value`
+    substation_id, data_date, pollution_type, value
   </sql>
   <update id="updateBatch" parameterType="java.util.List">
     <!--@mbg.generated-->
     update r_stat_pollution_substation_d
     <trim prefix="set" suffixOverrides=",">
-      <trim prefix="`value` = case" suffix="end,">
+      <trim prefix="value = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           when substation_id = #{item.substationId,jdbcType=VARCHAR} then #{item.value,jdbcType=FLOAT}
         </foreach>
@@ -31,7 +31,7 @@
   <insert id="batchInsert" parameterType="map">
     <!--@mbg.generated-->
     insert into r_stat_pollution_substation_d
-    (substation_id, data_date, pollution_type, `value`)
+    (substation_id, data_date, pollution_type, value)
     values
     <foreach collection="list" item="item" separator=",">
       (#{item.substationId,jdbcType=VARCHAR}, #{item.dataDate,jdbcType=TIMESTAMP}, #{item.pollutionType,jdbcType=VARCHAR}, 
@@ -41,7 +41,7 @@
   <insert id="insertOrUpdate" parameterType="com.njcn.harmonic.pojo.po.RStatPollutionSubstationDPO">
     <!--@mbg.generated-->
     insert into r_stat_pollution_substation_d
-    (substation_id, data_date, pollution_type, `value`)
+    (substation_id, data_date, pollution_type, value)
     values
     (#{substationId,jdbcType=VARCHAR}, #{dataDate,jdbcType=TIMESTAMP}, #{pollutionType,jdbcType=VARCHAR}, 
       #{value,jdbcType=FLOAT})
@@ -49,7 +49,7 @@
     substation_id = #{substationId,jdbcType=VARCHAR}, 
     data_date = #{dataDate,jdbcType=TIMESTAMP}, 
     pollution_type = #{pollutionType,jdbcType=VARCHAR}, 
-    `value` = #{value,jdbcType=FLOAT}
+    value = #{value,jdbcType=FLOAT}
   </insert>
   <insert id="insertOrUpdateSelective" parameterType="com.njcn.harmonic.pojo.po.RStatPollutionSubstationDPO">
     <!--@mbg.generated-->
@@ -65,7 +65,7 @@
         pollution_type,
       </if>
       <if test="value != null">
-        `value`,
+        value,
       </if>
     </trim>
     values
@@ -95,7 +95,7 @@
         pollution_type = #{pollutionType,jdbcType=VARCHAR},
       </if>
       <if test="value != null">
-        `value` = #{value,jdbcType=FLOAT},
+        value = #{value,jdbcType=FLOAT},
       </if>
     </trim>
   </insert>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionSubstationMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionSubstationMMapper.xml
index deb8c7f7b..c04cb2f42 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionSubstationMMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionSubstationMMapper.xml
@@ -11,7 +11,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    substation_id, data_date, pollution_type, `value`
+    substation_id, data_date, pollution_type, value
   </sql>
   <update id="updateBatch" parameterType="java.util.List">
     <!--@mbg.generated-->
@@ -22,7 +22,7 @@
           when substation_id = #{item.substationId,jdbcType=VARCHAR} then #{item.pollutionType,jdbcType=VARCHAR}
         </foreach>
       </trim>
-      <trim prefix="`value` = case" suffix="end,">
+      <trim prefix="value = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           when substation_id = #{item.substationId,jdbcType=VARCHAR} then #{item.value,jdbcType=FLOAT}
         </foreach>
@@ -36,7 +36,7 @@
   <insert id="batchInsert" parameterType="map">
     <!--@mbg.generated-->
     insert into r_stat_pollution_substation_m
-    (substation_id, data_date, pollution_type, `value`)
+    (substation_id, data_date, pollution_type, value)
     values
     <foreach collection="list" item="item" separator=",">
       (#{item.substationId,jdbcType=VARCHAR}, #{item.dataDate,jdbcType=TIMESTAMP}, #{item.pollutionType,jdbcType=VARCHAR}, 
@@ -46,7 +46,7 @@
   <insert id="insertOrUpdate" parameterType="com.njcn.harmonic.pojo.po.RStatPollutionSubstationM">
     <!--@mbg.generated-->
     insert into r_stat_pollution_substation_m
-    (substation_id, data_date, pollution_type, `value`)
+    (substation_id, data_date, pollution_type, value)
     values
     (#{substationId,jdbcType=VARCHAR}, #{dataDate,jdbcType=TIMESTAMP}, #{pollutionType,jdbcType=VARCHAR}, 
       #{value,jdbcType=FLOAT})
@@ -54,7 +54,7 @@
     substation_id = #{substationId,jdbcType=VARCHAR}, 
     data_date = #{dataDate,jdbcType=TIMESTAMP}, 
     pollution_type = #{pollutionType,jdbcType=VARCHAR}, 
-    `value` = #{value,jdbcType=FLOAT}
+    value = #{value,jdbcType=FLOAT}
   </insert>
   <insert id="insertOrUpdateSelective" parameterType="com.njcn.harmonic.pojo.po.RStatPollutionSubstationM">
     <!--@mbg.generated-->
@@ -70,7 +70,7 @@
         pollution_type,
       </if>
       <if test="value != null">
-        `value`,
+        value,
       </if>
     </trim>
     values
@@ -100,15 +100,15 @@
         pollution_type = #{pollutionType,jdbcType=VARCHAR},
       </if>
       <if test="value != null">
-        `value` = #{value,jdbcType=FLOAT},
+        value = #{value,jdbcType=FLOAT},
       </if>
     </trim>
   </insert>
   <select id="selectBySubstationPage" resultType="com.njcn.device.pq.pojo.dto.PollutionGridDiagramDTO">
 <!--    SELECT-->
 <!--      substation_id as id,-->
-<!--      IF(`pollution_type`=#{typeMapId.I,javaType=string},value,3.14159) as `data`,-->
-<!--      IF(`pollution_type`=#{typeMapId.V,javaType=string},value,3.14159) as `dataV`-->
+<!--      IF(pollution_type=#{typeMapId.I,javaType=string},value,3.14159) as data,-->
+<!--      IF(pollution_type=#{typeMapId.V,javaType=string},value,3.14159) as dataV-->
 <!--    FROM-->
 <!--      r_stat_pollution_substation_m-->
 <!--    <where>-->
@@ -127,7 +127,7 @@
 <!--    </where>-->
 <!--    GROUP BY-->
 <!--        substation_id-->
-<!--    ORDER BY `data` DESC,dataV DESC-->
+<!--    ORDER BY data DESC,dataV DESC-->
     select
       substation_id as id,
       SUM(case when pollution_type = #{typeMapId.I,javaType=string} then value else null end) as data ,
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionSubstationQPOMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionSubstationQPOMapper.xml
index 9d4030924..6fa27abec 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionSubstationQPOMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionSubstationQPOMapper.xml
@@ -11,13 +11,13 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    substation_id, data_date, pollution_type, `value`
+    substation_id, data_date, pollution_type, value
   </sql>
   <update id="updateBatch" parameterType="java.util.List">
     <!--@mbg.generated-->
     update r_stat_pollution_substation_q
     <trim prefix="set" suffixOverrides=",">
-      <trim prefix="`value` = case" suffix="end,">
+      <trim prefix="value = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           when substation_id = #{item.substationId,jdbcType=VARCHAR} then #{item.value,jdbcType=FLOAT}
         </foreach>
@@ -31,7 +31,7 @@
   <insert id="batchInsert" parameterType="map">
     <!--@mbg.generated-->
     insert into r_stat_pollution_substation_q
-    (substation_id, data_date, pollution_type, `value`)
+    (substation_id, data_date, pollution_type, value)
     values
     <foreach collection="list" item="item" separator=",">
       (#{item.substationId,jdbcType=VARCHAR}, #{item.dataDate,jdbcType=TIMESTAMP}, #{item.pollutionType,jdbcType=VARCHAR}, 
@@ -41,7 +41,7 @@
   <insert id="insertOrUpdate" parameterType="com.njcn.harmonic.pojo.po.RStatPollutionSubstationQPO">
     <!--@mbg.generated-->
     insert into r_stat_pollution_substation_q
-    (substation_id, data_date, pollution_type, `value`)
+    (substation_id, data_date, pollution_type, value)
     values
     (#{substationId,jdbcType=VARCHAR}, #{dataDate,jdbcType=TIMESTAMP}, #{pollutionType,jdbcType=VARCHAR}, 
       #{value,jdbcType=FLOAT})
@@ -49,7 +49,7 @@
     substation_id = #{substationId,jdbcType=VARCHAR}, 
     data_date = #{dataDate,jdbcType=TIMESTAMP}, 
     pollution_type = #{pollutionType,jdbcType=VARCHAR}, 
-    `value` = #{value,jdbcType=FLOAT}
+    value = #{value,jdbcType=FLOAT}
   </insert>
   <insert id="insertOrUpdateSelective" parameterType="com.njcn.harmonic.pojo.po.RStatPollutionSubstationQPO">
     <!--@mbg.generated-->
@@ -65,7 +65,7 @@
         pollution_type,
       </if>
       <if test="value != null">
-        `value`,
+        value,
       </if>
     </trim>
     values
@@ -95,7 +95,7 @@
         pollution_type = #{pollutionType,jdbcType=VARCHAR},
       </if>
       <if test="value != null">
-        `value` = #{value,jdbcType=FLOAT},
+        value = #{value,jdbcType=FLOAT},
       </if>
     </trim>
   </insert>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionSubstationYPOMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionSubstationYPOMapper.xml
index 95abdac7b..af71d1512 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionSubstationYPOMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPollutionSubstationYPOMapper.xml
@@ -11,13 +11,13 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    substation_id, data_date, pollution_type, `value`
+    substation_id, data_date, pollution_type, value
   </sql>
   <update id="updateBatch" parameterType="java.util.List">
     <!--@mbg.generated-->
     update r_stat_pollution_substation_y
     <trim prefix="set" suffixOverrides=",">
-      <trim prefix="`value` = case" suffix="end,">
+      <trim prefix="value = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           when substation_id = #{item.substationId,jdbcType=VARCHAR} then #{item.value,jdbcType=FLOAT}
         </foreach>
@@ -31,7 +31,7 @@
   <insert id="batchInsert" parameterType="map">
     <!--@mbg.generated-->
     insert into r_stat_pollution_substation_y
-    (substation_id, data_date, pollution_type, `value`)
+    (substation_id, data_date, pollution_type, value)
     values
     <foreach collection="list" item="item" separator=",">
       (#{item.substationId,jdbcType=VARCHAR}, #{item.dataDate,jdbcType=TIMESTAMP}, #{item.pollutionType,jdbcType=VARCHAR}, 
@@ -41,7 +41,7 @@
   <insert id="insertOrUpdate" parameterType="com.njcn.harmonic.pojo.po.RStatPollutionSubstationYPO">
     <!--@mbg.generated-->
     insert into r_stat_pollution_substation_y
-    (substation_id, data_date, pollution_type, `value`)
+    (substation_id, data_date, pollution_type, value)
     values
     (#{substationId,jdbcType=VARCHAR}, #{dataDate,jdbcType=TIMESTAMP}, #{pollutionType,jdbcType=VARCHAR}, 
       #{value,jdbcType=FLOAT})
@@ -49,7 +49,7 @@
     substation_id = #{substationId,jdbcType=VARCHAR}, 
     data_date = #{dataDate,jdbcType=TIMESTAMP}, 
     pollution_type = #{pollutionType,jdbcType=VARCHAR}, 
-    `value` = #{value,jdbcType=FLOAT}
+    value = #{value,jdbcType=FLOAT}
   </insert>
   <insert id="insertOrUpdateSelective" parameterType="com.njcn.harmonic.pojo.po.RStatPollutionSubstationYPO">
     <!--@mbg.generated-->
@@ -65,7 +65,7 @@
         pollution_type,
       </if>
       <if test="value != null">
-        `value`,
+        value,
       </if>
     </trim>
     values
@@ -95,7 +95,7 @@
         pollution_type = #{pollutionType,jdbcType=VARCHAR},
       </if>
       <if test="value != null">
-        `value` = #{value,jdbcType=FLOAT},
+        value = #{value,jdbcType=FLOAT},
       </if>
     </trim>
   </insert>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/ReportMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/ReportMapper.xml
index 40573a63e..805a3ba5b 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/ReportMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/ReportMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.njcn.harmonic.mapper.ReportMapper">
     <select id="getVirtualDataI" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
         SELECT
-        `phasic_type` AS phaseType,
+        phasic_type AS phaseType,
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
@@ -29,10 +29,10 @@
             phasic_type IN ( 'A', 'B', 'C' )
             and quality_flag = 0
             <if test="param.startTime != null and param.startTime != ''">
-                and `time` >= #{param.startTime}
+                and time >= #{param.startTime}
             </if>
             <if test="param.endTime != null and param.endTime != ''">
-                and `time` &lt;= #{param.endTime}
+                and time &lt;= #{param.endTime}
             </if>
             <if test="param.lineId != null and param.lineId != ''">
                 and line_id = #{param.lineId}
@@ -53,11 +53,11 @@
         ) AS t1
         ) a
         GROUP BY
-        `phasic_type`;
+        phasic_type;
     </select>
     <select id="getVirtualDataV" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
         SELECT
-        `phasic_type` AS phaseType,
+        phasic_type AS phaseType,
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
@@ -83,10 +83,10 @@
             phasic_type IN ( 'A', 'B', 'C' )
             and quality_flag = 0
             <if test="param.startTime != null and param.startTime != ''">
-                and `time` >= #{param.startTime}
+                and time >= #{param.startTime}
             </if>
             <if test="param.endTime != null and param.endTime != ''">
-                and `time` &lt;= #{param.endTime}
+                and time &lt;= #{param.endTime}
             </if>
             <if test="param.lineId != null and param.lineId != ''">
                 and line_id = #{param.lineId}
@@ -107,7 +107,7 @@
         ) AS t1
         ) a
         GROUP BY
-        `phasic_type`
+        phasic_type
     </select>
     <select id="getTotalCP95Day" resultType="java.lang.Integer">
         SELECT
@@ -119,10 +119,10 @@
             AND value_type = "CP95"
             and quality_flag = 0
             <if test="param.startTime != null and param.startTime != ''">
-                and `time` >= #{param.startTime}
+                and time >= #{param.startTime}
             </if>
             <if test="param.endTime != null and param.endTime != ''">
-                and `time` &lt;= #{param.endTime}
+                and time &lt;= #{param.endTime}
             </if>
             <if test="param.lineId != null and param.lineId != ''">
                 and line_id = #{param.lineId}
@@ -139,10 +139,10 @@
             AND value_type = "CP95"
             and quality_flag = 0
             <if test="param.startTime != null and param.startTime != ''">
-                and `time` >= #{param.startTime}
+                and time >= #{param.startTime}
             </if>
             <if test="param.endTime != null and param.endTime != ''">
-                and `time` &lt;= #{param.endTime}
+                and time &lt;= #{param.endTime}
             </if>
             <if test="param.lineId != null and param.lineId != ''">
                 and line_id = #{param.lineId}
@@ -159,10 +159,10 @@
             AND value_type = "CP95"
             and quality_flag = 0
             <if test="param.startTime != null and param.startTime != ''">
-                and `time` >= #{param.startTime}
+                and time >= #{param.startTime}
             </if>
             <if test="param.endTime != null and param.endTime != ''">
-                and `time` &lt;= #{param.endTime}
+                and time &lt;= #{param.endTime}
             </if>
             <if test="param.lineId != null and param.lineId != ''">
                 and line_id = #{param.lineId}
@@ -171,7 +171,7 @@
     </select>
     <select id="getVVirtualData" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
         SELECT
-        `phasic_type` AS phaseType,
+        phasic_type AS phaseType,
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
@@ -197,10 +197,10 @@
             phasic_type IN ( 'A', 'B', 'C' )
             and quality_flag = 0
             <if test="param.startTime != null and param.startTime != ''">
-                and `time` >= #{param.startTime}
+                and time >= #{param.startTime}
             </if>
             <if test="param.endTime != null and param.endTime != ''">
-                and `time` &lt;= #{param.endTime}
+                and time &lt;= #{param.endTime}
             </if>
             <if test="param.lineId != null and param.lineId != ''">
                 and line_id = #{param.lineId}
@@ -221,11 +221,11 @@
         ) AS t1
         ) a
         GROUP BY
-        `phasic_type`
+        phasic_type
     </select>
     <select id="getPowerP" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
         SELECT
-        `phasic_type` AS phaseType,
+        phasic_type AS phaseType,
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
@@ -253,10 +253,10 @@
             phasic_type IN ( 'A', 'B', 'C' ,'T')
             and quality_flag = 0
             <if test="param.startTime != null and param.startTime != ''">
-                and `time` >= #{param.startTime}
+                and time >= #{param.startTime}
             </if>
             <if test="param.endTime != null and param.endTime != ''">
-                and `time` &lt;= #{param.endTime}
+                and time &lt;= #{param.endTime}
             </if>
             <if test="param.lineId != null and param.lineId != ''">
                 and line_id = #{param.lineId}
@@ -280,11 +280,11 @@
         ) AS t1
         ) a
         GROUP BY
-        `phasic_type`
+        phasic_type
     </select>
     <select id="getPF" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
         SELECT
-        `phasic_type` AS phaseType,
+        phasic_type AS phaseType,
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
@@ -312,10 +312,10 @@
             phasic_type IN ( 'A', 'B', 'C' ,'T')
             and quality_flag = 0
             <if test="param.startTime != null and param.startTime != ''">
-                and `time` >= #{param.startTime}
+                and time >= #{param.startTime}
             </if>
             <if test="param.endTime != null and param.endTime != ''">
-                and `time` &lt;= #{param.endTime}
+                and time &lt;= #{param.endTime}
             </if>
             <if test="param.lineId != null and param.lineId != ''">
                 and line_id = #{param.lineId}
@@ -339,11 +339,11 @@
         ) AS t1
         ) a
         GROUP BY
-        `phasic_type`
+        phasic_type
     </select>
     <select id="getPowerQ" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
         SELECT
-        `phasic_type` AS phaseType,
+        phasic_type AS phaseType,
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
@@ -371,10 +371,10 @@
             phasic_type IN ( 'A', 'B', 'C' ,'T')
             and quality_flag = 0
             <if test="param.startTime != null and param.startTime != ''">
-                and `time` >= #{param.startTime}
+                and time >= #{param.startTime}
             </if>
             <if test="param.endTime != null and param.endTime != ''">
-                and `time` &lt;= #{param.endTime}
+                and time &lt;= #{param.endTime}
             </if>
             <if test="param.lineId != null and param.lineId != ''">
                 and line_id = #{param.lineId}
@@ -398,11 +398,11 @@
         ) AS t1
         ) a
         GROUP BY
-        `phasic_type`
+        phasic_type
     </select>
     <select id="getPowerS" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
         SELECT
-        `phasic_type` AS phaseType,
+        phasic_type AS phaseType,
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
@@ -430,10 +430,10 @@
             phasic_type IN ( 'A', 'B', 'C' ,'T')
             and quality_flag = 0
             <if test="param.startTime != null and param.startTime != ''">
-                and `time` >= #{param.startTime}
+                and time >= #{param.startTime}
             </if>
             <if test="param.endTime != null and param.endTime != ''">
-                and `time` &lt;= #{param.endTime}
+                and time &lt;= #{param.endTime}
             </if>
             <if test="param.lineId != null and param.lineId != ''">
                 and line_id = #{param.lineId}
@@ -457,11 +457,11 @@
         ) AS t1
         ) a
         GROUP BY
-        `phasic_type`
+        phasic_type
     </select>
     <select id="getFlickerData" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
         SELECT
-        `phasic_type` AS phaseType,
+        phasic_type AS phaseType,
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
@@ -489,10 +489,10 @@
             phasic_type IN ( 'A', 'B', 'C' )
             and quality_flag = 0
             <if test="param.startTime != null and param.startTime != ''">
-                and `time` >= #{param.startTime}
+                and time >= #{param.startTime}
             </if>
             <if test="param.endTime != null and param.endTime != ''">
-                and `time` &lt;= #{param.endTime}
+                and time &lt;= #{param.endTime}
             </if>
             <if test="param.lineId != null and param.lineId != ''">
                 and line_id = #{param.lineId}
@@ -516,11 +516,11 @@
         ) AS t1
         ) a
         GROUP BY
-        `phasic_type`
+        phasic_type
     </select>
     <select id="getLFlickerData" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
         SELECT
-        `phasic_type` AS phaseType,
+        phasic_type AS phaseType,
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
@@ -548,10 +548,10 @@
             phasic_type IN ( 'A', 'B', 'C')
             and quality_flag = 0
             <if test="param.startTime != null and param.startTime != ''">
-                and `time` >= #{param.startTime}
+                and time >= #{param.startTime}
             </if>
             <if test="param.endTime != null and param.endTime != ''">
-                and `time` &lt;= #{param.endTime}
+                and time &lt;= #{param.endTime}
             </if>
             <if test="param.lineId != null and param.lineId != ''">
                 and line_id = #{param.lineId}
@@ -575,11 +575,11 @@
         ) AS t1
         ) a
         GROUP BY
-        `phasic_type`
+        phasic_type
     </select>
     <select id="getUVdeviationData" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
         SELECT
-        `phasic_type` AS phaseType,
+        phasic_type AS phaseType,
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
@@ -605,10 +605,10 @@
             phasic_type IN ( 'A', 'B', 'C' )
             and quality_flag = 0
             <if test="param.startTime != null and param.startTime != ''">
-                and `time` >= #{param.startTime}
+                and time >= #{param.startTime}
             </if>
             <if test="param.endTime != null and param.endTime != ''">
-                and `time` &lt;= #{param.endTime}
+                and time &lt;= #{param.endTime}
             </if>
             <if test="param.lineId != null and param.lineId != ''">
                 and line_id = #{param.lineId}
@@ -629,11 +629,11 @@
         ) AS t1
         ) a
         GROUP BY
-        `phasic_type`;
+        phasic_type;
     </select>
     <select id="getLVdeviationData" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
         SELECT
-        `phasic_type` AS phaseType,
+        phasic_type AS phaseType,
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
@@ -659,10 +659,10 @@
             phasic_type IN ( 'A', 'B', 'C' )
             and quality_flag = 0
             <if test="param.startTime != null and param.startTime != ''">
-                and `time` >= #{param.startTime}
+                and time >= #{param.startTime}
             </if>
             <if test="param.endTime != null and param.endTime != ''">
-                and `time` &lt;= #{param.endTime}
+                and time &lt;= #{param.endTime}
             </if>
             <if test="param.lineId != null and param.lineId != ''">
                 and line_id = #{param.lineId}
@@ -683,11 +683,11 @@
         ) AS t1
         ) a
         GROUP BY
-        `phasic_type`;
+        phasic_type;
     </select>
     <select id="getDistortionDataV" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
         SELECT
-        `phasic_type` AS phaseType,
+        phasic_type AS phaseType,
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
@@ -713,10 +713,10 @@
             phasic_type IN ( 'A', 'B', 'C' )
             and quality_flag = 0
             <if test="param.startTime != null and param.startTime != ''">
-                and `time` >= #{param.startTime}
+                and time >= #{param.startTime}
             </if>
             <if test="param.endTime != null and param.endTime != ''">
-                and `time` &lt;= #{param.endTime}
+                and time &lt;= #{param.endTime}
             </if>
             <if test="param.lineId != null and param.lineId != ''">
                 and line_id = #{param.lineId}
@@ -737,11 +737,11 @@
         ) AS t1
         ) a
         GROUP BY
-        `phasic_type`;
+        phasic_type;
     </select>
     <select id="getDistortionDataI" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
         SELECT
-        `phasic_type` AS phaseType,
+        phasic_type AS phaseType,
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
@@ -767,10 +767,10 @@
             phasic_type IN ( 'A', 'B', 'C' )
             and quality_flag = 0
             <if test="param.startTime != null and param.startTime != ''">
-                and `time` >= #{param.startTime}
+                and time >= #{param.startTime}
             </if>
             <if test="param.endTime != null and param.endTime != ''">
-                and `time` &lt;= #{param.endTime}
+                and time &lt;= #{param.endTime}
             </if>
             <if test="param.lineId != null and param.lineId != ''">
                 and line_id = #{param.lineId}
@@ -791,11 +791,11 @@
         ) AS t1
         ) a
         GROUP BY
-        `phasic_type`;
+        phasic_type;
     </select>
     <select id="getFrequencyData" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
         SELECT
-        `phasic_type` AS phaseType,
+        phasic_type AS phaseType,
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
@@ -821,10 +821,10 @@
             phasic_type =  'T'
             and quality_flag = 0
             <if test="param.startTime != null and param.startTime != ''">
-                and `time` >= #{param.startTime}
+                and time >= #{param.startTime}
             </if>
             <if test="param.endTime != null and param.endTime != ''">
-                and `time` &lt;= #{param.endTime}
+                and time &lt;= #{param.endTime}
             </if>
             <if test="param.lineId != null and param.lineId != ''">
                 and line_id = #{param.lineId}
@@ -845,11 +845,11 @@
         ) AS t1
         ) a
         GROUP BY
-        `phasic_type`;
+        phasic_type;
     </select>
     <select id="getDEVFrequencyData" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
         SELECT
-        `phasic_type` AS phaseType,
+        phasic_type AS phaseType,
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
@@ -875,10 +875,10 @@
             phasic_type =  'T'
             and quality_flag = 0
             <if test="param.startTime != null and param.startTime != ''">
-                and `time` >= #{param.startTime}
+                and time >= #{param.startTime}
             </if>
             <if test="param.endTime != null and param.endTime != ''">
-                and `time` &lt;= #{param.endTime}
+                and time &lt;= #{param.endTime}
             </if>
             <if test="param.lineId != null and param.lineId != ''">
                 and line_id = #{param.lineId}
@@ -899,11 +899,11 @@
         ) AS t1
         ) a
         GROUP BY
-        `phasic_type`;
+        phasic_type;
     </select>
     <select id="getINegData" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
         SELECT
-        `phasic_type` AS phaseType,
+        phasic_type AS phaseType,
         AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
         MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
         MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
@@ -929,10 +929,10 @@
             phasic_type IN ( 'A', 'B', 'C' )
             and quality_flag = 0
             <if test="param.startTime != null and param.startTime != ''">
-                and `time` >= #{param.startTime}
+                and time >= #{param.startTime}
             </if>
             <if test="param.endTime != null and param.endTime != ''">
-                and `time` &lt;= #{param.endTime}
+                and time &lt;= #{param.endTime}
             </if>
             <if test="param.lineId != null and param.lineId != ''">
                 and line_id = #{param.lineId}
@@ -953,7 +953,7 @@
         ) AS t1
         ) a
         GROUP BY
-        `phasic_type`;
+        phasic_type;
     </select>
 
 </mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgDMapper.xml
index 928be96ab..9fae5264e 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgDMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgDMapper.xml
@@ -4,9 +4,9 @@
 
     <select id="listDayRatio" resultType="StatHarmonicOrgVO">
         SELECT
-        r.`org_no` `id`,
-        r.over_limit_measurement_ratio_average `ratio`,
-        r.over_limit_measurement_average `count`
+        r.org_no id,
+        r.over_limit_measurement_ratio_average ratio,
+        r.over_limit_measurement_average count
         FROM
         r_stat_harmonic_org_d r
         where 1=1
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgMMapper.xml
index b9fd792c4..6296af300 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgMMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgMMapper.xml
@@ -4,9 +4,9 @@
 
     <select id="listMonthRatio" resultType="StatHarmonicOrgVO">
         SELECT
-        r.`org_no` `id`,
-        r.over_limit_measurement_ratio_average `ratio`,
-        r.over_limit_measurement_average `count`
+        r.org_no id,
+        r.over_limit_measurement_ratio_average ratio,
+        r.over_limit_measurement_average count
         FROM
         r_stat_harmonic_org_m r
         where 1=1
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgQMapper.xml
index bb1d1991d..2949abf56 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgQMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgQMapper.xml
@@ -4,9 +4,9 @@
 
     <select id="listQuarterRatio" resultType="StatHarmonicOrgVO">
         SELECT
-        r.`org_no` `id`,
-        r.over_limit_measurement_ratio_average `ratio`,
-        r.over_limit_measurement_average `count`
+        r.org_no id,
+        r.over_limit_measurement_ratio_average ratio,
+        r.over_limit_measurement_average count
         FROM
         r_stat_harmonic_org_q r
         where 1=1
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgYMapper.xml
index 2401f8b1a..838a1415a 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgYMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgYMapper.xml
@@ -4,9 +4,9 @@
 
     <select id="listYearRatio" resultType="StatHarmonicOrgVO">
         SELECT
-            r.`org_no` `id`,
-            r.over_limit_measurement_ratio_average `ratio`,
-            r.over_limit_measurement_average `count`
+            r.org_no id,
+            r.over_limit_measurement_ratio_average ratio,
+            r.over_limit_measurement_average count
         FROM
             r_stat_harmonic_org_y r
             where 1=1
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/SteadyExceedRateMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/SteadyExceedRateMapper.xml
index 193f0bec9..d84c9982a 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/SteadyExceedRateMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/SteadyExceedRateMapper.xml
@@ -8,11 +8,11 @@
         A.Id,
         A.Pid,
         A.Pids,
-        A.`Name` name,
-        C.`Name` voltageLevel,
-        D.`IP` networkParam,
-        C1.`Name` factoryName,
-        A.`Name` lineName
+        A.Name name,
+        C.Name voltageLevel,
+        D.IP networkParam,
+        C1.Name factoryName,
+        A.Name lineName
         FROM
         pq_line A,
         pq_voltage B,
@@ -37,7 +37,7 @@
         Id,
         Pid,
         Pids,
-        `Name`
+        Name
         FROM
         pq_line
         WHERE
@@ -52,7 +52,7 @@
         A.Id,
         A.Pid,
         A.Pids,
-        C.`Name` voltageLevel
+        C.Name voltageLevel
         FROM
         pq_line A,
         pq_substation B,
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/SteadyQualifyMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/SteadyQualifyMapper.xml
index 694173970..ebfc403a5 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/SteadyQualifyMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/SteadyQualifyMapper.xml
@@ -8,11 +8,11 @@
             A.Id,
             A.Pid,
             A.Pids,
-            A.`Name` name,
-            C.`Name` voltageLevel,
-            D.`IP` networkParam,
-            C1.`Name` factoryName,
-            A.`Name` lineName
+            A.Name name,
+            C.Name voltageLevel,
+            D.IP networkParam,
+            C1.Name factoryName,
+            A.Name lineName
         FROM
             pq_line A,
             pq_voltage B,
@@ -37,7 +37,7 @@
         Id,
         Pid,
         Pids,
-        `Name`
+        Name
         FROM
         pq_line
         WHERE
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/THDistortionMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/THDistortionMapper.xml
index 1d0d427fc..38696cb2d 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/THDistortionMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/THDistortionMapper.xml
@@ -8,10 +8,10 @@
             A.Id,
             A.Pid,
             A.Pids,
-            A.`Name` name,
-            C.`IP` networkParam,
-            D.`Name` voltageLevel,
-            A.`Name` lineName
+            A.Name name,
+            C.IP networkParam,
+            D.Name voltageLevel,
+            A.Name lineName
         FROM
             pq_line A,
             pq_voltage B,
@@ -34,7 +34,7 @@
         Id,
         Pid,
         Pids,
-        `Name`
+        Name
         FROM
         pq_line
         WHERE
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/TerminalDataMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/TerminalDataMapper.xml
index 394dc7be8..42743f34f 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/TerminalDataMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/TerminalDataMapper.xml
@@ -10,7 +10,7 @@
         A.Pids,
         A.Name,
         A.Level,
-        B.`Run_Flag` flag
+        B.Run_Flag flag
         FROM
         pq_line A,
         pq_device B
@@ -26,8 +26,8 @@
         Id,
         Pid,
         Pids,
-        `Name` name,
-        `Level` level
+        Name name,
+        Level level
         FROM
         pq_line
         WHERE
@@ -41,7 +41,7 @@
 
     <!--        SELECT-->
     <!--            A.Id,-->
-    <!--            A.`Run_Flag` flag-->
+    <!--            A.Run_Flag flag-->
     <!--        FROM-->
     <!--            pq_device A,-->
     <!--            pq_voltage B,-->
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/mapping/RStatOrgPvPowerQualityMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/mapping/RStatOrgPvPowerQualityMMapper.xml
index 1c67b9824..4ee269382 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/mapping/RStatOrgPvPowerQualityMMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/mapping/RStatOrgPvPowerQualityMMapper.xml
@@ -25,10 +25,10 @@
         SELECT
             org_no as orgId,
             monitoring_object as monitoringObject,
-            SUM(IF(`area_pq_event_type` = #{condMap.Event_Type_u}, total_monitor_num, 0)) as streamNum,
-                SUM(IF(`area_pq_event_type` = #{condMap.Event_Type_a}, total_monitor_num, 0)) as streamReloadNum,
-                SUM(IF(`area_pq_event_type` = #{condMap.Event_Type_s}, total_monitor_num, 0)) as streamOverloadNum,
-                SUM(IF(`area_pq_event_type` = #{condMap.Event_Type_u}, total_monitor_num / monitor_valid_num, 0)) as streamRate
+            SUM(IF(area_pq_event_type = #{condMap.Event_Type_u}, total_monitor_num, 0)) as streamNum,
+                SUM(IF(area_pq_event_type = #{condMap.Event_Type_a}, total_monitor_num, 0)) as streamReloadNum,
+                SUM(IF(area_pq_event_type = #{condMap.Event_Type_s}, total_monitor_num, 0)) as streamOverloadNum,
+                SUM(IF(area_pq_event_type = #{condMap.Event_Type_u}, total_monitor_num / monitor_valid_num, 0)) as streamRate
         FROM r_stat_org_pv_power_quality_m
         where org_no in
         <foreach collection="condMap.orgIdList" item="id" open="(" close=")" separator=",">
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/mapping/RStatOrgPvPowerQualityYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/mapping/RStatOrgPvPowerQualityYMapper.xml
index 32e160181..aa79ff26f 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/mapping/RStatOrgPvPowerQualityYMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/mapping/RStatOrgPvPowerQualityYMapper.xml
@@ -27,10 +27,10 @@
         SELECT
             org_no,
             monitoring_object,
-            SUM(IF(`area_pq_event_type`=#{param.mapId.eventTypeL,javaType=string},total_monitor_num,0)) as lowPowerFactor89,
-            SUM(IF(`area_pq_event_type`=#{param.mapId.eventTypeP,javaType=string},total_monitor_num,0)) as lowPowerFactor78,
-            SUM(IF(`area_pq_event_type`=#{param.mapId.eventTypeO,javaType=string},total_monitor_num,0)) as lowPowerFactor7,
-            IF(`monitoring_object`=`monitoring_object`,TRUNCATE(SUM(total_monitor_num)/SUM(monitor_valid_num),2),0) as lowPowerFactorRatio
+            SUM(IF(area_pq_event_type=#{param.mapId.eventTypeL,javaType=string},total_monitor_num,0)) as lowPowerFactor89,
+            SUM(IF(area_pq_event_type=#{param.mapId.eventTypeP,javaType=string},total_monitor_num,0)) as lowPowerFactor78,
+            SUM(IF(area_pq_event_type=#{param.mapId.eventTypeO,javaType=string},total_monitor_num,0)) as lowPowerFactor7,
+            IF(monitoring_object=monitoring_object,TRUNCATE(SUM(total_monitor_num)/SUM(monitor_valid_num),2),0) as lowPowerFactorRatio
         FROM
             <if test="param != null and  param.type == 1">
                 r_stat_org_pv_power_quality_y
@@ -42,7 +42,7 @@
                 r_stat_org_pv_power_quality_m
             </if>
         <where>
-            `area_pq_event_type` in (
+            area_pq_event_type in (
                 #{param.mapId.eventTypeL,javaType=string},
                 #{param.mapId.eventTypeP,javaType=string},
                 #{param.mapId.eventTypeO,javaType=string}
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetDPO.java
index 67731f7e1..bdce8e570 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetDPO.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetDPO.java
@@ -63,7 +63,7 @@ public class RDimStationTargetDPO extends BaseEntity {
     @TableField(value = "Pass_Avg_Rate")
     private Double passAvgRate;
 
-    @TableField(value = "`State`")
+    @TableField(value = "State")
     private String state;
 
 }
\ No newline at end of file
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetMPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetMPO.java
index 72db8a5be..456a9ed33 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetMPO.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetMPO.java
@@ -64,7 +64,7 @@ public class RDimStationTargetMPO extends BaseEntity {
     @TableField(value = "Pass_Avg_Rate")
     private Double passAvgRate;
 
-    @TableField(value = "`State`")
+    @TableField(value = "State")
     private String state;
 
 
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetYPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetYPO.java
index bcd44e23d..880816ceb 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetYPO.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetYPO.java
@@ -64,7 +64,7 @@ public class RDimStationTargetYPO extends BaseEntity {
     @TableField(value = "Pass_Avg_Rate")
     private Double passAvgRate;
 
-    @TableField(value = "`State`")
+    @TableField(value = "State")
     private String state;
 
 }
\ No newline at end of file
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimBusTargetDPOMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimBusTargetDPOMapper.xml
index ebb2dbbdd..379e4017d 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimBusTargetDPOMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimBusTargetDPOMapper.xml
@@ -20,6 +20,6 @@
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     Org_Id, Statis_Date, Target_Type, Limit_Rate, Limit_Avg_Rate, Pass_Rate, Pass_Avg_Rate, 
-    `State`, Create_By, Create_Time, Update_By, Update_Time
+    State, Create_By, Create_Time, Update_By, Update_Time
   </sql>
 </mapper>
\ No newline at end of file
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimBusTargetMPOMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimBusTargetMPOMapper.xml
index 16e02f458..84cc17af7 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimBusTargetMPOMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimBusTargetMPOMapper.xml
@@ -20,6 +20,6 @@
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     Org_Id, Statis_Date, Target_Type, Limit_Rate, Limit_Avg_Rate, Pass_Rate, Pass_Avg_Rate, 
-    `State`, Create_By, Create_Time, Update_By, Update_Time
+    State, Create_By, Create_Time, Update_By, Update_Time
   </sql>
 </mapper>
\ No newline at end of file
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimBusTargetYPOMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimBusTargetYPOMapper.xml
index 50ecd311b..45db8db6d 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimBusTargetYPOMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimBusTargetYPOMapper.xml
@@ -20,6 +20,6 @@
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     Org_Id, Statis_Date, Target_Type, Limit_Rate, Limit_Avg_Rate, Pass_Rate, Pass_Avg_Rate, 
-    `State`, Create_By, Create_Time, Update_By, Update_Time
+    State, Create_By, Create_Time, Update_By, Update_Time
   </sql>
 </mapper>
\ No newline at end of file
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimStationTargetDPOMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimStationTargetDPOMapper.xml
index 2337cf126..4b59b594d 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimStationTargetDPOMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimStationTargetDPOMapper.xml
@@ -21,6 +21,6 @@
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     Org_Id, Statis_Date, Target_Type, Voltage_Level, Limit_Rate, Pass_Rate, Limit_Avg_Rate, 
-    Pass_Avg_Rate, `State`, Create_By, Create_Time, Update_By, Update_Time
+    Pass_Avg_Rate, State, Create_By, Create_Time, Update_By, Update_Time
   </sql>
 </mapper>
\ No newline at end of file
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimStationTargetMPOMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimStationTargetMPOMapper.xml
index b0159c549..9c53e5856 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimStationTargetMPOMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimStationTargetMPOMapper.xml
@@ -21,6 +21,6 @@
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     Org_Id, Statis_Date, Target_Type, Voltage_Level, Limit_Rate, Pass_Rate, Limit_Avg_Rate, 
-    Pass_Avg_Rate, `State`, Create_By, Create_Time, Update_By, Update_Time
+    Pass_Avg_Rate, State, Create_By, Create_Time, Update_By, Update_Time
   </sql>
 </mapper>
\ No newline at end of file
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimStationTargetYPOMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimStationTargetYPOMapper.xml
index 9255315a7..e8120a53a 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimStationTargetYPOMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RDimStationTargetYPOMapper.xml
@@ -21,6 +21,6 @@
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     Org_Id, Statis_Date, Target_Type, Voltage_Level, Limit_Rate, Pass_Rate, Limit_Avg_Rate, 
-    Pass_Avg_Rate, `State`, Create_By, Create_Time, Update_By, Update_Time
+    Pass_Avg_Rate, State, Create_By, Create_Time, Update_By, Update_Time
   </sql>
 </mapper>
\ No newline at end of file
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataPltDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataPltDMapper.xml
index 02cccb50a..dd9eda466 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataPltDMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataPltDMapper.xml
@@ -4,13 +4,13 @@
 
     <select id="getBenchmarkLevel" resultType="com.njcn.harmonic.pojo.po.day.RStatDataPltDPO">
         select
-            `time`,
+            time,
             line_id,
             max(plt) plt
         from
             r_stat_data_plt_d
         where
-            `time` between #{startTime} and #{endTime}
+            time between #{startTime} and #{endTime}
             and value_type = 'MAX'
             and phasic_type in ('A','B','C')
             <if test="list != null and list.size() > 0">
@@ -19,7 +19,7 @@
                     #{item}
                 </foreach>
             </if>
-        group by `time`,line_id
+        group by time,line_id
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataVDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataVDMapper.xml
index 153ac8750..e1fbd9587 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataVDMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataVDMapper.xml
@@ -16,49 +16,49 @@
         from
             (
             select
-                `time`,
+                time,
                 line_id lineId,
                 max(v_unbalance) vUnbalance,
                 max(greatest(v_thd, v_1, v_2, v_3, v_4, v_5, v_6, v_7, v_8, v_9, v_10, v_11, v_12, v_13, v_14, v_15, v_16, v_17, v_18, v_19, v_20, v_21, v_22, v_23, v_24, v_25, v_26, v_27, v_28, v_29, v_30, v_31, v_32, v_33, v_34, v_35, v_36, v_37, v_38, v_39, v_40, v_41, v_42, v_43, v_44, v_45, v_46, v_47, v_48, v_49, v_50)) v
             from
                 r_stat_data_v_d t0
             where
-                `time` = #{time}
+                time = #{time}
                 and value_type = 'CP95'
             group by
-                `time`,
+                time,
                 line_id
             ) A
             left join
             (
                 select
-                    `time`,
+                    time,
                     line_id lineId,
                     max(abs(vl_dev)) vlDev,
                     max(abs(freq_dev)) freqDev
                 from
                     r_stat_data_v_d t0
                 where
-                    `time` = #{time}
+                    time = #{time}
                     and value_type = 'MAX'
                 group by
-                    `time`,
+                    time,
                     line_id
             ) B
             on A.lineId = B.lineId
             left join
             (
                 select
-                    `time` ,
+                    time ,
                     line_id lineId,
                     max(plt) plt
                 from
                     r_stat_data_plt_d
                 where
-                    `time` = #{time}
+                    time = #{time}
                     and value_type = 'MAX'
                 group by
-                    `time`,
+                    time,
                     line_id
             ) C
             on A.lineId = C.lineId
@@ -104,17 +104,17 @@
             from
                 (
                 select
-                    `time`,
+                    time,
                     line_id lineId,
                     max(v_unbalance) vUnbalance,
                     max(greatest(v_thd, v_1, v_2, v_3, v_4, v_5, v_6, v_7, v_8, v_9, v_10, v_11, v_12, v_13, v_14, v_15, v_16, v_17, v_18, v_19, v_20, v_21, v_22, v_23, v_24, v_25, v_26, v_27, v_28, v_29, v_30, v_31, v_32, v_33, v_34, v_35, v_36, v_37, v_38, v_39, v_40, v_41, v_42, v_43, v_44, v_45, v_46, v_47, v_48, v_49, v_50)) v
                 from
                     r_stat_data_v_d
                 where
-                    `time` between #{startTime} and #{endTime}
+                    time between #{startTime} and #{endTime}
                     and value_type = 'CP95'
                 group by
-                    `time`,
+                    time,
                     line_id
         ) A
             group by
@@ -129,17 +129,17 @@
             from
                 (
                 select
-                    `time`,
+                    time,
                     line_id lineId,
                     max(abs(vl_dev)) vlDev,
                     max(abs(freq_dev)) freqDev
                 from
                     r_stat_data_v_d
                 where
-                    `time` between #{startTime} and #{endTime}
+                    time between #{startTime} and #{endTime}
                     and value_type = 'MAX'
                 group by
-                    `time`,
+                    time,
                     line_id
         ) B
             group by
@@ -154,16 +154,16 @@
             from
                 (
                 select
-                    `time` ,
+                    time ,
                     line_id lineId,
                     max(plt) plt
                 from
                     r_stat_data_plt_d
                 where
-                    `time` between #{startTime} and #{endTime}
+                    time between #{startTime} and #{endTime}
                     and value_type = 'MAX'
                 group by
-                    `time`,
+                    time,
                     line_id
         ) C
             group by
@@ -211,31 +211,31 @@
         from
             (
             select
-                `time`,
+                time,
                 line_id lineId,
                 max(v_unbalance) vUnbalance,
                 max(greatest(v_thd, v_1, v_2, v_3, v_4, v_5, v_6, v_7, v_8, v_9, v_10, v_11, v_12, v_13, v_14, v_15, v_16, v_17, v_18, v_19, v_20, v_21, v_22, v_23, v_24, v_25, v_26, v_27, v_28, v_29, v_30, v_31, v_32, v_33, v_34, v_35, v_36, v_37, v_38, v_39, v_40, v_41, v_42, v_43, v_44, v_45, v_46, v_47, v_48, v_49, v_50)) v
             from
                 r_stat_data_v_d t0
             where
-                `time` = #{time} and value_type = 'CP95'
+                time = #{time} and value_type = 'CP95'
             group by
-                `time`,
+                time,
                 line_id
         ) A
         left join
         (
             select
-                `time`,
+                time,
                 line_id lineId,
                 max(abs(vl_dev)) vlDev,
                 max(abs(freq_dev)) freqDev
             from
                 r_stat_data_v_d t0
             where
-                `time` = #{time} and value_type = 'MAX'
+                time = #{time} and value_type = 'MAX'
             group by
-                `time`,
+                time,
                 line_id
         ) B
         on
@@ -243,15 +243,15 @@
         left join
         (
             select
-                `time` ,
+                time ,
                 line_id lineId,
                 max(plt) plt
             from
                 r_stat_data_plt_d
             where
-                `time` = #{time} and value_type = 'MAX'
+                time = #{time} and value_type = 'MAX'
             group by
-                `time`,
+                time,
                 line_id
         ) C
         on
@@ -319,7 +319,7 @@
 
     <select id="getBenchmarkLevel" resultType="com.njcn.harmonic.pojo.po.day.RStatDataVDPO">
         select
-            A.`time`,
+            A.time,
             A.line_id lineId,
             A.rms,
             C.vUnbalance,
@@ -327,13 +327,13 @@
         from
             (
                 select
-                    `time`,
+                    time,
                     line_id,
                     max(rms) rms
                 from
                     r_stat_data_v_d
                 where
-                    `time` between #{startTime} and #{endTime}
+                    time between #{startTime} and #{endTime}
                     and phasic_type in ('A', 'B', 'C')
                     and value_type in ('AVG')
                     <if test="list != null and list.size() > 0">
@@ -342,18 +342,18 @@
                             #{item}
                         </foreach>
                     </if>
-                group by `time`, line_id
+                group by time, line_id
             ) A
         inner join
             (
                 select
-                    `time`,
+                    time,
                     line_id,
                     max(v_thd) vThd
                 from
                     r_stat_data_v_d
                 where
-                    `time` between #{startTime} and #{endTime}
+                    time between #{startTime} and #{endTime}
                     and phasic_type in ('A', 'B', 'C')
                     and value_type in ('CP95')
                     <if test="list != null and list.size() > 0">
@@ -362,19 +362,19 @@
                             #{item}
                         </foreach>
                     </if>
-                group by `time`,line_id
+                group by time,line_id
             ) B
-        on A.`time` = B.`time` and A.line_id = B.line_id
+        on A.time = B.time and A.line_id = B.line_id
         inner join
             (
                 select
-                    `time`,
+                    time,
                     line_id,
                     max(v_unbalance) vUnbalance
                 from
                     r_stat_data_v_d
                 where
-                    `time` between #{startTime} and #{endTime}
+                    time between #{startTime} and #{endTime}
                     and phasic_type = 'T'
                     and value_type in ('CP95')
                     <if test="list != null and list.size() > 0">
@@ -383,8 +383,8 @@
                             #{item}
                         </foreach>
                     </if>
-                group by `time`,line_id
+                group by time,line_id
             ) C
-        on A.`time` = C.`time` and A.line_id = C.line_id
+        on A.time = C.time and A.line_id = C.line_id
     </select>
 </mapper>
\ No newline at end of file
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/device/mapping/DeviceAbnormaStatisticsMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/device/mapping/DeviceAbnormaStatisticsMapper.xml
index c0783b9e9..5b443d9a9 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/device/mapping/DeviceAbnormaStatisticsMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/device/mapping/DeviceAbnormaStatisticsMapper.xml
@@ -3,19 +3,19 @@
 <mapper namespace="com.njcn.prepare.harmonic.mapper.mysql.device.DeviceAbnormaStatisticsMapper">
     <insert id="insertTopMsg">
         INSERT INTO pqs_top_msg(
-        `Time_Id`,
-        `Dev_Id`,
-        `Comout_Count`,
-        `Comout_Desc`,
-        `Integrity_Flag`,
-        `Integrity_Value`,
-        `Alarm_Count`,
-        `Alarm_Desc`,
-        `Flow_Flag`,
-        `Flow_Value`,
-        `OnlineRate_Flag`,
-        `OnlineRate_Value`,
-        `State`
+        Time_Id,
+        Dev_Id,
+        Comout_Count,
+        Comout_Desc,
+        Integrity_Flag,
+        Integrity_Value,
+        Alarm_Count,
+        Alarm_Desc,
+        Flow_Flag,
+        Flow_Value,
+        OnlineRate_Flag,
+        OnlineRate_Value,
+        State
         ) VALUES
         <foreach collection="list" separator="," item="item">
             (
@@ -82,7 +82,7 @@
        SELECT
             device.id AS deviceId,
             IFNULL(SUM(integrity.due_time),3.14159) AS due,
-            IFNULL(SUM(integrity.real_time),0) AS `real`,
+            IFNULL(SUM(integrity.real_time),0) AS real,
             CONVERT(SUM(integrity.real_time)*100/SUM(integrity.due_time),DECIMAL(15,2)) AS integrity
         FROM r_stat_integrity_d integrity
         INNER JOIN pq_line line ON integrity.line_index = line.id
@@ -158,13 +158,13 @@
 
     <select id="selectAlarmStrategy" resultType="com.njcn.prepare.harmonic.pojo.mysql.po.line.AlarmStrategyVO">
        SELECT
-        A.`Id` id,
-        B.`Name` name,
-        A.`Integrity_Value` integrityValue,
-        A.`Online_Value` onlineValue,
-        A.`Offtime_Value` offTimeValue,
-        A.`Warn_Value` warnValue,
-        A.`Update_Time` updateTime,
+        A.Id id,
+        B.Name name,
+        A.Integrity_Value integrityValue,
+        A.Online_Value onlineValue,
+        A.Offtime_Value offTimeValue,
+        A.Warn_Value warnValue,
+        A.Update_Time updateTime,
         B.Algo_Describe algoDesc
         FROM
         pqs_alarm_strategy A
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/mapping/RDimBusbarHarmnicDPOMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/mapping/RDimBusbarHarmnicDPOMapper.xml
index d56b8efb3..26f51195c 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/mapping/RDimBusbarHarmnicDPOMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/mapping/RDimBusbarHarmnicDPOMapper.xml
@@ -20,7 +20,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    Org_Id, Statis_Date, BusBar_Id, Target_type, Voltage_level, `Level`, `limit count`, 
-    Statis_count, `State`, Create_By, Create_Time, Update_By, Update_Time
+    Org_Id, Statis_Date, BusBar_Id, Target_type, Voltage_level, Level, limit count,
+    Statis_count, State, Create_By, Create_Time, Update_By, Update_Time
   </sql>
 </mapper>
\ No newline at end of file
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/mapping/RDimStationHarmnicDPOMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/mapping/RDimStationHarmnicDPOMapper.xml
index 07bf80eb8..06af201bb 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/mapping/RDimStationHarmnicDPOMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/mapping/RDimStationHarmnicDPOMapper.xml
@@ -15,7 +15,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    Org_Id, Statis_Date, `Station Id`, Target_type, `Level`, Monitor_Tag, Voltage_level, 
+    Org_Id, Statis_Date, Station Id, Target_type, Level, Monitor_Tag, Voltage_level,
     limit_count, Statis_count
   </sql>
 </mapper>
\ No newline at end of file
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/mapping/RDimVoltageDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/mapping/RDimVoltageDMapper.xml
index 77cbf4f7e..1f4abc4b8 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/mapping/RDimVoltageDMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/mapping/RDimVoltageDMapper.xml
@@ -4,7 +4,7 @@
 
     <select id="getLineData" resultType="com.njcn.harmonic.pojo.dto.LineDataDto">
         select
-            A.`time`,
+            A.time,
             A.line_id lineId,
             A.rms,
             C.vUnbalance,
@@ -24,13 +24,13 @@
         from
             (
                 select
-                    `time`,
+                    time,
                     line_id,
                     avg(rms) rms
                 from
                     r_stat_data_v_d
                 where
-                    `time` between #{startTime} and #{endTime}
+                    time between #{startTime} and #{endTime}
                     and phasic_type in ('A', 'B', 'C')
                     and value_type in ('AVG')
 					<if test="collection != null and collection.size() > 0">
@@ -39,12 +39,12 @@
 							#{item}
 						</foreach>
 					</if>
-                group by `time`, line_id
+                group by time, line_id
             ) A
         inner join
             (
                 select
-                    `time`,
+                    time,
                     line_id,
                     avg(v_thd) vThd,
                     avg(v_1) v1,avg(v_2) v2,
@@ -75,7 +75,7 @@
                 from
                     r_stat_data_v_d
                 where
-                    `time` between #{startTime} and #{endTime}
+                    time between #{startTime} and #{endTime}
                     and phasic_type in ('A', 'B', 'C')
                     and value_type in ('AVG')
 					<if test="collection != null and collection.size() > 0">
@@ -84,19 +84,19 @@
 							#{item}
 						</foreach>
 					</if>
-                group by `time`,line_id
+                group by time,line_id
             ) B
-        on A.`time` = B.`time` and A.line_id = B.line_id
+        on A.time = B.time and A.line_id = B.line_id
 	  	inner join
 		    (
 		        select
-		            `time`,
+		            time,
 		            line_id,
 		            avg(v_unbalance) vUnbalance
 		        from
 		            r_stat_data_v_d
 		        where
-		            `time` between #{startTime} and #{endTime}
+		            time between #{startTime} and #{endTime}
 		            and phasic_type = 'T'
 		            and value_type in ('AVG')
 					<if test="collection != null and collection.size() > 0">
@@ -105,19 +105,19 @@
 							#{item}
 						</foreach>
 					</if>
-		        group by `time`,line_id
+		        group by time,line_id
 		    ) C
-        on A.`time` = C.`time` and A.line_id = C.line_id
+        on A.time = C.time and A.line_id = C.line_id
 	  	inner join
 		    (
 		        select
-		            `time`,
+		            time,
 		            line_id,
 		            avg(pst) pst
 		        from
 		            r_stat_data_flicker_d
 		        where
-		            `time` between #{startTime} and #{endTime}
+		            time between #{startTime} and #{endTime}
 		            and phasic_type in ('A', 'B', 'C')
 		            and value_type in ('AVG')
 					<if test="collection != null and collection.size() > 0">
@@ -126,19 +126,19 @@
 							#{item}
 						</foreach>
 					</if>
-		        group by `time`,line_id
+		        group by time,line_id
 		    ) D
-        on A.`time` = D.`time` and A.line_id = D.line_id
+        on A.time = D.time and A.line_id = D.line_id
 		inner join
 			(
 				select
-					`time`,
+					time,
 					line_id,
 					avg(i_neg) iNeg
 				from
 					r_stat_data_i_d
 				where
-					`time` between #{startTime} and #{endTime}
+					time between #{startTime} and #{endTime}
 					and phasic_type = 'T'
 					and value_type in ('AVG')
 					<if test="collection != null and collection.size() > 0">
@@ -147,8 +147,8 @@
 							#{item}
 						</foreach>
 					</if>
-				group by `time`,line_id
+				group by time,line_id
 			) E
-		on A.`time` = E.`time` and A.line_id = E.line_id
+		on A.time = E.time and A.line_id = E.line_id
     </select>
 </mapper>
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/AlarmMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/AlarmMapper.xml
index 43ad41ea6..d1fce9072 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/AlarmMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/AlarmMapper.xml
@@ -14,7 +14,7 @@
             avg(interrupt_times) interruptTimes
         from
             r_mp_target_diff_d
-        where `time` between #{startTime} and #{endTime}
+        where time between #{startTime} and #{endTime}
         <if test="list != null and list.size() > 0">
             and line_id in
             <foreach collection="list" item="item" open="(" close=")" separator=",">
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/LimitRatePOMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/LimitRatePOMapper.xml
index d91afd303..6c3a117db 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/LimitRatePOMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/LimitRatePOMapper.xml
@@ -82,7 +82,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    line_id, phasic_type, `time`, all_time, flicker_overtime, flicker_all_time, freq_dev_overtime, 
+    line_id, phasic_type, time, all_time, flicker_overtime, flicker_all_time, freq_dev_overtime,
     voltage_dev_overtime, ubalance_overtime, uaberrance_overtime, i_neg_overtime, uharm_2_overtime, 
     uharm_3_overtime, uharm_4_overtime, uharm_5_overtime, uharm_6_overtime, uharm_7_overtime, 
     uharm_8_overtime, uharm_9_overtime, uharm_10_overtime, uharm_11_overtime, uharm_12_overtime, 
@@ -471,7 +471,7 @@
   <insert id="batchInsert" parameterType="map">
     <!--@mbg.generated-->
     insert into limit_rate
-    (line_id, phasic_type, `time`, all_time, flicker_overtime, flicker_all_time, freq_dev_overtime, 
+    (line_id, phasic_type, time, all_time, flicker_overtime, flicker_all_time, freq_dev_overtime,
       voltage_dev_overtime, ubalance_overtime, uaberrance_overtime, i_neg_overtime, uharm_2_overtime, 
       uharm_3_overtime, uharm_4_overtime, uharm_5_overtime, uharm_6_overtime, uharm_7_overtime, 
       uharm_8_overtime, uharm_9_overtime, uharm_10_overtime, uharm_11_overtime, uharm_12_overtime, 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/LimitTargetPOMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/LimitTargetPOMapper.xml
index 6f0311dc5..0ca6d40c7 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/LimitTargetPOMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/LimitTargetPOMapper.xml
@@ -82,7 +82,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    line_id, phasic_type, `time`, all_time, flicker_overtime, flicker_all_time, freq_dev_overtime, 
+    line_id, phasic_type, time, all_time, flicker_overtime, flicker_all_time, freq_dev_overtime,
     voltage_dev_overtime, ubalance_overtime, uaberrance_overtime, i_neg_overtime, uharm_2_overtime, 
     uharm_3_overtime, uharm_4_overtime, uharm_5_overtime, uharm_6_overtime, uharm_7_overtime, 
     uharm_8_overtime, uharm_9_overtime, uharm_10_overtime, uharm_11_overtime, uharm_12_overtime, 
@@ -985,7 +985,7 @@
   <insert id="batchInsert" parameterType="map">
     <!--@mbg.generated-->
     insert into limit_target
-    (line_id, phasic_type, `time`, all_time, flicker_overtime, flicker_all_time, freq_dev_overtime, 
+    (line_id, phasic_type, time, all_time, flicker_overtime, flicker_all_time, freq_dev_overtime,
       voltage_dev_overtime, ubalance_overtime, uaberrance_overtime, i_neg_overtime, uharm_2_overtime, 
       uharm_3_overtime, uharm_4_overtime, uharm_5_overtime, uharm_6_overtime, uharm_7_overtime, 
       uharm_8_overtime, uharm_9_overtime, uharm_10_overtime, uharm_11_overtime, uharm_12_overtime, 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpEventDetailDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpEventDetailDMapper.xml
index d9700eb1d..15dd722be 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpEventDetailDMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpEventDetailDMapper.xml
@@ -4,7 +4,7 @@
 
     <select id="getSagTimes" resultType="int">
         SELECT IFNULL(MAX(sag_times), 0)
-        FROM `r_mp_event_detail_d`
+        FROM r_mp_event_detail_d
         WHERE measurement_point_id = #{lineId}
         <![CDATA[AND DATE_FORMAT(data_date, '%Y-%m-%d') = #{date}
         ]]>
@@ -12,7 +12,7 @@
 
     <select id="getInterruptTimes" resultType="int">
         SELECT IFNULL(MAX(interrupt_times), 0)
-        FROM `r_mp_event_detail_d`
+        FROM r_mp_event_detail_d
         WHERE measurement_point_id = #{lineId}
         <![CDATA[AND DATE_FORMAT(data_date, '%Y-%m-%d') = #{date}
         ]]>
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpHarmonicVRateReportDPOMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpHarmonicVRateReportDPOMapper.xml
index 1507398d1..4cdc0f2a2 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpHarmonicVRateReportDPOMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpHarmonicVRateReportDPOMapper.xml
@@ -6,7 +6,7 @@
         SELECT
             IFNULL(max( voltage_harmonic_thd_95 ),0)
         FROM
-            `r_mp_harmonic_v_rate_report_d`
+            r_mp_harmonic_v_rate_report_d
         WHERE
         measurement_point_id = #{lineId}
         <![CDATA[AND data_date = #{date}]]>
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpMeasurePhaseReportDPOMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpMeasurePhaseReportDPOMapper.xml
index eadcee0a6..14d56902e 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpMeasurePhaseReportDPOMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpMeasurePhaseReportDPOMapper.xml
@@ -6,7 +6,7 @@
         SELECT
             IFNULL(max( v_de_up_max ),0)
         FROM
-            `r_mp_measure_phase_report_d`
+            r_mp_measure_phase_report_d
         WHERE
         measurement_point_id = #{lineId}
         <![CDATA[AND data_date = #{date}]]>
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpMeasureReportDPOMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpMeasureReportDPOMapper.xml
index 201585d06..e0ad9f94d 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpMeasureReportDPOMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpMeasureReportDPOMapper.xml
@@ -5,7 +5,7 @@
         SELECT
             IFNULL(max( frequency_deviation_max ),0)
         FROM
-            `r_mp_measure_report_d`
+            r_mp_measure_report_d
         WHERE
         measurement_point_id = #{lineId}
         <![CDATA[AND data_date = #{date}]]>
@@ -15,7 +15,7 @@
         SELECT
             IFNULL(max( NEGATIVE_SEQUENCE_VOLTAGE_UNBALANCE_95 ),0)
         FROM
-            `r_mp_measure_report_d`
+            r_mp_measure_report_d
         WHERE
         measurement_point_id = #{lineId}
         <![CDATA[AND data_date = #{date}]]>
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPartHarmonicDetailDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPartHarmonicDetailDMapper.xml
index 7b2a62f46..0892b6c16 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPartHarmonicDetailDMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPartHarmonicDetailDMapper.xml
@@ -64,7 +64,7 @@
         sum( is_unbalance ) unbalance_over_day,
         sum( is_i_neg ) i_neg_over_day
         FROM
-        `r_mp_part_harmonic_detail_d`
+        r_mp_part_harmonic_detail_d
         WHERE
         <![CDATA[data_date >= #{startTime}]]>
         AND <![CDATA[data_date <= #{endTime}]]>
@@ -588,7 +588,7 @@
         left join
         (
         select
-        t0.`time` time,
+        t0.time time,
         t0.line_id lineId,
         sum(case when t0.vl_dev&gt;=0 and t0.vl_dev>t1.Voltage_Dev then 1 else 0 end) up,
         sum(case when t0.vl_dev&lt;0 and abs(t0.vl_dev)>abs(t1.Voltage_Dev) then 1 else 0 end) down
@@ -599,9 +599,9 @@
         where
         value_type = 'MAX'
         and phasic_type in ('A', 'B', 'C')
-        and `time` = #{time}
+        and time = #{time}
         group by
-        t0.`time`,
+        t0.time,
         t0.line_id
         ) t1 on
         t0.time_id = t1.time
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPltReportDPOMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPltReportDPOMapper.xml
index 256ed82c7..e7551170f 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPltReportDPOMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPltReportDPOMapper.xml
@@ -6,7 +6,7 @@
         SELECT
             IFNULL(max( long_time_flashing_max ),0)
         FROM
-            `r_mp_plt_report_d`
+            r_mp_plt_report_d
         WHERE
         measurement_point_id = #{lineId}
         <![CDATA[AND data_date = #{date}]]>
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPollutionDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPollutionDMapper.xml
index a7b466906..21ea20765 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPollutionDMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPollutionDMapper.xml
@@ -3,8 +3,8 @@
 <mapper namespace="com.njcn.prepare.harmonic.mapper.mysql.line.RMpPollutionDMapper">
 
     <insert id="insertPollution">
-        INSERT INTO r_mp_pollution_d ( line_id, data_date, pollution_type, `value`) VALUES
+        INSERT INTO r_mp_pollution_d ( line_id, data_date, pollution_type, value) VALUES
             ( #{item.lineId}, #{item.dataDate}, #{item.pollutionType}, #{item.value}   )
-            ON DUPLICATE KEY UPDATE `value` = #{item.value}
+            ON DUPLICATE KEY UPDATE value = #{item.value}
     </insert>
 </mapper>
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpSurplusHarmonicDetailDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpSurplusHarmonicDetailDMapper.xml
index f6cb3b10e..ffb93ef12 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpSurplusHarmonicDetailDMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpSurplusHarmonicDetailDMapper.xml
@@ -24,7 +24,7 @@
             sum( is_inuharm_15 ) inuharm_15_over_day,
             sum( is_inuharm_16 ) inuharm_16_over_day
         FROM
-            `r_mp_surplus_harmonic_detail_d`
+            r_mp_surplus_harmonic_detail_d
         WHERE
         <![CDATA[data_date >= #{startTime}]]>
         AND <![CDATA[data_date <= #{endTime}]]>
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpVThdMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpVThdMapper.xml
index f9b0c82d6..61fb8498d 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpVThdMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpVThdMapper.xml
@@ -12,12 +12,12 @@
         select
             line_id measurementPointId,
             max(v_thd) vThd,
-            `time` dataDate,
+            time dataDate,
             '0' dataType
         from
             r_stat_data_v_d
         where
-            `time` = #{time}
+            time = #{time}
             and phasic_type in ('A', 'B', 'C')
             and value_type = 'CP95'
             <if test="lineList != null and lineList.size() > 0">
@@ -26,6 +26,6 @@
                     #{item}
                 </foreach>
             </if>
-        group by line_id, `time`
+        group by line_id, time
     </select>
 </mapper>
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionOrgDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionOrgDMapper.xml
index 96bed1496..1b6ba4657 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionOrgDMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionOrgDMapper.xml
@@ -3,9 +3,9 @@
 <mapper namespace="com.njcn.prepare.harmonic.mapper.mysql.line.RStatPollutionOrgDMapper">
 
     <insert id="insertPollution">
-        INSERT INTO r_stat_pollution_org_d ( org_id, data_date, pollution_type, `value`) VALUES
+        INSERT INTO r_stat_pollution_org_d ( org_id, data_date, pollution_type, value) VALUES
             ( #{item.orgId}, #{item.dataDate}, #{item.pollutionType}, #{item.value}   )
-            ON DUPLICATE KEY UPDATE `value` = #{item.value}
+            ON DUPLICATE KEY UPDATE value = #{item.value}
     </insert>
 
 </mapper>
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionOrgMMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionOrgMMapper.xml
index 2fc68ee69..a9fddf6ef 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionOrgMMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionOrgMMapper.xml
@@ -3,9 +3,9 @@
 <mapper namespace="com.njcn.prepare.harmonic.mapper.mysql.line.RStatPollutionOrgMMapper">
 
     <insert id="insertPollution">
-        INSERT INTO r_stat_pollution_org_m ( org_id, data_date, pollution_type, `value`) VALUES
+        INSERT INTO r_stat_pollution_org_m ( org_id, data_date, pollution_type, value) VALUES
             ( #{item.orgId}, #{item.dataDate}, #{item.pollutionType}, #{item.value}   )
-            ON DUPLICATE KEY UPDATE `value` = #{item.value}
+            ON DUPLICATE KEY UPDATE value = #{item.value}
     </insert>
 
 </mapper>
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionOrgQMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionOrgQMapper.xml
index 0277e422f..1465acde7 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionOrgQMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionOrgQMapper.xml
@@ -3,8 +3,8 @@
 <mapper namespace="com.njcn.prepare.harmonic.mapper.mysql.line.RStatPollutionOrgQMapper">
 
     <insert id="insertPollution">
-        INSERT INTO r_stat_pollution_org_q ( org_id, data_date, pollution_type, `value`) VALUES
+        INSERT INTO r_stat_pollution_org_q ( org_id, data_date, pollution_type, value) VALUES
             ( #{item.orgId}, #{item.dataDate}, #{item.pollutionType}, #{item.value}   )
-            ON DUPLICATE KEY UPDATE `value` = #{item.value}
+            ON DUPLICATE KEY UPDATE value = #{item.value}
     </insert>
 </mapper>
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionOrgYMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionOrgYMapper.xml
index fc5946078..c1ae37b6b 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionOrgYMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionOrgYMapper.xml
@@ -3,8 +3,8 @@
 <mapper namespace="com.njcn.prepare.harmonic.mapper.mysql.line.RStatPollutionOrgYMapper">
 
     <insert id="insertPollution">
-        INSERT INTO r_stat_pollution_org_y ( org_id, data_date, pollution_type, `value`) VALUES
+        INSERT INTO r_stat_pollution_org_y ( org_id, data_date, pollution_type, value) VALUES
             ( #{item.orgId}, #{item.dataDate}, #{item.pollutionType}, #{item.value}   )
-            ON DUPLICATE KEY UPDATE `value` = #{item.value}
+            ON DUPLICATE KEY UPDATE value = #{item.value}
     </insert>
 </mapper>
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionSubstationDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionSubstationDMapper.xml
index b33744442..13dd4b951 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionSubstationDMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionSubstationDMapper.xml
@@ -3,9 +3,9 @@
 <mapper namespace="com.njcn.prepare.harmonic.mapper.mysql.line.RStatPollutionSubstationDMapper">
 
     <insert id="insertPollution">
-        INSERT INTO r_stat_pollution_substation_d ( substation_id, data_date, pollution_type, `value`) VALUES
+        INSERT INTO r_stat_pollution_substation_d ( substation_id, data_date, pollution_type, value) VALUES
             ( #{item.substationId}, #{item.dataDate}, #{item.pollutionType}, #{item.value}   )
-            ON DUPLICATE KEY UPDATE `value` = #{item.value}
+            ON DUPLICATE KEY UPDATE value = #{item.value}
     </insert>
 
 </mapper>
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionSubstationMMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionSubstationMMapper.xml
index f517398b2..d16962b2d 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionSubstationMMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionSubstationMMapper.xml
@@ -3,8 +3,8 @@
 <mapper namespace="com.njcn.prepare.harmonic.mapper.mysql.line.RStatPollutionSubstationMMapper">
 
     <insert id="insertPollution">
-        INSERT INTO r_stat_pollution_substation_m ( substation_id, data_date, pollution_type, `value`) VALUES
+        INSERT INTO r_stat_pollution_substation_m ( substation_id, data_date, pollution_type, value) VALUES
             ( #{item.substationId}, #{item.dataDate}, #{item.pollutionType}, #{item.value}   )
-            ON DUPLICATE KEY UPDATE `value` = #{item.value}
+            ON DUPLICATE KEY UPDATE value = #{item.value}
     </insert>
 </mapper>
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionSubstationQMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionSubstationQMapper.xml
index 31462b8f0..92d3bde40 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionSubstationQMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionSubstationQMapper.xml
@@ -3,8 +3,8 @@
 <mapper namespace="com.njcn.prepare.harmonic.mapper.mysql.line.RStatPollutionSubstationQMapper">
 
     <insert id="insertPollution">
-        INSERT INTO r_stat_pollution_substation_q ( substation_id, data_date, pollution_type, `value`) VALUES
+        INSERT INTO r_stat_pollution_substation_q ( substation_id, data_date, pollution_type, value) VALUES
             ( #{item.substationId}, #{item.dataDate}, #{item.pollutionType}, #{item.value}   )
-            ON DUPLICATE KEY UPDATE `value` = #{item.value}
+            ON DUPLICATE KEY UPDATE value = #{item.value}
     </insert>
 </mapper>
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionSubstationYMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionSubstationYMapper.xml
index d7427ba73..8396f5ba8 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionSubstationYMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RStatPollutionSubstationYMapper.xml
@@ -3,8 +3,8 @@
 <mapper namespace="com.njcn.prepare.harmonic.mapper.mysql.line.RStatPollutionSubstationYMapper">
 
     <insert id="insertPollution">
-        INSERT INTO r_stat_pollution_substation_y ( substation_id, data_date, pollution_type, `value`) VALUES
+        INSERT INTO r_stat_pollution_substation_y ( substation_id, data_date, pollution_type, value) VALUES
             ( #{item.substationId}, #{item.dataDate}, #{item.pollutionType}, #{item.value}   )
-            ON DUPLICATE KEY UPDATE `value` = #{item.value}
+            ON DUPLICATE KEY UPDATE value = #{item.value}
     </insert>
 </mapper>
diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RFlowProcessPO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RFlowProcessPO.java
index bdb3aef58..4084d5d31 100644
--- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RFlowProcessPO.java
+++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RFlowProcessPO.java
@@ -34,7 +34,7 @@ public class RFlowProcessPO extends BaseEntity {
     /**
      * 申请表单类型
      */
-    @TableField(value = "`type`")
+    @TableField(value = "type")
     private Integer type;
 
     /**
diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/RFlowProcessPOMapper.xml b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/RFlowProcessPOMapper.xml
index 2bde65b3d..7bfbd85bf 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/RFlowProcessPOMapper.xml
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/RFlowProcessPOMapper.xml
@@ -23,7 +23,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, `type`, org_no, application_form_text, file_path, upload_time, checker_name, 
+    id, type, org_no, application_form_text, file_path, upload_time, checker_name,
     checker, description, check_status, process_status, apply_type, Create_By, Create_Time, 
     Update_By, Update_Time
   </sql>
diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/RGeneralSurveyPlanPOMapper.xml b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/RGeneralSurveyPlanPOMapper.xml
index f34f93bdc..4733eb97b 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/RGeneralSurveyPlanPOMapper.xml
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/RGeneralSurveyPlanPOMapper.xml
@@ -22,6 +22,6 @@
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     org_no, plan_no, plan_name, plan_create_time, plan_start_time, plan_end_time, plan_complate_time,
-    leader, `status`, description, is_file_upload, file_count, file_path, upload_time
+    leader, status, description, is_file_upload, file_count, file_path, upload_time
   </sql>
 </mapper>
\ No newline at end of file
diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/RStatElectricQualityProblemLogMapper.xml b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/RStatElectricQualityProblemLogMapper.xml
index 7890bf4d6..9cf5c6afa 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/RStatElectricQualityProblemLogMapper.xml
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/RStatElectricQualityProblemLogMapper.xml
@@ -15,6 +15,6 @@
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     power_quality_problem_no, data_date, checker, description, report_process, report_process_content, 
-    `type`
+    type
   </sql>
 </mapper>
\ No newline at end of file
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionKeyEnum.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionKeyEnum.java
index 525e86841..23822bf86 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionKeyEnum.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionKeyEnum.java
@@ -63,8 +63,8 @@ public enum SupervisionKeyEnum {
         this.routePath = routePath;
     }
 
-    private static final String packagePrefix = "com.njcn.supervision.service.";
-    private static final String packageMiddle = ".impl.";
+    private static final String PACKAGE_PREFIX = "com.njcn.supervision.service.";
+    private static final String PACKAGE_MIDDLE = ".impl.";
 
     /**
      * 根据流程key获取类的全路径，用于获取spring中的对象
@@ -72,7 +72,7 @@ public enum SupervisionKeyEnum {
     public static String getFullServicePathByKey(String key) {
         for (SupervisionKeyEnum supervisionKeyEnum : SupervisionKeyEnum.values()) {
             if (supervisionKeyEnum.key.equalsIgnoreCase(key)) {
-                return packagePrefix.concat(supervisionKeyEnum.servicePrefix).concat(packageMiddle).concat(supervisionKeyEnum.clazzName);
+                return PACKAGE_PREFIX.concat(supervisionKeyEnum.servicePrefix).concat(PACKAGE_MIDDLE).concat(supervisionKeyEnum.clazzName);
             }
         }
         return null;
@@ -108,7 +108,7 @@ public enum SupervisionKeyEnum {
     public static List<String> getAllFullServicePath() {
         List<String> path = new ArrayList<>();
         for (SupervisionKeyEnum supervisionKeyEnum : SupervisionKeyEnum.values()) {
-            path.add(packagePrefix.concat(supervisionKeyEnum.servicePrefix).concat(packageMiddle).concat(supervisionKeyEnum.clazzName));
+            path.add(PACKAGE_PREFIX.concat(supervisionKeyEnum.servicePrefix).concat(PACKAGE_MIDDLE).concat(supervisionKeyEnum.clazzName));
         }
         return path;
     }
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/databank/LibAlgorithm.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/databank/LibAlgorithm.java
index 37ab9856c..1fbbaed44 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/databank/LibAlgorithm.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/databank/LibAlgorithm.java
@@ -50,7 +50,7 @@ public class LibAlgorithm extends BaseEntity {
     /**
      * 定义
      */
-    @TableField(value = "`definition`")
+    @TableField(value = "definition")
     private String definition;
 
     /**
@@ -74,7 +74,7 @@ public class LibAlgorithm extends BaseEntity {
     /**
      * 状态（字典 1正常 0删除）
      */
-    @TableField(value = "`status`")
+    @TableField(value = "status")
     private Integer status;
 
     /**
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/databank/LibCase.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/databank/LibCase.java
index baeb9b013..15f89c2e5 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/databank/LibCase.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/databank/LibCase.java
@@ -82,7 +82,7 @@ public class LibCase extends BaseEntity {
     /**
      * 状态（字典 1正常 删除）
      */
-    @TableField(value = "`status`")
+    @TableField(value = "status")
     private Integer status;
 
 
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/databank/LibStandard.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/databank/LibStandard.java
index 1b9115006..94b07751a 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/databank/LibStandard.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/databank/LibStandard.java
@@ -55,7 +55,7 @@ public class LibStandard extends BaseEntity {
     /**
      * 状态（字典 1正常 删除）
      */
-    @TableField(value = "`status`")
+    @TableField(value = "status")
     private Integer status;
     @TableField(exist = false)
     private List<LibStandard> children;
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/databank/LibTemplate.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/databank/LibTemplate.java
index 84ac80458..0f422aa2c 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/databank/LibTemplate.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/databank/LibTemplate.java
@@ -42,7 +42,7 @@ public class LibTemplate extends BaseEntity {
     /**
      * 状态（字典 1正常 删除）
      */
-    @TableField(value = "`status`")
+    @TableField(value = "status")
     private Integer status;
 
 
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionDevMainReportPO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionDevMainReportPO.java
index e109584ac..efe7953e2 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionDevMainReportPO.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionDevMainReportPO.java
@@ -145,19 +145,19 @@ public class SupervisionDevMainReportPO extends BaseEntity {
     /**
      * 1:审批中；2：审批通过；3：审批不通过；4：已取消
      */
-    @TableField(value = "`status`")
+    @TableField(value = "status")
     private Integer status;
 
 
     /**
      * 状态：0-删除 1-正常
      */
-    @TableField(value = "`State`")
+    @TableField(value = "State")
     private Integer state;
 
     /**
      * 状态：0：系统建档 1：外部导入
      */
-    @TableField(value = "`import_type`")
+    @TableField(value = "import_type")
     private Integer importType;
 }
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineDebugPO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineDebugPO.java
index 65d624473..1e90132d8 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineDebugPO.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineDebugPO.java
@@ -47,14 +47,14 @@ public class SupervisionTempLineDebugPO extends BaseEntity {
     /**
      * 1:审批中；2：审批通过；3：审批不通过；4：已取消
      */
-    @TableField(value = "`status`")
+    @TableField(value = "status")
     @ApiModelProperty(value="1:审批中；2：审批通过；3：审批不通过；4：已取消,5数据同步完成")
     private Integer status;
 
     /**
      * 状态：0-删除 1-正常
      */
-    @TableField(value = "`State`")
+    @TableField(value = "State")
     @ApiModelProperty(value="状态：0-删除 1-正常")
     private Integer state;
 }
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineReport.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineReport.java
index c3a5944a5..edc783165 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineReport.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineReport.java
@@ -247,12 +247,12 @@ public class SupervisionTempLineReport  extends BaseEntity {
     /**
      * 1:审批中；2：审批通过；3：审批不通过；4：已取消
      */
-    @TableField(value = "`status`")
+    @TableField(value = "status")
     private Integer status;
 
     /**
      * 状态：0-删除 1-正常
      */
-    @TableField(value = "`State`")
+    @TableField(value = "State")
     private Integer state;
 }
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/plan/SupervisionPlanPO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/plan/SupervisionPlanPO.java
index 35e110a6e..a93b9e067 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/plan/SupervisionPlanPO.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/plan/SupervisionPlanPO.java
@@ -227,13 +227,13 @@ public class SupervisionPlanPO  extends BaseEntity {
     /**
      * 1:审批中；2：审批通过；3：审批不通过；4：已取消
      */
-    @TableField(value = "`status`")
+    @TableField(value = "status")
     private Integer status;
 
 
     /**
      * 状态：0-删除 1-正常
      */
-    @TableField(value = "`State`")
+    @TableField(value = "State")
     private Integer state;
 }
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/problem/SupervisionUserComplaintPO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/problem/SupervisionUserComplaintPO.java
index 0b5c2f5d6..7129fda43 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/problem/SupervisionUserComplaintPO.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/problem/SupervisionUserComplaintPO.java
@@ -87,7 +87,7 @@ public class SupervisionUserComplaintPO extends BaseEntity {
     /**
      * 是否实现检测(0：否；1：是)
      */
-    @TableField(value = "`detection_flag`")
+    @TableField(value = "detection_flag")
     private Integer detectionFlag;
 
 
@@ -113,7 +113,7 @@ public class SupervisionUserComplaintPO extends BaseEntity {
     /**
      * 状态：0-删除 1-正常
      */
-    @TableField(value = "`state`")
+    @TableField(value = "state")
     private Integer state;
 
 
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SupervisionGeneralSurveyPlanDetailPO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SupervisionGeneralSurveyPlanDetailPO.java
index dd38b47b9..fa057c5c7 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SupervisionGeneralSurveyPlanDetailPO.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SupervisionGeneralSurveyPlanDetailPO.java
@@ -90,6 +90,6 @@ public class SupervisionGeneralSurveyPlanDetailPO extends BaseEntity {
     /**
      * 状态：0-删除 1-正常
      */
-    @TableField(value = "`State`")
+    @TableField(value = "State")
     private Integer state;
 }
\ No newline at end of file
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SupervisionGeneralSurveyPlanPO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SupervisionGeneralSurveyPlanPO.java
index 9f13496c7..a7fe9e5a8 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SupervisionGeneralSurveyPlanPO.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SupervisionGeneralSurveyPlanPO.java
@@ -75,7 +75,7 @@ public class SupervisionGeneralSurveyPlanPO extends BaseEntity {
     /**
      * 计划状态(1:审批中；2：审批通过；3：审批不通过；4：已取消
      */
-    @TableField(value = "`status`")
+    @TableField(value = "status")
     private Integer status;
 
     /**
@@ -113,6 +113,6 @@ public class SupervisionGeneralSurveyPlanPO extends BaseEntity {
     /**
      * 状态：0-删除 1-正常
      */
-    @TableField(value = "`State`")
+    @TableField(value = "State")
     private Integer state;
 }
\ No newline at end of file
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportPO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportPO.java
index fa1d5c57d..aade1bce3 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportPO.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportPO.java
@@ -139,14 +139,14 @@ public class UserReportPO extends BaseEntity {
     /**
      * 审批状态：1:审批中；2：审批通过；3：审批不通过；4：已取消
      */
-    @TableField(value = "`status`")
+    @TableField(value = "status")
     private Integer status;
 
 
     /**
      * 状态：0-删除 1-正常
      */
-    @TableField(value = "`State`")
+    @TableField(value = "State")
     private Integer state;
 
 
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportProjectPO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportProjectPO.java
index 61c28fc0d..c72a41ebf 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportProjectPO.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportProjectPO.java
@@ -85,6 +85,6 @@ public class UserReportProjectPO extends BaseEntity {
     /**
      * 数据状态
      */
-    @TableField(value = "`state`")
+    @TableField(value = "state")
     private Integer state;
 }
\ No newline at end of file
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSensitivePO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSensitivePO.java
index e6976a36d..fe0f41cd7 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSensitivePO.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSensitivePO.java
@@ -145,7 +145,7 @@ public class UserReportSensitivePO extends BaseEntity {
     /**
      * 数据状态
      */
-    @TableField(value = "`state`")
+    @TableField(value = "state")
     private Integer state;
 
     /**
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSubstationPO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSubstationPO.java
index 8039aa905..5ebc7d47b 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSubstationPO.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSubstationPO.java
@@ -126,7 +126,7 @@ public class UserReportSubstationPO  extends BaseEntity {
     /**
      * 数据状态
      */
-    @TableField(value = "`state`")
+    @TableField(value = "state")
     private Integer state;
 
 
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java
index bfecd5c19..9e36ea431 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java
@@ -132,7 +132,7 @@ public class UserReportVO {
     /**
      * 审批状态：1:审批中；2：审批通过；3：审批不通过；4：已取消
      */
-    @TableField(value = "`status`")
+    @TableField(value = "status")
     private Integer status;
 
     /**
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/BusinessCommonController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/BusinessCommonController.java
index e084797ed..7c7ac6dda 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/BusinessCommonController.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/BusinessCommonController.java
@@ -32,6 +32,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+/**
+ * @author hongawen
+ */
 @Slf4j
 @RestController
 @RequestMapping("/supervision")
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/databank/LibAlgorithmController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/databank/LibAlgorithmController.java
index f8a7e236d..4bef044ea 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/databank/LibAlgorithmController.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/databank/LibAlgorithmController.java
@@ -56,7 +56,7 @@ public class LibAlgorithmController  extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, id, methodDescribe);
     }
 
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.QUERY)
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @GetMapping("/queryAllAlgorithmLibrary")
     @ApiOperation("查询所有算法库树结构")
     public HttpResult<List<LibAlgorithm>> queryAllAlgorithmLibrary() {
@@ -64,7 +64,7 @@ public class LibAlgorithmController  extends BaseController {
         List<LibAlgorithm> result = libAlgorithmService.queryAll();
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.QUERY)
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @GetMapping("/queryById")
     @ApiOperation("根据id查询")
     public HttpResult<LibAlgorithm> queryById(@RequestParam("id") String id) {
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/databank/LibCaseController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/databank/LibCaseController.java
index 06ff263fa..0d8fd90e8 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/databank/LibCaseController.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/databank/LibCaseController.java
@@ -57,7 +57,7 @@ public class LibCaseController extends BaseController {
         String fileUrl = fileStorageUtil.getFileUrl(caseUrl);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, fileUrl, methodDescribe);
     }
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.QUERY)
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/queryStandardCase")
     @ApiOperation("获取标准案例")
     public HttpResult<String> queryStandardCase() {
@@ -85,7 +85,7 @@ public class LibCaseController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, update, methodDescribe);
     }
 
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.QUERY)
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @GetMapping("/queryById")
     @ApiOperation("根据id查询")
     public HttpResult<LibCase> queryById(@RequestParam("id") String id) {
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/databank/LibStandardController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/databank/LibStandardController.java
index 73076a98d..f294fb907 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/databank/LibStandardController.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/databank/LibStandardController.java
@@ -63,7 +63,7 @@ public class LibStandardController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, update, methodDescribe);
     }
 
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.QUERY)
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @GetMapping("/queryById")
     @ApiOperation("根据id查询")
     public HttpResult<LibStandard> queryById(@RequestParam("id") String id) {
@@ -72,7 +72,7 @@ public class LibStandardController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.QUERY)
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @GetMapping("/queryAll")
     @ApiOperation("查询所有标准库树结构")
     public HttpResult<List<LibStandard>> queryAll() {
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/databank/LibTemplateController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/databank/LibTemplateController.java
index bc339dca8..415d4bb6d 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/databank/LibTemplateController.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/databank/LibTemplateController.java
@@ -63,7 +63,7 @@ public class LibTemplateController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, update, methodDescribe);
     }
 
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.QUERY)
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @GetMapping("/queryById")
     @ApiOperation("根据id查询")
     public HttpResult<LibTemplate> queryById(@RequestParam("id") String id) {
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java
index e9e709f7f..e1c06663e 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java
@@ -43,7 +43,10 @@ public class DeVReportManageController extends BaseController {
 
     private final SupervisionDevMainReportPOService supervisionDevMainReportPOService;
 
-    //装置新增
+    /**
+     * 装置新增
+     * @param supervisionDevMainReportParam 参数
+     */
     @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD)
     @PostMapping("/add")
     @ApiOperation("新增电能质量监测装置设备")
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/LineWarningController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/LineWarningController.java
index 4eabf962d..da958a65e 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/LineWarningController.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/LineWarningController.java
@@ -22,7 +22,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineController.java
index 8029863f8..5a1535312 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineController.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineController.java
@@ -8,7 +8,6 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.supervision.pojo.param.device.SupervisionDevMainReportParam;
 import com.njcn.supervision.pojo.param.device.SupervisionTempLineReportParam;
 import com.njcn.supervision.pojo.vo.device.SupervisionTempLineReportVO;
 import com.njcn.supervision.service.device.SupervisionTempLineReportService;
@@ -16,7 +15,6 @@ import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.annotations.Operation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
@@ -42,7 +40,10 @@ public class TempLineController extends BaseController {
 
     private final SupervisionTempLineReportService supervisionTempLineReportService;
 
-    //监测点新增
+    /**
+     * 监测点新增
+     * @param supervisionTempLineReportParam 参数
+     */
     @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD)
     @PostMapping("/add")
     @ApiOperation("新增临时监测点管理")
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineDebugController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineDebugController.java
index d6557bd34..592034ce1 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineDebugController.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineDebugController.java
@@ -15,7 +15,6 @@ import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.annotations.Operation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/gridDiagram/GridDiagramController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/gridDiagram/GridDiagramController.java
index 2dd7672e3..6deb69e5e 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/gridDiagram/GridDiagramController.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/gridDiagram/GridDiagramController.java
@@ -22,6 +22,9 @@ import com.njcn.supervision.pojo.vo.gridDiagram.GridDiagramVO;
 import java.util.List;
 
 
+/**
+ * @author wr
+ */
 @Validated
 @Slf4j
 @RestController
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/LineRunTestProblemController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/LineRunTestProblemController.java
index ab4f5abe4..48fa3a903 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/LineRunTestProblemController.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/LineRunTestProblemController.java
@@ -24,7 +24,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author wr
- * @description
  * @date 2024/7/3 9:02
  */
 @Slf4j
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/SupervisionUserComplaintController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/SupervisionUserComplaintController.java
index e4fdc16fb..28b8f869b 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/SupervisionUserComplaintController.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/SupervisionUserComplaintController.java
@@ -19,6 +19,9 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
+/**
+ * @author hongawen
+ */
 @Slf4j
 @RestController
 @RequestMapping("/SupervisionUserComplaint")
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/GeneralSurveyController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/GeneralSurveyController.java
index aa1061961..df90d9917 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/GeneralSurveyController.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/GeneralSurveyController.java
@@ -17,7 +17,6 @@ import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.annotations.Operation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/databank/mapping/LibCaseMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/databank/mapping/LibCaseMapper.xml
index 13d3ba849..fa6a6a4ae 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/databank/mapping/LibCaseMapper.xml
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/databank/mapping/LibCaseMapper.xml
@@ -3,8 +3,7 @@
 <mapper namespace="com.njcn.supervision.mapper.databank.LibCaseMapper">
 
 
-  <select id="page"
-          resultType="com.njcn.supervision.pojo.po.databank.LibCase">
+  <select id="page" resultType="com.njcn.supervision.pojo.po.databank.LibCase">
     SELECT
     *
     FROM lib_case lib_case
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionTempLineDebugPOMapper.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionTempLineDebugPOMapper.java
index 5112c4df5..5e90a43ee 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionTempLineDebugPOMapper.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionTempLineDebugPOMapper.java
@@ -25,9 +25,6 @@ public interface SupervisionTempLineDebugPOMapper extends BaseMapper<Supervision
 
     /**
      * 问题分页并查询是否有告警单
-     * @param objectPage
-     * @param queryWrapper
-     * @return
      */
     Page<SupervisionTempLineDebugVO> pageProblem(@Param("page") Page<Object> objectPage,
                                                   @Param("ew") QueryWrapper<SupervisionDevMainReportVO> queryWrapper);
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/TempLineRunTestWarningMapper.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/TempLineRunTestWarningMapper.java
index ed94e3a92..7963fb638 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/TempLineRunTestWarningMapper.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/TempLineRunTestWarningMapper.java
@@ -8,10 +8,7 @@ import com.njcn.supervision.pojo.po.device.TempLineRunTestWarning;
 import java.util.List;
 
 /**
-* @author web2023
-* @description 针对表【supervision_temp_line_run_test_warning】的数据库操作Mapper
-* @createDate 2024-07-03 13:52:39
-* @Entity
+* @author wr
 */
 public interface TempLineRunTestWarningMapper extends BaseMapper<TempLineRunTestWarning> {
 
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml
index 75ced4286..d97f0802a 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml
@@ -1,40 +1,6 @@
 <?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.supervision.mapper.device.SupervisionDevMainReportPOMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO">
-    <!--@mbg.generated-->
-    <!--@Table supervision_dev_main_report-->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="reporter" jdbcType="VARCHAR" property="reporter" />
-    <result column="report_date" jdbcType="DATE" property="reportDate" />
-    <result column="org_id" jdbcType="VARCHAR" property="orgId" />
-    <result column="expected_production_date" jdbcType="DATE" property="expectedProductionDate" />
-    <result column="city" jdbcType="VARCHAR" property="city" />
-    <result column="user_status" jdbcType="VARCHAR" property="userStatus" />
-    <result column="user_name" jdbcType="VARCHAR" property="userName" />
-    <result column="acceptance_inspection_report" jdbcType="VARCHAR" property="acceptanceInspectionReport" />
-    <result column="acceptance_inspection_report_single" jdbcType="VARCHAR" property="acceptanceInspectionReportSingle" />
-    <result column="type_experiment_report" jdbcType="VARCHAR" property="typeExperimentReport" />
-    <result column="factory_inspection_report" jdbcType="VARCHAR" property="factoryInspectionReport" />
-    <result column="performance_test_report" jdbcType="VARCHAR" property="performanceTestReport" />
-    <result column="information_security_test_report" jdbcType="VARCHAR" property="informationSecurityTestReport" />
-    <result column="other_attachments" jdbcType="VARCHAR" property="otherAttachments" />
-    <result column="process_instance_id" jdbcType="VARCHAR" property="processInstanceId" />
-    <result column="status" jdbcType="BIT" property="status" />
-    <result column="Create_By" jdbcType="CHAR" property="createBy" />
-    <result column="Create_Time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="Update_By" jdbcType="CHAR" property="updateBy" />
-    <result column="Update_Time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="State" jdbcType="BIT" property="state" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, reporter, report_date, org_id, expected_production_date, city, user_status, user_name,
-    acceptance_inspection_report, acceptance_inspection_report_single, type_experiment_report,
-    factory_inspection_report, performance_test_report, information_security_test_report,
-    other_attachments, process_instance_id, `status`, Create_By, Create_Time, Update_By,
-    Update_Time, `State`
-  </sql>
 
   <select id="page" resultType="com.njcn.supervision.pojo.vo.device.SupervisionDevMainReportVO">
     SELECT
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempDeviceReportMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempDeviceReportMapper.xml
index d32a47590..409a600e5 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempDeviceReportMapper.xml
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempDeviceReportMapper.xml
@@ -1,58 +1,5 @@
 <?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.supervision.mapper.device.SupervisionTempDeviceReportMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport">
-    <!--@mbg.generated-->
-    <!--@Table supervision_temp_device_report-->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="power_company" jdbcType="VARCHAR" property="powerCompany" />
-    <result column="substation" jdbcType="VARCHAR" property="substation" />
-    <result column="substation_voltage_level" jdbcType="VARCHAR" property="substationVoltageLevel" />
-    <result column="monitoring_terminal_code" jdbcType="VARCHAR" property="monitoringTerminalCode" />
-    <result column="monitoring_terminal_name" jdbcType="VARCHAR" property="monitoringTerminalName" />
-    <result column="voltage_transformer_type" jdbcType="VARCHAR" property="voltageTransformerType" />
-    <result column="terminal_wiring_method_type" jdbcType="VARCHAR" property="terminalWiringMethodType" />
-    <result column="neutral_point_wiring_method" jdbcType="VARCHAR" property="neutralPointWiringMethod" />
-    <result column="manufacturer" jdbcType="VARCHAR" property="manufacturer" />
-    <result column="manufacturer_device_number" jdbcType="VARCHAR" property="manufacturerDeviceNumber" />
-    <result column="terminal_ip" jdbcType="VARCHAR" property="terminalIp" />
-    <result column="terminal_type" jdbcType="VARCHAR" property="terminalType" />
-    <result column="terminal_port" jdbcType="VARCHAR" property="terminalPort" />
-    <result column="front_end_machine" jdbcType="VARCHAR" property="frontEndMachine" />
-    <result column="current_terminal_detection_time" jdbcType="TIMESTAMP" property="currentTerminalDetectionTime" />
-    <result column="next_terminal_inspection_time" jdbcType="TIMESTAMP" property="nextTerminalInspectionTime" />
-    <result column="identification_code" jdbcType="VARCHAR" property="identificationCode" />
-    <result column="terminal_secret_key" jdbcType="VARCHAR" property="terminalSecretKey" />
-    <result column="longitude" jdbcType="DECIMAL" property="longitude" />
-    <result column="latitude" jdbcType="DECIMAL" property="latitude" />
-    <result column="terminal_model" jdbcType="VARCHAR" property="terminalModel" />
-    <result column="data_type" jdbcType="VARCHAR" property="dataType" />
-    <result column="communication_status" jdbcType="VARCHAR" property="communicationStatus" />
-    <result column="sim_card_number" jdbcType="VARCHAR" property="simCardNumber" />
-    <result column="commissioning_time" jdbcType="TIMESTAMP" property="commissioningTime" />
-    <result column="data_update_time" jdbcType="TIMESTAMP" property="dataUpdateTime" />
-    <result column="time_sync_function" jdbcType="VARCHAR" property="timeSyncFunction" />
-    <result column="electroplating_function" jdbcType="VARCHAR" property="electroplatingFunction" />
-    <result column="monitoring_device_installation_position" jdbcType="VARCHAR" property="monitoringDeviceInstallationPosition" />
-    <result column="summon_flag" jdbcType="VARCHAR" property="summonFlag" />
-    <result column="alarm_function" jdbcType="VARCHAR" property="alarmFunction" />
-    <result column="contract_number" jdbcType="VARCHAR" property="contractNumber" />
-    <result column="Create_By" jdbcType="CHAR" property="createBy" />
-    <result column="Create_Time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="Update_By" jdbcType="CHAR" property="updateBy" />
-    <result column="Update_Time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="State" jdbcType="BIT" property="state" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, power_company, substation, substation_voltage_level, monitoring_terminal_code, 
-    monitoring_terminal_name, voltage_transformer_type, terminal_wiring_method_type, 
-    neutral_point_wiring_method, manufacturer, manufacturer_device_number, terminal_ip, 
-    terminal_type, terminal_port, front_end_machine, current_terminal_detection_time, 
-    next_terminal_inspection_time, identification_code, terminal_secret_key, longitude, 
-    latitude, terminal_model, data_type, communication_status, sim_card_number, commissioning_time, 
-    data_update_time, time_sync_function, electroplating_function, monitoring_device_installation_position, 
-    summon_flag, alarm_function, contract_number, Create_By, Create_Time, Update_By, 
-    Update_Time, `State`
-  </sql>
+
 </mapper>
\ No newline at end of file
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml
index eb61c0295..249589a09 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml
@@ -1,107 +1,91 @@
 <?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.supervision.mapper.device.SupervisionTempLineDebugPOMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.device.SupervisionTempLineDebugPO">
-    <!--@mbg.generated-->
-    <!--@Table supervision_temp_line_debug-->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="reason" jdbcType="VARCHAR" property="reason" />
-    <result column="process_instance_id" jdbcType="VARCHAR" property="processInstanceId" />
-    <result column="status" jdbcType="BIT" property="status" />
-    <result column="Create_By" jdbcType="CHAR" property="createBy" />
-    <result column="Create_Time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="Update_By" jdbcType="CHAR" property="updateBy" />
-    <result column="Update_Time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="State" jdbcType="BIT" property="state" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, reason, process_instance_id, `status`, Create_By, Create_Time, Update_By, Update_Time,
-    `State`
-  </sql>
+
 
   <select id="page" resultType="com.njcn.supervision.pojo.vo.device.SupervisionTempLineDebugVO">
-    SELECT
-    supervision_temp_line_report.id id,
-    supervision_temp_line_report.user_name,
-    supervision_temp_line_report.connected_bus,
-    supervision_temp_line_report.monitoring_terminal_code,
-    supervision_temp_line_report.monitoring_terminal_name,
-    supervision_temp_line_report.Power_Substation_Name,
-    supervision_temp_line_report.line_id lineId,
-    supervision_temp_line_report.line_name lineName,
-    supervision_temp_line_report.connected_bus,
-    supervision_temp_line_report.monitoring_terminal_code,
-    supervision_temp_line_report.monitoring_terminal_name,
-    supervision_temp_line_report.Power_Substation_Name,
-    supervision_temp_line_debug.reason reason,
-    supervision_temp_line_debug.process_instance_id process_instanceId,
-    supervision_temp_line_debug.history_instance_id,
-    supervision_temp_line_debug.`status` `Status`,
-    supervision_temp_line_debug.create_by
-    FROM
-    supervision_temp_line_debug
-    left JOIN supervision_temp_line_report ON supervision_temp_line_report.id = supervision_temp_line_debug.id
-    where supervision_temp_line_report.`status`=2
-    and ${ew.sqlSegment}
+      SELECT supervision_temp_line_report.id                 id,
+             supervision_temp_line_report.user_name,
+             supervision_temp_line_report.connected_bus,
+             supervision_temp_line_report.monitoring_terminal_code,
+             supervision_temp_line_report.monitoring_terminal_name,
+             supervision_temp_line_report.Power_Substation_Name,
+             supervision_temp_line_report.line_id            lineId,
+             supervision_temp_line_report.line_name          lineName,
+             supervision_temp_line_report.connected_bus,
+             supervision_temp_line_report.monitoring_terminal_code,
+             supervision_temp_line_report.monitoring_terminal_name,
+             supervision_temp_line_report.Power_Substation_Name,
+             supervision_temp_line_debug.reason              reason,
+             supervision_temp_line_debug.process_instance_id process_instanceId,
+             supervision_temp_line_debug.history_instance_id,
+             supervision_temp_line_debug.status            Status,
+             supervision_temp_line_debug.create_by
+      FROM supervision_temp_line_debug
+               left JOIN supervision_temp_line_report
+                         ON supervision_temp_line_report.id = supervision_temp_line_debug.id
+      where supervision_temp_line_report.status = 2
+        and ${ew.sqlSegment}
   </select>
 
 
   <select id="pageHasDebug" resultType="com.njcn.supervision.pojo.vo.device.SupervisionTempLineDebugVO">
-    SELECT
-    supervision_temp_line_report.id id,
-    supervision_temp_line_report.user_name,
-    supervision_temp_line_report.connected_bus,
-    supervision_temp_line_report.monitoring_terminal_code,
-    supervision_temp_line_report.monitoring_terminal_name,
-    supervision_temp_line_report.Power_Substation_Name,
-    supervision_temp_line_report.line_id lineId,
-    supervision_temp_line_report.line_name lineName,
-    supervision_temp_line_run_test.test_run_report,
-    supervision_temp_line_debug.reason reason,
-    supervision_temp_line_run_test.process_instance_id process_instanceId,
-    supervision_temp_line_run_test.history_instance_id,
-    supervision_temp_line_run_test.`status` `Status`,
-    IFNULL(supervision_temp_line_run_test.`test_run_state`,0) `testRunState`,
-    supervision_temp_line_run_test.test_run_time,
-    supervision_temp_line_run_test.create_by
-    FROM
-    supervision_temp_line_debug
-    inner JOIN supervision_temp_line_report  ON supervision_temp_line_report.id = supervision_temp_line_debug.id
-    left join supervision_temp_line_run_test on supervision_temp_line_debug.id = supervision_temp_line_run_test.id
-    where supervision_temp_line_debug.`status`=5
-    and ${ew.sqlSegment}
+      SELECT supervision_temp_line_report.id                            id,
+             supervision_temp_line_report.user_name,
+             supervision_temp_line_report.connected_bus,
+             supervision_temp_line_report.monitoring_terminal_code,
+             supervision_temp_line_report.monitoring_terminal_name,
+             supervision_temp_line_report.Power_Substation_Name,
+             supervision_temp_line_report.line_id                       lineId,
+             supervision_temp_line_report.line_name                     lineName,
+             supervision_temp_line_run_test.test_run_report,
+             supervision_temp_line_debug.reason                         reason,
+             supervision_temp_line_run_test.process_instance_id         process_instanceId,
+             supervision_temp_line_run_test.history_instance_id,
+             supervision_temp_line_run_test.status                   Status,
+             IFNULL(supervision_temp_line_run_test.test_run_state, 0) testRunState,
+             supervision_temp_line_run_test.test_run_time,
+             supervision_temp_line_run_test.create_by
+      FROM supervision_temp_line_debug
+               inner JOIN supervision_temp_line_report
+                          ON supervision_temp_line_report.id = supervision_temp_line_debug.id
+               left join supervision_temp_line_run_test
+                         on supervision_temp_line_debug.id = supervision_temp_line_run_test.id
+      where supervision_temp_line_debug.status = 5
+        and ${ew.sqlSegment}
   </select>
-  <select id="pageProblem" resultType="com.njcn.supervision.pojo.vo.device.SupervisionTempLineDebugVO">
-    SELECT
-      supervision_temp_line_run_test.id id,
-      supervision_temp_line_run_test_warning.id problemId,
-      supervision_temp_line_report.user_name,
-      supervision_temp_line_report.connected_bus,
-      supervision_temp_line_report.monitoring_terminal_code,
-      supervision_temp_line_report.monitoring_terminal_name,
-      supervision_temp_line_report.Power_Substation_Name,
-      supervision_temp_line_report.line_id lineId,
-      supervision_temp_line_report.line_name lineName,
-      supervision_temp_line_run_test_warning.test_run_report,
-      supervision_temp_line_debug.reason reason,
-      supervision_temp_line_run_test.process_instance_id process_instanceId,
-      supervision_temp_line_run_test.history_instance_id,
-      supervision_temp_line_run_test.`status` `Status`,
-      IFNULL(supervision_temp_line_run_test.`test_run_state`,0) `testRunState`,
-      supervision_temp_line_run_test.test_run_time,
-      supervision_temp_line_run_test.create_by,
-      supervision_warning_leaflet.problem_type problemType,
-      supervision_temp_line_run_test_warning.reason problemReason
-    FROM
-      supervision_temp_line_debug
-      inner JOIN supervision_temp_line_report  ON supervision_temp_line_report.id = supervision_temp_line_debug.id
-      inner join supervision_temp_line_run_test on supervision_temp_line_debug.id = supervision_temp_line_run_test.id
-      inner join supervision_temp_line_run_test_warning on supervision_temp_line_run_test_warning.line_run_id = supervision_temp_line_run_test.id
-      left join supervision_warning_leaflet on supervision_warning_leaflet.problem_id = supervision_temp_line_run_test_warning.id
-    where supervision_temp_line_debug.`status`=5
-      and ${ew.sqlSegment}
 
+  <select id="pageProblem" resultType="com.njcn.supervision.pojo.vo.device.SupervisionTempLineDebugVO">
+      SELECT supervision_temp_line_run_test.id                          id,
+             supervision_temp_line_run_test_warning.id                  problemId,
+             supervision_temp_line_report.user_name,
+             supervision_temp_line_report.connected_bus,
+             supervision_temp_line_report.monitoring_terminal_code,
+             supervision_temp_line_report.monitoring_terminal_name,
+             supervision_temp_line_report.Power_Substation_Name,
+             supervision_temp_line_report.line_id                       lineId,
+             supervision_temp_line_report.line_name                     lineName,
+             supervision_temp_line_run_test_warning.test_run_report,
+             supervision_temp_line_debug.reason                         reason,
+             supervision_temp_line_run_test.process_instance_id         process_instanceId,
+             supervision_temp_line_run_test.history_instance_id,
+             supervision_temp_line_run_test.status                    Status,
+             IFNULL(supervision_temp_line_run_test.test_run_state, 0) testRunState,
+             supervision_temp_line_run_test.test_run_time,
+             supervision_temp_line_run_test.create_by,
+             supervision_warning_leaflet.problem_type                   problemType,
+             supervision_temp_line_run_test_warning.reason              problemReason
+      FROM supervision_temp_line_debug
+               inner JOIN supervision_temp_line_report
+                          ON supervision_temp_line_report.id = supervision_temp_line_debug.id
+               inner join supervision_temp_line_run_test
+                          on supervision_temp_line_debug.id = supervision_temp_line_run_test.id
+               inner join supervision_temp_line_run_test_warning
+                          on supervision_temp_line_run_test_warning.line_run_id = supervision_temp_line_run_test.id
+               left join supervision_warning_leaflet
+                         on supervision_warning_leaflet.problem_id = supervision_temp_line_run_test_warning.id
+      where supervision_temp_line_debug.status = 5
+        and ${ew.sqlSegment}
   </select>
 
 </mapper>
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineReportMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineReportMapper.xml
index e1546a8b4..a15d4cc2e 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineReportMapper.xml
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineReportMapper.xml
@@ -1,41 +1,6 @@
 <?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.supervision.mapper.device.SupervisionTempLineReportMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.device.SupervisionTempLineReport">
-    <!--@mbg.generated-->
-    <!--@Table supervision_temp_line_report-->
-    <result column="id" jdbcType="VARCHAR" property="id" />
-    <result column="line_name" jdbcType="VARCHAR" property="lineName" />
-    <result column="voltage_level" jdbcType="VARCHAR" property="voltageLevel" />
-    <result column="connected_bus" jdbcType="VARCHAR" property="connectedBus" />
-    <result column="short_capacity" jdbcType="REAL" property="shortCapacity" />
-    <result column="deal_capacity" jdbcType="REAL" property="dealCapacity" />
-    <result column="dev_capacity" jdbcType="REAL" property="devCapacity" />
-    <result column="standard_capacity" jdbcType="REAL" property="standardCapacity" />
-    <result column="ct_ratio" jdbcType="REAL" property="ctRatio" />
-    <result column="pt_ratio" jdbcType="REAL" property="ptRatio" />
-    <result column="line_id" jdbcType="VARCHAR" property="lineId" />
-    <result column="time_interval" jdbcType="INTEGER" property="timeInterval" />
-    <result column="Load_Type" jdbcType="VARCHAR" property="loadType" />
-    <result column="Business_Type" jdbcType="VARCHAR" property="businessType" />
-    <result column="point_nature" jdbcType="VARCHAR" property="pointNature" />
-    <result column="is_statistical" jdbcType="BIT" property="isStatistical" />
-    <result column="Obj_Name" jdbcType="VARCHAR" property="objName" />
-    <result column="Power_Substation_Name" jdbcType="VARCHAR" property="powerSubstationName" />
-    <result column="is_grid_connection_point" jdbcType="BIT" property="isGridConnectionPoint" />
-    <result column="operation_status" jdbcType="VARCHAR" property="operationStatus" />
-    <result column="main_wiring_diagram" jdbcType="VARCHAR" property="mainWiringDiagram" />
-    <result column="voltage_deviation_upper_limit" jdbcType="REAL" property="voltageDeviationUpperLimit" />
-    <result column="voltage_deviation_lower_limit" jdbcType="REAL" property="voltageDeviationLowerLimit" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, line_name, voltage_level, connected_bus, short_capacity, deal_capacity, dev_capacity, 
-    standard_capacity, ct_ratio, pt_ratio, line_id, time_interval, Load_Type, Business_Type, 
-    point_nature, is_statistical, Obj_Name, Power_Substation_Name, is_grid_connection_point, 
-    operation_status, main_wiring_diagram, voltage_deviation_upper_limit, voltage_deviation_lower_limit
-  </sql>
-
   <select id="page" resultType="com.njcn.supervision.pojo.vo.device.SupervisionTempLineReportVO">
     SELECT
    *
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineRunTestMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineRunTestMapper.xml
index b35192615..19f6a6f1c 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineRunTestMapper.xml
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineRunTestMapper.xml
@@ -15,13 +15,13 @@
         supervision_temp_line_debug.reason reason,
         supervision_temp_line_run_test.process_instance_id process_instanceId,
         supervision_temp_line_run_test.history_instance_id historyInstanceId,
-        supervision_temp_line_run_test.`status` `Status`,
-        IFNULL(supervision_temp_line_run_test.`test_run_state`,0) `testRunState`,
+        supervision_temp_line_run_test.status Status,
+        IFNULL(supervision_temp_line_run_test.test_run_state,0) testRunState,
         supervision_temp_line_run_test.test_run_time,
-        supervision_temp_line_run_test.`online_rate` `onlineRate`,
-        supervision_temp_line_run_test.`integrity_rate` `integrityRate`,
-        supervision_temp_line_run_test.`suit_rate` `suitRate`,
-        supervision_temp_line_run_test.`test_run_report` as testRunReport
+        supervision_temp_line_run_test.online_rate onlineRate,
+        supervision_temp_line_run_test.integrity_rate integrityRate,
+        supervision_temp_line_run_test.suit_rate suitRate,
+        supervision_temp_line_run_test.test_run_report as testRunReport
         FROM
         supervision_temp_line_debug
         inner JOIN supervision_temp_line_report  ON supervision_temp_line_report.id = supervision_temp_line_debug.id
@@ -34,7 +34,7 @@
             supervision_temp_line_run_test_warning.id id,
             supervision_warning_leaflet.id warningId,
             supervision_warning_leaflet.status status,
-            supervision_warning_leaflet.create_time `time`
+            supervision_warning_leaflet.create_time time
         FROM
             supervision_temp_line_debug
         inner JOIN supervision_temp_line_report  ON supervision_temp_line_report.id = supervision_temp_line_debug.id
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/plan/mapping/SupervisionPlanPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/plan/mapping/SupervisionPlanPOMapper.xml
index 360490ca3..04efa98fa 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/plan/mapping/SupervisionPlanPOMapper.xml
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/plan/mapping/SupervisionPlanPOMapper.xml
@@ -1,49 +1,5 @@
 <?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.supervision.mapper.plan.SupervisionPlanPOMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.plan.SupervisionPlanPO">
-    <!--@mbg.generated-->
-    <!--@Table supervision_plan-->
-    <id column="plan_Id" jdbcType="CHAR" property="planId" />
-    <result column="work_plan_name" jdbcType="VARCHAR" property="workPlanName" />
-    <result column="supv_Type" jdbcType="CHAR" property="supvType" />
-    <result column="supv_Stage" jdbcType="CHAR" property="supvStage" />
-    <result column="supv_Org_Id" jdbcType="CHAR" property="supvOrgId" />
-    <result column="plan_User_Id" jdbcType="CHAR" property="planUserId" />
-    <result column="plan_Org_Id" jdbcType="CHAR" property="planOrgId" />
-    <result column="other_Remark" jdbcType="VARCHAR" property="otherRemark" />
-    <result column="effect_Start_Time" jdbcType="TIMESTAMP" property="effectStartTime" />
-    <result column="effect_End_Time" jdbcType="TIMESTAMP" property="effectEndTime" />
-    <result column="effect_Status" jdbcType="CHAR" property="effectStatus" />
-    <result column="plan_Supv_Date" jdbcType="TIMESTAMP" property="planSupvDate" />
-    <result column="supv_Obj_Type" jdbcType="CHAR" property="supvObjType" />
-    <result column="supv_Obj_Name" jdbcType="VARCHAR" property="supvObjName" />
-    <result column="obj_Voltage_Level" jdbcType="CHAR" property="objVoltageLevel" />
-    <result column="substation_Name" jdbcType="CHAR" property="substationName" />
-    <result column="substation_Voltage_Level" jdbcType="CHAR" property="substationVoltageLevel" />
-    <result column="obj_Type" jdbcType="VARCHAR" property="objType" />
-    <result column="obj_Type_Name" jdbcType="VARCHAR" property="objTypeName" />
-    <result column="obj_Capacity" jdbcType="DOUBLE" property="objCapacity" />
-    <result column="report_Issue_Time" jdbcType="TIMESTAMP" property="reportIssueTime" />
-    <result column="problem_Oc_Time" jdbcType="TIMESTAMP" property="problemOcTime" />
-    <result column="delete_Flag" jdbcType="CHAR" property="deleteFlag" />
-    <result column="plan_Status" jdbcType="CHAR" property="planStatus" />
-    <result column="delete_Time" jdbcType="TIMESTAMP" property="deleteTime" />
-    <result column="effect_User_Id" jdbcType="CHAR" property="effectUserId" />
-    <result column="effect_User_Name" jdbcType="CHAR" property="effectUserName" />
-    <result column="is_upload_head" jdbcType="BIT" property="isUploadHead" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="create_by" jdbcType="CHAR" property="createBy" />
-    <result column="update_by" jdbcType="CHAR" property="updateBy" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    plan_Id, work_plan_name, supv_Type, supv_Stage, supv_Org_Id, plan_User_Id, plan_Org_Id, 
-    other_Remark, effect_Start_Time, effect_End_Time, effect_Status, plan_Supv_Date, 
-    supv_Obj_Type, supv_Obj_Name, obj_Voltage_Level, substation_Name, substation_Voltage_Level, 
-    obj_Type, obj_Type_Name, obj_Capacity, report_Issue_Time, problem_Oc_Time, delete_Flag, 
-    plan_Status, delete_Time, effect_User_Id, effect_User_Name, is_upload_head, create_time, 
-    create_by, update_by, update_time
-  </sql>
+
 </mapper>
\ No newline at end of file
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/plan/mapping/SupervisionProblemPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/plan/mapping/SupervisionProblemPOMapper.xml
index d991ec853..7affe87d3 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/plan/mapping/SupervisionProblemPOMapper.xml
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/plan/mapping/SupervisionProblemPOMapper.xml
@@ -1,41 +1,5 @@
 <?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.supervision.mapper.plan.SupervisionProblemPOMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.plan.SupervisionProblemPO">
-    <!--@mbg.generated-->
-    <!--@Table supervision_problem-->
-    <id column="problem_Id" jdbcType="CHAR" property="problemId" />
-    <result column="plan_id" jdbcType="CHAR" property="planId" />
-    <result column="duty_Org_Id" jdbcType="CHAR" property="dutyOrgId" />
-    <result column="monitor_Type" jdbcType="CHAR" property="monitorType" />
-    <result column="rectification_Time" jdbcType="TIMESTAMP" property="rectificationTime" />
-    <result column="plan_Rectification_Time" jdbcType="TIMESTAMP" property="planRectificationTime" />
-    <result column="if_Release_Warning" jdbcType="BIT" property="ifReleaseWarning" />
-    <result column="problem_Desc" jdbcType="VARCHAR" property="problemDesc" />
-    <result column="simple_Problem_Desc" jdbcType="VARCHAR" property="simpleProblemDesc" />
-    <result column="supv_Standard_Sort" jdbcType="VARCHAR" property="supvStandardSort" />
-    <result column="supv_Standard" jdbcType="VARCHAR" property="supvStandard" />
-    <result column="supv_Resouce" jdbcType="VARCHAR" property="supvResouce" />
-    <result column="problem_Level" jdbcType="VARCHAR" property="problemLevel" />
-    <result column="problem_Level_Reason" jdbcType="VARCHAR" property="problemLevelReason" />
-    <result column="problem_Type" jdbcType="VARCHAR" property="problemType" />
-    <result column="rectification_Programme" jdbcType="VARCHAR" property="rectificationProgramme" />
-    <result column="rectification_Measure" jdbcType="VARCHAR" property="rectificationMeasure" />
-    <result column="rectification_Status" jdbcType="VARCHAR" property="rectificationStatus" />
-    <result column="is_Upload_Head" jdbcType="BIT" property="isUploadHead" />
-    <result column="discovery_Time" jdbcType="TIMESTAMP" property="discoveryTime" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
-    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
-    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    problem_Id, plan_id, duty_Org_Id, monitor_Type, rectification_Time, plan_Rectification_Time, 
-    if_Release_Warning, problem_Desc, simple_Problem_Desc, supv_Standard_Sort, supv_Standard, 
-    supv_Resouce, problem_Level, problem_Level_Reason, problem_Type, rectification_Programme, 
-    rectification_Measure, rectification_Status, is_Upload_Head, discovery_Time, remark, 
-    create_by, update_by, create_time, update_time
-  </sql>
+
 </mapper>
\ No newline at end of file
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/problem/mapping/SupervisionUserComplaintPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/problem/mapping/SupervisionUserComplaintPOMapper.xml
index f41e048b5..09ece9586 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/problem/mapping/SupervisionUserComplaintPOMapper.xml
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/problem/mapping/SupervisionUserComplaintPOMapper.xml
@@ -1,34 +1,6 @@
 <?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.supervision.mapper.problem.SupervisionUserComplaintPOMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.problem.SupervisionUserComplaintPO">
-    <!--@mbg.generated-->
-    <!--@Table supervision_user_complaint-->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="user_category" jdbcType="VARCHAR" property="userCategory" />
-    <result column="user_number" jdbcType="VARCHAR" property="userNumber" />
-    <result column="user_name" jdbcType="VARCHAR" property="userName" />
-    <result column="complaint_name" jdbcType="VARCHAR" property="complaintName" />
-    <result column="complaint_text" jdbcType="VARCHAR" property="complaintText" />
-    <result column="steady_Indicator" jdbcType="VARCHAR" property="steadyIndicator" />
-    <result column="transient_Indicators" jdbcType="VARCHAR" property="transientIndicators" />
-    <result column="anomaly_metrics" jdbcType="VARCHAR" property="anomalyMetrics" />
-    <result column="status" jdbcType="CHAR" property="status" />
-    <result column="monitor_number" jdbcType="VARCHAR" property="monitorNumber" />
-    <result column="monitor_name" jdbcType="VARCHAR" property="monitorName" />
-    <result column="initiate_warning_flag" jdbcType="CHAR" property="initiateWarningFlag" />
-    <result column="state" jdbcType="BIT" property="state" />
-    <result column="create_by" jdbcType="CHAR" property="createBy" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_by" jdbcType="CHAR" property="updateBy" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, user_category, user_number, user_name, complaint_name, complaint_text, steady_Indicator, 
-    transient_Indicators, anomaly_metrics, `status`, monitor_number, monitor_name, initiate_warning_flag, 
-    `state`, create_by, create_time, update_by, update_time
-  </sql>
 
   <select id="getPage" resultType="com.njcn.supervision.pojo.vo.problem.SupervisionUserComplaintVO">
     select
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/survey/mapping/SupervisionGeneralSurveyPlanDetailPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/survey/mapping/SupervisionGeneralSurveyPlanDetailPOMapper.xml
index 71233c556..2c4084b75 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/survey/mapping/SupervisionGeneralSurveyPlanDetailPOMapper.xml
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/survey/mapping/SupervisionGeneralSurveyPlanDetailPOMapper.xml
@@ -1,21 +1,5 @@
 <?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.supervision.mapper.survey.SupervisionGeneralSurveyPlanDetailPOMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.survey.SupervisionGeneralSurveyPlanDetailPO">
-    <!--@mbg.generated-->
-    <!--@Table supervision_general_survey_plan_detail-->
-    <id column="plan_no" jdbcType="VARCHAR" property="planNo" />
-    <id column="sub_id" jdbcType="VARCHAR" property="subId" />
-    <result column="sub_name" jdbcType="VARCHAR" property="subName" />
-    <result column="voltage_level" jdbcType="VARCHAR" property="voltageLevel" />
-    <result column="capacity" jdbcType="DECIMAL" property="capacity" />
-    <result column="measurement_point_id" jdbcType="VARCHAR" property="measurementPointId" />
-    <result column="is_problem" jdbcType="TINYINT" property="isProblem" />
-    <result column="is_survey" jdbcType="TINYINT" property="isSurvey" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    plan_no, sub_id, sub_name, voltage_level, capacity, measurement_point_id, is_problem,
-    is_survey
-  </sql>
+
 </mapper>
\ No newline at end of file
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/survey/mapping/SupervisionGeneralSurveyPlanPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/survey/mapping/SupervisionGeneralSurveyPlanPOMapper.xml
index 92c940373..a4fb3144d 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/survey/mapping/SupervisionGeneralSurveyPlanPOMapper.xml
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/survey/mapping/SupervisionGeneralSurveyPlanPOMapper.xml
@@ -1,36 +1,6 @@
 <?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.supervision.mapper.survey.SupervisionGeneralSurveyPlanPOMapper">
-    <resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.survey.SupervisionGeneralSurveyPlanPO">
-        <!--@mbg.generated-->
-        <!--@Table supervision_general_survey_plan-->
-        <id column="plan_no" jdbcType="VARCHAR" property="planNo"/>
-        <result column="org_no" jdbcType="VARCHAR" property="orgNo"/>
-        <result column="plan_name" jdbcType="VARCHAR" property="planName"/>
-        <result column="plan_create_time" jdbcType="DATE" property="planCreateTime"/>
-        <result column="plan_start_time" jdbcType="DATE" property="planStartTime"/>
-        <result column="plan_end_time" jdbcType="DATE" property="planEndTime"/>
-        <result column="plan_complate_time" jdbcType="DATE" property="planComplateTime"/>
-        <result column="leader" jdbcType="VARCHAR" property="leader"/>
-        <result column="status" jdbcType="TINYINT" property="status"/>
-        <result column="description" jdbcType="VARCHAR" property="description"/>
-        <result column="is_file_upload" jdbcType="TINYINT" property="isFileUpload"/>
-        <result column="file_count" jdbcType="INTEGER" property="fileCount"/>
-        <result column="file_path" jdbcType="VARCHAR" property="filePath"/>
-        <result column="process_instance_id" jdbcType="VARCHAR" property="processInstanceId"/>
-        <result column="upload_time" jdbcType="DATE" property="uploadTime"/>
-        <result column="Create_By" jdbcType="CHAR" property="createBy"/>
-        <result column="Create_Time" jdbcType="TIMESTAMP" property="createTime"/>
-        <result column="Update_By" jdbcType="CHAR" property="updateBy"/>
-        <result column="Update_Time" jdbcType="TIMESTAMP" property="updateTime"/>
-        <result column="State" jdbcType="BIT" property="state"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        <!--@mbg.generated-->
-        plan_no, org_no, plan_name, plan_create_time, plan_start_time, plan_end_time, plan_complate_time,
-        leader, `status`, description, is_file_upload, file_count, file_path, process_instance_id,
-        upload_time, Create_By, Create_Time, Update_By, Update_Time, `State`
-    </sql>
 
     <select id="page" resultType="com.njcn.supervision.pojo.vo.survey.SupervisionGeneralSurveyPlanVO">
         SELECT *
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml
index 446e9c1d3..8027fcba4 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml
@@ -1,35 +1,6 @@
 <?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.supervision.mapper.user.UserReportPOMapper">
-  <resultMap id="BaseResultMap" type="UserReportPO">
-    <!--@mbg.generated-->
-    <!--@Table user_report-->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="reporter" jdbcType="VARCHAR" property="reporter" />
-    <result column="report_date" jdbcType="DATE" property="reportDate" />
-    <result column="org_id" jdbcType="VARCHAR" property="orgId" />
-    <result column="expected_production_date" jdbcType="DATE" property="expectedProductionDate" />
-    <result column="user_type" jdbcType="VARCHAR" property="userType" />
-    <result column="city" jdbcType="VARCHAR" property="city" />
-    <result column="responsible_department" jdbcType="VARCHAR" property="responsibleDepartment" />
-    <result column="user_status" jdbcType="VARCHAR" property="userStatus" />
-    <result column="substation" jdbcType="VARCHAR" property="substation" />
-    <result column="voltage_level" jdbcType="VARCHAR" property="voltageLevel" />
-    <result column="project_name" jdbcType="VARCHAR" property="projectName" />
-    <result column="evaluation_dept" jdbcType="VARCHAR" property="evaluationDept" />
-    <result column="evaluation_conclusion" jdbcType="VARCHAR" property="evaluationConclusion" />
-    <result column="Create_By" jdbcType="CHAR" property="createBy" />
-    <result column="Create_Time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="Update_By" jdbcType="CHAR" property="updateBy" />
-    <result column="Update_Time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="State" jdbcType="BIT" property="state" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, reporter, report_date, org_id, expected_production_date, user_type, city, responsible_department,
-    user_status, substation, voltage_level, project_name, evaluation_dept, evaluation_conclusion,
-    Create_By, Create_Time, Update_By, Update_Time, `State`
-  </sql>
 
   <!--获取流程表单分页列表-->
   <select id="page" resultType="UserReportVO">
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportProjectPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportProjectPOMapper.xml
index 925117cd4..2a31f3712 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportProjectPOMapper.xml
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportProjectPOMapper.xml
@@ -1,29 +1,5 @@
 <?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.supervision.mapper.user.UserReportProjectPOMapper">
-  <resultMap id="BaseResultMap" type="UserReportProjectPO">
-    <!--@mbg.generated-->
-    <!--@Table user_report_project-->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="agreement_capacity" jdbcType="DOUBLE" property="agreementCapacity" />
-    <result column="nonlinear_device_type" jdbcType="VARCHAR" property="nonlinearDeviceType" />
-    <result column="need_governance" jdbcType="BIT" property="needGovernance" />
-    <result column="background_test_performed" jdbcType="BIT" property="backgroundTestPerformed" />
-    <result column="feasibility_report" jdbcType="VARCHAR" property="feasibilityReport" />
-    <result column="preliminary_design_description" jdbcType="VARCHAR" property="preliminaryDesignDescription" />
-    <result column="prediction_evaluation_report" jdbcType="VARCHAR" property="predictionEvaluationReport" />
-    <result column="prediction_evaluation_review_opinions" jdbcType="VARCHAR" property="predictionEvaluationReviewOpinions" />
-    <result column="additional_attachments" jdbcType="VARCHAR" property="additionalAttachments" />
-    <result column="Create_By" jdbcType="CHAR" property="createBy" />
-    <result column="Create_Time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="Update_By" jdbcType="CHAR" property="updateBy" />
-    <result column="Update_Time" jdbcType="TIMESTAMP" property="updateTime" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, agreement_capacity, nonlinear_device_type, need_governance, background_test_performed, 
-    feasibility_report, preliminary_design_description, prediction_evaluation_report, 
-    prediction_evaluation_review_opinions, additional_attachments, Create_By, Create_Time, 
-    Update_By, Update_Time
-  </sql>
+
 </mapper>
\ No newline at end of file
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportSensitivePOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportSensitivePOMapper.xml
index 00fcbde2c..ed04c5623 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportSensitivePOMapper.xml
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportSensitivePOMapper.xml
@@ -1,42 +1,5 @@
 <?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.supervision.mapper.user.UserReportSensitivePOMapper">
-  <resultMap id="BaseResultMap" type="UserReportSensitivePO">
-    <!--@mbg.generated-->
-    <!--@Table user_report_sensitive-->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="pcc_point" jdbcType="VARCHAR" property="pccPoint" />
-    <result column="industry" jdbcType="VARCHAR" property="industry" />
-    <result column="device_name" jdbcType="VARCHAR" property="deviceName" />
-    <result column="power_supply_count" jdbcType="INTEGER" property="powerSupplyCount" />
-    <result column="energy_quality_index" jdbcType="VARCHAR" property="energyQualityIndex" />
-    <result column="evaluation_type" jdbcType="VARCHAR" property="evaluationType" />
-    <result column="anti_interference_test" jdbcType="VARCHAR" property="antiInterferenceTest" />
-    <result column="evaluation_chek_dept" jdbcType="VARCHAR" property="evaluationChekDept" />
-    <result column="need_governance" jdbcType="BIT" property="needGovernance" />
-    <result column="background_test_performed" jdbcType="BIT" property="backgroundTestPerformed" />
-    <result column="substation_main_wiring_diagram" jdbcType="VARCHAR" property="substationMainWiringDiagram" />
-    <result column="sensitive_devices" jdbcType="VARCHAR" property="sensitiveDevices" />
-    <result column="anti_interference_report" jdbcType="VARCHAR" property="antiInterferenceReport" />
-    <result column="power_quality_report" jdbcType="VARCHAR" property="powerQualityReport" />
-    <result column="feasibility_report" jdbcType="VARCHAR" property="feasibilityReport" />
-    <result column="preliminary_design_description" jdbcType="VARCHAR" property="preliminaryDesignDescription" />
-    <result column="prediction_evaluation_report" jdbcType="VARCHAR" property="predictionEvaluationReport" />
-    <result column="prediction_evaluation_review_opinions" jdbcType="VARCHAR" property="predictionEvaluationReviewOpinions" />
-    <result column="additional_attachments" jdbcType="VARCHAR" property="additionalAttachments" />
-    <result column="state" jdbcType="BIT" property="state" />
-    <result column="Create_By" jdbcType="CHAR" property="createBy" />
-    <result column="Create_Time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="Update_By" jdbcType="CHAR" property="updateBy" />
-    <result column="Update_Time" jdbcType="TIMESTAMP" property="updateTime" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, pcc_point, industry, device_name, power_supply_count, energy_quality_index, evaluation_type, 
-    anti_interference_test, evaluation_chek_dept, need_governance, background_test_performed, 
-    substation_main_wiring_diagram, sensitive_devices, anti_interference_report, power_quality_report, 
-    feasibility_report, preliminary_design_description, prediction_evaluation_report, 
-    prediction_evaluation_review_opinions, additional_attachments, `state`, Create_By, 
-    Create_Time, Update_By, Update_Time
-  </sql>
+
 </mapper>
\ No newline at end of file
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportSubstationPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportSubstationPOMapper.xml
index 16e633fc4..f5aa3ecca 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportSubstationPOMapper.xml
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportSubstationPOMapper.xml
@@ -1,38 +1,5 @@
 <?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.supervision.mapper.user.UserReportSubstationPOMapper">
-  <resultMap id="BaseResultMap" type="UserReportSubstationPO">
-    <!--@mbg.generated-->
-    <!--@Table user_report_substation-->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="pcc_point" jdbcType="VARCHAR" property="pccPoint" />
-    <result column="base_short_circuit_capacity" jdbcType="DECIMAL" property="baseShortCircuitCapacity" />
-    <result column="min_short_circuit_capacity" jdbcType="DECIMAL" property="minShortCircuitCapacity" />
-    <result column="pcc_equipment_capacity" jdbcType="DECIMAL" property="pccEquipmentCapacity" />
-    <result column="user_agreement_capacity" jdbcType="DECIMAL" property="userAgreementCapacity" />
-    <result column="evaluation_type" jdbcType="VARCHAR" property="evaluationType" />
-    <result column="nonlinear_load_type" jdbcType="VARCHAR" property="nonlinearLoadType" />
-    <result column="evaluation_chek_dept" jdbcType="VARCHAR" property="evaluationChekDept" />
-    <result column="need_governance" jdbcType="BIT" property="needGovernance" />
-    <result column="background_test_performed" jdbcType="BIT" property="backgroundTestPerformed" />
-    <result column="substation_main_wiring_diagram" jdbcType="VARCHAR" property="substationMainWiringDiagram" />
-    <result column="feasibility_report" jdbcType="VARCHAR" property="feasibilityReport" />
-    <result column="preliminary_design_description" jdbcType="VARCHAR" property="preliminaryDesignDescription" />
-    <result column="prediction_evaluation_report" jdbcType="VARCHAR" property="predictionEvaluationReport" />
-    <result column="prediction_evaluation_review_opinions" jdbcType="VARCHAR" property="predictionEvaluationReviewOpinions" />
-    <result column="additional_attachments" jdbcType="VARCHAR" property="additionalAttachments" />
-    <result column="state" jdbcType="BIT" property="state" />
-    <result column="Create_By" jdbcType="CHAR" property="createBy" />
-    <result column="Create_Time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="Update_By" jdbcType="CHAR" property="updateBy" />
-    <result column="Update_Time" jdbcType="TIMESTAMP" property="updateTime" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, pcc_point, base_short_circuit_capacity, min_short_circuit_capacity, pcc_equipment_capacity, 
-    user_agreement_capacity, evaluation_type, nonlinear_load_type, evaluation_chek_dept, 
-    need_governance, background_test_performed, substation_main_wiring_diagram, feasibility_report, 
-    preliminary_design_description, prediction_evaluation_report, prediction_evaluation_review_opinions, 
-    additional_attachments, `state`, Create_By, Create_Time, Update_By, Update_Time
-  </sql>
+
 </mapper>
\ No newline at end of file
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/databank/impl/LibAlgorithmServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/databank/impl/LibAlgorithmServiceImpl.java
index 05573c232..fa39010fc 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/databank/impl/LibAlgorithmServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/databank/impl/LibAlgorithmServiceImpl.java
@@ -3,6 +3,7 @@ package com.njcn.supervision.service.databank.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.constant.BizParamConstant;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.supervision.enums.SupervisionResponseEnum;
@@ -90,13 +91,11 @@ public class LibAlgorithmServiceImpl extends ServiceImpl<LibAlgorithmMapper, Lib
 
     @Override
     public List<LibAlgorithm> queryAll() {
-
         List<LibAlgorithm> libAlgorithmList = this.lambdaQuery().eq(LibAlgorithm::getStatus,1).list();
-        List<LibAlgorithm> tree = libAlgorithmList.stream().filter(item -> item.getPid().equals("0")).peek(item -> {
+        return libAlgorithmList.stream().filter(item -> BizParamConstant.PARENT_ID.equals(item.getPid())).peek(item -> {
             item.setLevel(1);
             item.setChildren(getChildren(item, libAlgorithmList));
         }).collect(Collectors.toList());
-        return tree;
     }
     private List<LibAlgorithm> getChildren(LibAlgorithm libAlgorithm, List<LibAlgorithm> all) {
         return all.stream().filter(item -> item.getPid().equals(libAlgorithm.getId())).peek(item -> {
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/databank/impl/LibCaseServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/databank/impl/LibCaseServiceImpl.java
index af151c8af..492647116 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/databank/impl/LibCaseServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/databank/impl/LibCaseServiceImpl.java
@@ -76,14 +76,12 @@ public class LibCaseServiceImpl extends ServiceImpl<LibCaseMapper, LibCase> impl
     @Override
     public Page<LibCase> pageQuery(LibCaseParam.LibCaseParamQuery param) {
         QueryWrapper<LibCase> queryWrapper = new QueryWrapper<>();
-
         queryWrapper.eq("lib_case.status",1);
         //添加上时间范围
         queryWrapper.between("lib_case.Create_Time",
                 DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())),
                 DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())));
         queryWrapper.orderByDesc("lib_case.Update_Time");
-        Page<LibCase> page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), queryWrapper);
-        return page;
+        return this.baseMapper.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), queryWrapper);
     }
 }
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/databank/impl/LibStandardServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/databank/impl/LibStandardServiceImpl.java
index 86eebdc58..9a182e294 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/databank/impl/LibStandardServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/databank/impl/LibStandardServiceImpl.java
@@ -3,6 +3,7 @@ package com.njcn.supervision.service.databank.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.constant.BizParamConstant;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.supervision.enums.SupervisionResponseEnum;
@@ -87,10 +88,9 @@ public class LibStandardServiceImpl extends ServiceImpl<LibStandardMapper, LibSt
     @Override
     public List<LibStandard> queryAll() {
         List<LibStandard> libStandardList = this.lambdaQuery().eq(LibStandard::getStatus,1).list();
-        List<LibStandard> tree = libStandardList.stream().filter(item -> item.getPid().equals("0")).peek(item -> {
+        return libStandardList.stream().filter(item -> BizParamConstant.PARENT_ID.equals(item.getPid())).peek(item -> {
             item.setChildren(getChildren(item, libStandardList));
         }).collect(Collectors.toList());
-        return tree;
     }
 
     private List<LibStandard> getChildren(LibStandard libStandard, List<LibStandard> all) {
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/databank/impl/LibTemplateServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/databank/impl/LibTemplateServiceImpl.java
index b56607276..eb8942309 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/databank/impl/LibTemplateServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/databank/impl/LibTemplateServiceImpl.java
@@ -81,7 +81,6 @@ public class LibTemplateServiceImpl extends ServiceImpl<LibTemplateMapper, LibTe
                 DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())),
                 DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())));
         queryWrapper.orderByDesc("lib_template.Update_Time");
-        Page<LibTemplate> page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), queryWrapper);
-        return page;
+        return this.baseMapper.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), queryWrapper);
     }
 }
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/CheckDeviceServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/CheckDeviceServiceImpl.java
index 88e5b9afb..a41e74799 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/CheckDeviceServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/CheckDeviceServiceImpl.java
@@ -19,7 +19,6 @@ import com.njcn.bpm.pojo.dto.BpmInstanceInfo;
 import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO;
 import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
 import com.njcn.bpm.pojo.vo.TodoVO;
-import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.db.constant.DbConstant;
 import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
 import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
@@ -44,7 +43,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
@@ -155,11 +153,11 @@ public class CheckDeviceServiceImpl extends MppServiceImpl<CheckDeviceMapper, Ch
         checkDevice.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
         checkDevice.setNowCheckTime(LocalDate.parse(param.getNowCheckTime(), DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN)));
         // 发起 BPM 流程
-        Map<String, Object> processInstanceVariables = new HashMap<>();
+        Map<String, Object> processInstanceVariables = new HashMap<>(16);
         BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
         bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.TIMING_CHECK_DEVICE.getKey());
         bpmProcessInstanceCreateReqDTO.setBusinessKey(checkDevice.getId());
-        bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>());
+        bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>(16));
         bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables);
         String processInstanceId = bpmProcessFeignClient.createProcessInstance(RequestUtil.getUserIndex(), bpmProcessInstanceCreateReqDTO).getData();
         // 将工作流的编号，更新到流程单中
@@ -182,11 +180,11 @@ public class CheckDeviceServiceImpl extends MppServiceImpl<CheckDeviceMapper, Ch
         checkDevice.setDescription(param.getDescription());
         checkDevice.setNowCheckTime(LocalDate.parse(param.getNowCheckTime(), DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN)));
         // 发起 BPM 流程
-        Map<String, Object> processInstanceVariables = new HashMap<>();
+        Map<String, Object> processInstanceVariables = new HashMap<>(16);
         BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
         bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.TIMING_CHECK_DEVICE.getKey());
         bpmProcessInstanceCreateReqDTO.setBusinessKey(checkDevice.getId());
-        bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>());
+        bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>(16));
         bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables);
         String processInstanceId = bpmProcessFeignClient.createProcessInstance(checkDevice.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData();
         // 将工作流的编号，更新到流程单中
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java
index 6d4084067..82703f999 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java
@@ -66,6 +66,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static java.util.regex.Pattern.*;
+
 /**
  * <p>
  * 监测点每日稳态指标超标天数统计表 服务实现类
@@ -118,9 +120,9 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
         for (RStatLimitTargetDPO item : limitTarget) {
             List<LineWarning> lineWarnings = lineWarningMap.get(item.getLineId());
             DeptLine deptLine = deptLineFeignClient.getLineByLineIds(item.getLineId()).getData();
-            String deptId = Objects.isNull(deptLine)?null:deptLine.getId();
+            String deptId = Objects.isNull(deptLine) ? null : deptLine.getId();
             if (CollUtil.isEmpty(lineWarnings)) {
-                addList.addAll(getTargetInfo(item.getLineId(),targetMap,limitMap,deptId));
+                addList.addAll(getTargetInfo(item.getLineId(), targetMap, limitMap, deptId));
             } else {
                 //1.查询各指标越限时间不超过10天，超标则每天递增，不超标则清零
                 //2.越限时间超过10天未超过15天，超标则每天递增，不超标保存当前记录，新增一条记录
@@ -128,21 +130,21 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
                 //4.发过告警单，则重新生成一条数据
                 RStatLimitTargetDPO dpo = limitMap.get(item.getLineId());
                 //频率偏差
-                targetInfo(lineWarnings,targetMap,DicDataEnum.PLPC_ENUM.getCode(),dpo,item.getLineId(),addList,updateList,deptId);
+                targetInfo(lineWarnings, targetMap, DicDataEnum.PLPC_ENUM.getCode(), dpo, item.getLineId(), addList, updateList, deptId);
                 //电压偏差
-                targetInfo(lineWarnings,targetMap,DicDataEnum.DYPC_ENUM.getCode(),dpo,item.getLineId(),addList,updateList,deptId);
+                targetInfo(lineWarnings, targetMap, DicDataEnum.DYPC_ENUM.getCode(), dpo, item.getLineId(), addList, updateList, deptId);
                 //长时闪变
-                targetInfo(lineWarnings,targetMap,DicDataEnum.CSSB_ENUM.getCode(),dpo,item.getLineId(),addList,updateList,deptId);
+                targetInfo(lineWarnings, targetMap, DicDataEnum.CSSB_ENUM.getCode(), dpo, item.getLineId(), addList, updateList, deptId);
                 //谐波电压
-                targetInfo(lineWarnings,targetMap,DicDataEnum.XBDY_ENUM.getCode(),dpo,item.getLineId(),addList,updateList,deptId);
+                targetInfo(lineWarnings, targetMap, DicDataEnum.XBDY_ENUM.getCode(), dpo, item.getLineId(), addList, updateList, deptId);
                 //谐波电流
-                targetInfo(lineWarnings,targetMap,DicDataEnum.XBDL_ENUM.getCode(),dpo,item.getLineId(),addList,updateList,deptId);
+                targetInfo(lineWarnings, targetMap, DicDataEnum.XBDL_ENUM.getCode(), dpo, item.getLineId(), addList, updateList, deptId);
                 //间谐波电压
-                targetInfo(lineWarnings,targetMap,DicDataEnum.JXBDY_ENUM.getCode(),dpo,item.getLineId(),addList,updateList,deptId);
+                targetInfo(lineWarnings, targetMap, DicDataEnum.JXBDY_ENUM.getCode(), dpo, item.getLineId(), addList, updateList, deptId);
                 //负序电压不平衡度
-                targetInfo(lineWarnings,targetMap,DicDataEnum.SXDYBPHD_ENUM.getCode(),dpo,item.getLineId(),addList,updateList,deptId);
+                targetInfo(lineWarnings, targetMap, DicDataEnum.SXDYBPHD_ENUM.getCode(), dpo, item.getLineId(), addList, updateList, deptId);
                 //负序电流
-                targetInfo(lineWarnings,targetMap,DicDataEnum.FXDL_ENUM.getCode(),dpo,item.getLineId(),addList,updateList,deptId);
+                targetInfo(lineWarnings, targetMap, DicDataEnum.FXDL_ENUM.getCode(), dpo, item.getLineId(), addList, updateList, deptId);
             }
         }
         this.saveBatch(addList);
@@ -160,46 +162,46 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
         List<DeptLine> deptLines = deptLineFeignClient.getAllData().getData();
         Map<String, List<DeptLine>> deptLineMap = deptLines.stream().collect(Collectors.groupingBy(DeptLine::getLineId));
         //获取监测点按时间统计越限天数
-        LocalDate firstDayOfMonth = Objects.isNull(startTime)?LocalDate.now().minusDays(1).with(TemporalAdjusters.firstDayOfMonth()):LocalDate.parse(startTime);
-        String date = Objects.isNull(startTime)?DateUtil.format(firstDayOfMonth.atStartOfDay(), DatePattern.NORM_DATE_PATTERN):startTime;
-        String endDate = Objects.isNull(endTime)?DateUtil.format(LocalDateTime.now().minusDays(1), DatePattern.NORM_DATE_PATTERN):endTime;
-        RStatLimitQueryParam rStatLimitQueryParam = new RStatLimitQueryParam(null,date,endDate);
+        LocalDate firstDayOfMonth = Objects.isNull(startTime) ? LocalDate.now().minusDays(1).with(TemporalAdjusters.firstDayOfMonth()) : LocalDate.parse(startTime);
+        String date = Objects.isNull(startTime) ? DateUtil.format(firstDayOfMonth.atStartOfDay(), DatePattern.NORM_DATE_PATTERN) : startTime;
+        String endDate = Objects.isNull(endTime) ? DateUtil.format(LocalDateTime.now().minusDays(1), DatePattern.NORM_DATE_PATTERN) : endTime;
+        RStatLimitQueryParam rStatLimitQueryParam = new RStatLimitQueryParam(null, date, endDate);
         List<RStatLimitTargetVO> limitTarget = limitRateDClient.monitorOverLimitDays(rStatLimitQueryParam).getData();
         //按各指标统计越限天数
         if (CollUtil.isNotEmpty(limitTarget)) {
-            limitTarget.forEach(item->{
-                String deptId = Objects.isNull(deptLineMap.get(item.getLineId()))?null:deptLineMap.get(item.getLineId()).get(0).getId();
+            limitTarget.forEach(item -> {
+                String deptId = Objects.isNull(deptLineMap.get(item.getLineId())) ? null : deptLineMap.get(item.getLineId()).get(0).getId();
                 //频率偏差
-                LineWarning l1 = overData(firstDayOfMonth,item.getLineId(),deptId,targetMap.get(DicDataEnum.FREQUENCY_DEV.getCode()).getId(),item.getFreqDevOvertime());
+                LineWarning l1 = overData(firstDayOfMonth, item.getLineId(), deptId, targetMap.get(DicDataEnum.FREQUENCY_DEV.getCode()).getId(), item.getFreqDevOvertime());
                 //电压偏差
-                LineWarning l2 = overData(firstDayOfMonth,item.getLineId(),deptId,targetMap.get(DicDataEnum.VOLTAGE_DEV.getCode()).getId(),item.getVoltageDevOvertime());
+                LineWarning l2 = overData(firstDayOfMonth, item.getLineId(), deptId, targetMap.get(DicDataEnum.VOLTAGE_DEV.getCode()).getId(), item.getVoltageDevOvertime());
                 //长时闪变
-                LineWarning l3 = overData(firstDayOfMonth,item.getLineId(),deptId,targetMap.get(DicDataEnum.FLICKER.getCode()).getId(),item.getFlickerOvertime());
+                LineWarning l3 = overData(firstDayOfMonth, item.getLineId(), deptId, targetMap.get(DicDataEnum.FLICKER.getCode()).getId(), item.getFlickerOvertime());
                 //谐波电压
-                LineWarning l4 = overData(firstDayOfMonth,item.getLineId(),deptId,targetMap.get(DicDataEnum.HARMONIC_VOLTAGE.getCode()).getId(),item.getUharmOvertime());
+                LineWarning l4 = overData(firstDayOfMonth, item.getLineId(), deptId, targetMap.get(DicDataEnum.HARMONIC_VOLTAGE.getCode()).getId(), item.getUharmOvertime());
                 //谐波电流
-                LineWarning l5 = overData(firstDayOfMonth,item.getLineId(),deptId,targetMap.get(DicDataEnum.HARMONIC_CURRENT.getCode()).getId(),item.getIharmOvertime());
+                LineWarning l5 = overData(firstDayOfMonth, item.getLineId(), deptId, targetMap.get(DicDataEnum.HARMONIC_CURRENT.getCode()).getId(), item.getIharmOvertime());
                 //间谐波电压
-                LineWarning l6 = overData(firstDayOfMonth,item.getLineId(),deptId,targetMap.get(DicDataEnum.INTERHARMONIC_VOLTAGE.getCode()).getId(),item.getInuharmOvertime());
+                LineWarning l6 = overData(firstDayOfMonth, item.getLineId(), deptId, targetMap.get(DicDataEnum.INTERHARMONIC_VOLTAGE.getCode()).getId(), item.getInuharmOvertime());
                 //负序电压不平衡度
-                LineWarning l7 = overData(firstDayOfMonth,item.getLineId(),deptId,targetMap.get(DicDataEnum.PHASE_VOLTAGE.getCode()).getId(),item.getUbalanceOvertime());
+                LineWarning l7 = overData(firstDayOfMonth, item.getLineId(), deptId, targetMap.get(DicDataEnum.PHASE_VOLTAGE.getCode()).getId(), item.getUbalanceOvertime());
                 //负序电流
-                LineWarning l8 = overData(firstDayOfMonth,item.getLineId(),deptId,targetMap.get(DicDataEnum.NEG_CURRENT.getCode()).getId(),item.getINegOvertime());
+                LineWarning l8 = overData(firstDayOfMonth, item.getLineId(), deptId, targetMap.get(DicDataEnum.NEG_CURRENT.getCode()).getId(), item.getINegOvertime());
                 //电压总谐波畸变率
-                LineWarning l9 = overData(firstDayOfMonth,item.getLineId(),deptId,targetMap.get(DicDataEnum.THD_V.getCode()).getId(),item.getUaberranceOvertime());
+                LineWarning l9 = overData(firstDayOfMonth, item.getLineId(), deptId, targetMap.get(DicDataEnum.THD_V.getCode()).getId(), item.getUaberranceOvertime());
                 //总稳态指标
-                LineWarning l10 = overData(firstDayOfMonth,item.getLineId(),deptId,targetMap.get(DicDataEnum.TOTAL_INDICATOR.getCode()).getId(),item.getAllOvertime());
-                result.addAll(Arrays.asList(l1,l2,l3,l4,l5,l6,l7,l8,l9,l10));
+                LineWarning l10 = overData(firstDayOfMonth, item.getLineId(), deptId, targetMap.get(DicDataEnum.TOTAL_INDICATOR.getCode()).getId(), item.getAllOvertime());
+                result.addAll(Arrays.asList(l1, l2, l3, l4, l5, l6, l7, l8, l9, l10));
             });
         }
         //将装置无数据的统计入库 按运维要求，判断装置的最新数据不是当天，则认为装置无数据
         List<LineDetailVO.noDataLineInfo> noDataLineInfo = lineFeignClient.getNoDataLine().getData();
         if (CollUtil.isNotEmpty(noDataLineInfo)) {
             LambdaQueryWrapper<LineWarning> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-            lambdaQueryWrapper.eq(LineWarning::getTargetType,"0").eq(LineWarning::getAlarmTime,date);
+            lambdaQueryWrapper.eq(LineWarning::getTargetType, "0").eq(LineWarning::getAlarmTime, date);
             this.baseMapper.delete(lambdaQueryWrapper);
-            noDataLineInfo.forEach(item->{
-                String deptId = Objects.isNull(deptLineMap.get(item.getLineId()))?null:deptLineMap.get(item.getLineId()).get(0).getId();
+            noDataLineInfo.forEach(item -> {
+                String deptId = Objects.isNull(deptLineMap.get(item.getLineId())) ? null : deptLineMap.get(item.getLineId()).get(0).getId();
                 LineWarning lineWarning = new LineWarning();
                 lineWarning.setAlarmTime(firstDayOfMonth);
                 lineWarning.setDeptId(deptId);
@@ -222,17 +224,17 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
                 .distinct()
                 .collect(Collectors.toList());
         QueryWrapper<LineWarning> queryWrapper = new QueryWrapper<>();
-        queryWrapper.between("A.alarm_time", param.getSearchBeginTime(),param.getSearchEndTime());
+        queryWrapper.between("A.alarm_time", param.getSearchBeginTime(), param.getSearchEndTime());
         //监测点id
         if (CollUtil.isNotEmpty(lineList)) {
-            queryWrapper.in("A.line_id",lineList);
+            queryWrapper.in("A.line_id", lineList);
         }
         //监测点类型
         if (StringUtils.isNotBlank(param.getLineType())) {
-            queryWrapper.eq("B.Power_Flag",Integer.parseInt(param.getLineType()));
+            queryWrapper.eq("B.Power_Flag", Integer.parseInt(param.getLineType()));
         }
         //查询无数据的监测点
-        if (Objects.equals(param.getDataType(),0)){
+        if (Objects.equals(param.getDataType(), 0)) {
             queryWrapper.eq("A.target_type", "0");
         }
         //查询指标超标的监测点
@@ -242,7 +244,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
                 queryWrapper.in("A.target_type", param.getTargetList());
             }
         }
-        queryWrapper.orderBy(true, true, "D.Name","p4.Name","p3.Name");
+        queryWrapper.orderBy(true, true, "D.Name", "p4.Name", "p3.Name");
         return this.baseMapper.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), queryWrapper);
     }
 
@@ -261,78 +263,78 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
         param.setDeptName(deptName);
         String inputUrl = "file/warningReport.docx";
         String alarmType = param.getType() == 1 ? "预" : "告";
-        String fileName = "电能["+alarmType+"]"+param.getYear()+"年"+param.getNumber()+"号-"+param.getDeptName()+"地市 电能质量技术监督"+alarmType+"警单.docx";
+        String fileName = "电能[" + alarmType + "]" + param.getYear() + "年" + param.getNumber() + "号-" + param.getDeptName() + "地市 电能质量技术监督" + alarmType + "警单.docx";
         //获取无数据监测点集合
-        List<ReportLineInfoVo> list1 = getReportLineInfo(true,param.getIdList(),null,param.getSearchBeginTime(),param.getSearchEndTime(),param.getDeptId(),allLineWarnings);
+        List<ReportLineInfoVo> list1 = getReportLineInfo(true, param.getIdList(), null, param.getSearchBeginTime(), param.getSearchEndTime(), param.getDeptId(), allLineWarnings);
         //获取谐波电压超标监测点集合
         String vCode = dicDataFeignClient.getDicDataByCode(DicDataEnum.HARMONIC_VOLTAGE.getCode()).getData().getId();
-        List<ReportLineInfoVo> list2 = getReportLineInfo(false,param.getIdList(),vCode,param.getSearchBeginTime(),param.getSearchEndTime(),null,allLineWarnings);
+        List<ReportLineInfoVo> list2 = getReportLineInfo(false, param.getIdList(), vCode, param.getSearchBeginTime(), param.getSearchEndTime(), null, allLineWarnings);
         //获取谐波电流超标监测点集合
         String iCode = dicDataFeignClient.getDicDataByCode(DicDataEnum.HARMONIC_CURRENT.getCode()).getData().getId();
-        List<ReportLineInfoVo> list3 = getReportLineInfo(false,param.getIdList(),iCode,param.getSearchBeginTime(),param.getSearchEndTime(),null,allLineWarnings);
+        List<ReportLineInfoVo> list3 = getReportLineInfo(false, param.getIdList(), iCode, param.getSearchBeginTime(), param.getSearchEndTime(), null, allLineWarnings);
         try {
-            Map<String, Object> dataMap = new HashMap<String, Object>();
+            Map<String, Object> dataMap = new HashMap<>(16);
             dataMap.put("${year}", param.getYear());
             dataMap.put("${number}", param.getNumber());
             dataMap.put("${deptName}", param.getDeptName());
             dataMap.put("${startTime}", new SimpleDateFormat(DatePattern.CHINESE_DATE_PATTERN).format(new SimpleDateFormat(DatePattern.NORM_DATE_PATTERN).parse(param.getSearchBeginTime())));
             dataMap.put("${endTime}", new SimpleDateFormat(DatePattern.CHINESE_DATE_PATTERN).format(new SimpleDateFormat(DatePattern.NORM_DATE_PATTERN).parse(param.getSearchEndTime())));
-            dataMap.put("${harmonicV}", CollUtil.isEmpty(list2)?"0":String.valueOf(list2.size()));
-            dataMap.put("${harmonicI}", CollUtil.isEmpty(list3)?"0":String.valueOf(list3.size()));
+            dataMap.put("${harmonicV}", CollUtil.isEmpty(list2) ? "0" : String.valueOf(list2.size()));
+            dataMap.put("${harmonicI}", CollUtil.isEmpty(list3) ? "0" : String.valueOf(list3.size()));
             dataMap.put("${alarmDay}", String.valueOf(param.getAlarmThreshold()));
             dataMap.put("${title}", alarmType + "警");
             dataMap.put("${alarmType}", alarmType);
             dataMap.put("${gdName}", getGdName(param.getDeptName()));
             dataMap.put("${time}", LocalDate.now().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN)));
 
-            List<String[]> dataList1 = new ArrayList<String[]>(),dataList2 = new ArrayList<String[]>(),dataList3 = new ArrayList<String[]>();
+            List<String[]> dataList1 = new ArrayList<>(), dataList2 = new ArrayList<>(), dataList3 = new ArrayList<>();
             if (CollUtil.isNotEmpty(list1)) {
-                list1.forEach(item->{
-                    if (Objects.isNull(param.getLineType()) || Objects.equals("",param.getLineType())) {
-                        dataList1.add(new String[]{deptName,item.getLineVoltage(),item.getLineName(),item.getSubName(),item.getObjName(),item.getSubVName(),item.getUpdateTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)),item.getIp()});
+                list1.forEach(item -> {
+                    if (Objects.isNull(param.getLineType()) || Objects.equals("", param.getLineType())) {
+                        dataList1.add(new String[]{deptName, item.getLineVoltage(), item.getLineName(), item.getSubName(), item.getObjName(), item.getSubVName(), item.getUpdateTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)), item.getIp()});
                     } else if (Integer.parseInt(param.getLineType()) == item.getPowerFlag()) {
-                        dataList1.add(new String[]{deptName,item.getLineVoltage(),item.getLineName(),item.getSubName(),item.getObjName(),item.getSubVName(),item.getUpdateTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)),item.getIp()});
+                        dataList1.add(new String[]{deptName, item.getLineVoltage(), item.getLineName(), item.getSubName(), item.getObjName(), item.getSubVName(), item.getUpdateTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)), item.getIp()});
                     }
                 });
-                dataMap.put("${noData}", CollUtil.isEmpty(dataList1)?"0":String.valueOf(dataList1.size()));
+                dataMap.put("${noData}", CollUtil.isEmpty(dataList1) ? "0" : String.valueOf(dataList1.size()));
             }
             if (CollUtil.isNotEmpty(list2)) {
-                list2.forEach(item->{
-                    dataList2.add(new String[]{deptName,item.getLineName(),item.getSubName(),item.getObjName(),String.valueOf(item.getOverDays())});
+                list2.forEach(item -> {
+                    dataList2.add(new String[]{deptName, item.getLineName(), item.getSubName(), item.getObjName(), String.valueOf(item.getOverDays())});
                 });
             }
             if (CollUtil.isNotEmpty(list3)) {
-                list3.forEach(item->{
-                    dataList3.add(new String[]{deptName,item.getLineName(),item.getSubName(),item.getObjName(),String.valueOf(item.getOverDays()),String.valueOf(item.getShortCapacity()),String.valueOf(item.getDevCapacity()),String.valueOf(item.getDealCapacity())});
+                list3.forEach(item -> {
+                    dataList3.add(new String[]{deptName, item.getLineName(), item.getSubName(), item.getObjName(), String.valueOf(item.getOverDays()), String.valueOf(item.getShortCapacity()), String.valueOf(item.getDevCapacity()), String.valueOf(item.getDealCapacity())});
                 });
             }
 
-            List<List<String[]>> tableList = Arrays.asList(dataList1,dataList2,dataList3);
-            InputStream inputStream = wordUtil2.getReportFile(inputUrl,dataMap,tableList);
+            List<List<String[]>> tableList = Arrays.asList(dataList1, dataList2, dataList3);
+            InputStream inputStream = wordUtil2.getReportFile(inputUrl, dataMap, tableList);
             //上传文件服务器
             String path = fileStorageUtil.uploadStreamSpecifyName(inputStream, OssPath.ONLINE_REPORT, fileName);
             //1.生成预告警单数据
             String leafletId = warningLeafletService.createLeaflet(
                     ProblemTypeEnum.ONLINE.getName()
-                    ,param.getDeptId()
-                    ,IdWorker.get32UUID()
-                    ,null
-                    ,ProblemTypeEnum.ONLINE.getCode()
-                    ,param.getType()
-                    ,param.getIssueDetail()
-                    ,param.getReformAdvice()
-                    ,path);
+                    , param.getDeptId()
+                    , IdWorker.get32UUID()
+                    , null
+                    , ProblemTypeEnum.ONLINE.getCode()
+                    , param.getType()
+                    , param.getIssueDetail()
+                    , param.getReformAdvice()
+                    , path);
             //2.将选择的数据状态改成预警或者告警 && 将选择的数据添加预告警单id
             if (CollUtil.isNotEmpty(allLineWarnings)) {
                 LambdaQueryWrapper<LineWarning> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-                lambdaQueryWrapper.in(LineWarning::getId,param.getIdList())
-                        .notIn(LineWarning::getTargetType,Arrays.asList(vCode,iCode))
-                        .between(LineWarning::getAlarmTime,param.getSearchBeginTime(),param.getSearchEndTime());
+                lambdaQueryWrapper.in(LineWarning::getId, param.getIdList())
+                        .notIn(LineWarning::getTargetType, Arrays.asList(vCode, iCode))
+                        .between(LineWarning::getAlarmTime, param.getSearchBeginTime(), param.getSearchEndTime());
                 allLineWarnings.addAll(this.baseMapper.selectList(lambdaQueryWrapper));
-                allLineWarnings.forEach(item->{
+                allLineWarnings.forEach(item -> {
                     item.setStep(param.getType());
                     item.setInitiateWarningFlag(1);
-                    if (!Objects.equals(item.getTargetType(),"0")) {
+                    if (!Objects.equals(item.getTargetType(), "0")) {
                         item.setAlertThreshold(param.getAlertThreshold());
                         item.setAlarmThreshold(param.getAlarmThreshold());
                     }
@@ -348,13 +350,13 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
     @Override
     public List<LineLimitDetailVo> getOverLimitDetail(OnlineParam.DetailParam param) {
         List<LineLimitDetailVo> result = new ArrayList<>();
-        String targetCode =  dicDataFeignClient.getDicDataById(param.getTargetId()).getData().getCode();
+        String targetCode = dicDataFeignClient.getDicDataById(param.getTargetId()).getData().getCode();
         //获取监测点统计间隔
         Integer timeInterval = commTerminalGeneralClient.getMonitorDetail(param.getLineId()).getData().getInterval();
         //获取限值
         Overlimit overlimit = commTerminalGeneralClient.getOverLimitData(param.getLineId()).getData();
         //处理数据
-        List<LineLimitDetailVo> data = chanelTarget(param,overlimit,timeInterval,targetCode);
+        List<LineLimitDetailVo> data = chanelTarget(param, overlimit, timeInterval, targetCode);
         if (CollUtil.isNotEmpty(data)) {
             result = data.stream().sorted(Comparator.comparing(LineLimitDetailVo::getTime)).collect(Collectors.toList());
         }
@@ -363,26 +365,26 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
 
     //指标数据处理
     public List<LineLimitDetailVo> chanelTarget(OnlineParam.DetailParam param, Overlimit overlimit, Integer timeInterval, String targetCode) {
-        List<LineLimitDetailVo> result = new ArrayList<>(),finalList = new ArrayList<>();
+        List<LineLimitDetailVo> result = new ArrayList<>(), finalList = new ArrayList<>();
         //频率偏差
-        if (Objects.equals(targetCode,DicDataEnum.FREQUENCY_DEV.getCode()) || Objects.equals(targetCode,DicDataEnum.TOTAL_INDICATOR.getCode())) {
-            List<RStatLimitRateDPO> list = limitRateDClient.getOverData(param.getLineId(),param.getSearchBeginTime(),param.getSearchEndTime(),1).getData();
+        if (Objects.equals(targetCode, DicDataEnum.FREQUENCY_DEV.getCode()) || Objects.equals(targetCode, DicDataEnum.TOTAL_INDICATOR.getCode())) {
+            List<RStatLimitRateDPO> list = limitRateDClient.getOverData(param.getLineId(), param.getSearchBeginTime(), param.getSearchEndTime(), 1).getData();
             if (CollUtil.isNotEmpty(list)) {
-                list.forEach(item->{
+                list.forEach(item -> {
                     String time = item.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN));
                     double maxData = getFreqDev(param.getLineId()
                             , time + " 00:00:00"
                             , time + " 23:59:59"
                     ).get(0).getFreqDev();
-                    channelEachData(item,maxData>0?overlimit.getFreqDev():-overlimit.getFreqDev(),"getFreqDev",result,DicDataEnum.FREQUENCY_DEV.getName(),timeInterval,maxData);
+                    channelEachData(item, maxData > 0 ? overlimit.getFreqDev() : -overlimit.getFreqDev(), "getFreqDev", result, DicDataEnum.FREQUENCY_DEV.getName(), timeInterval, maxData);
                 });
             }
         }
         //电压偏差
-        if (Objects.equals(targetCode,DicDataEnum.VOLTAGE_DEV.getCode()) || Objects.equals(targetCode,DicDataEnum.TOTAL_INDICATOR.getCode())) {
-            List<RStatLimitRateDPO> list = limitRateDClient.getOverData(param.getLineId(),param.getSearchBeginTime(),param.getSearchEndTime(),2).getData();
+        if (Objects.equals(targetCode, DicDataEnum.VOLTAGE_DEV.getCode()) || Objects.equals(targetCode, DicDataEnum.TOTAL_INDICATOR.getCode())) {
+            List<RStatLimitRateDPO> list = limitRateDClient.getOverData(param.getLineId(), param.getSearchBeginTime(), param.getSearchEndTime(), 2).getData();
             if (CollUtil.isNotEmpty(list)) {
-                list.forEach(item->{
+                list.forEach(item -> {
                     Float overLimit;
                     Double maxData;
                     String time = item.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN));
@@ -391,132 +393,132 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
                             , time + " 23:59:59"
                     );
                     List<Double> voltage = voltageList.stream().map(DataV::getVuDev).collect(Collectors.toList());
-                    if (Math.abs(voltage.get(0)) >= Math.abs(voltage.get(1))){
+                    if (Math.abs(voltage.get(0)) >= Math.abs(voltage.get(1))) {
                         overLimit = overlimit.getUvoltageDev();
                         maxData = voltage.get(0);
                     } else {
                         overLimit = overlimit.getVoltageDev();
                         maxData = voltage.get(1);
                     }
-                    channelEachData(item,overLimit,"getVoltageDev",result,DicDataEnum.VOLTAGE_DEV.getName(),timeInterval,maxData);
+                    channelEachData(item, overLimit, "getVoltageDev", result, DicDataEnum.VOLTAGE_DEV.getName(), timeInterval, maxData);
                 });
             }
         }
         //长时闪变
-        if (Objects.equals(targetCode,DicDataEnum.FLICKER.getCode()) || Objects.equals(targetCode,DicDataEnum.TOTAL_INDICATOR.getCode())) {
-            List<RStatLimitRateDPO> list = limitRateDClient.getOverData(param.getLineId(),param.getSearchBeginTime(),param.getSearchEndTime(),3).getData();
+        if (Objects.equals(targetCode, DicDataEnum.FLICKER.getCode()) || Objects.equals(targetCode, DicDataEnum.TOTAL_INDICATOR.getCode())) {
+            List<RStatLimitRateDPO> list = limitRateDClient.getOverData(param.getLineId(), param.getSearchBeginTime(), param.getSearchEndTime(), 3).getData();
             if (CollUtil.isNotEmpty(list)) {
-                list.forEach(item->{
+                list.forEach(item -> {
                     String time = item.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN));
                     double maxData = getFlicker(param.getLineId()
                             , time + " 00:00:00"
                             , time + " 23:59:59"
                     ).get(0).getPlt();
-                    channelEachData(item,overlimit.getFlicker(),"getFlicker",result,DicDataEnum.FLICKER.getName(),timeInterval,maxData);
+                    channelEachData(item, overlimit.getFlicker(), "getFlicker", result, DicDataEnum.FLICKER.getName(), timeInterval, maxData);
                 });
             }
         }
         //电压总谐波畸变率
-        if (Objects.equals(targetCode,DicDataEnum.THD_V.getCode())) {
-            List<RStatLimitRateDPO> list = limitRateDClient.getOverData(param.getLineId(),param.getSearchBeginTime(),param.getSearchEndTime(),4).getData();
+        if (Objects.equals(targetCode, DicDataEnum.THD_V.getCode())) {
+            List<RStatLimitRateDPO> list = limitRateDClient.getOverData(param.getLineId(), param.getSearchBeginTime(), param.getSearchEndTime(), 4).getData();
             if (CollUtil.isNotEmpty(list)) {
-                list.forEach(item->{
+                list.forEach(item -> {
                     String time = item.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN));
                     double maxData = getVThd(param.getLineId()
                             , time + " 00:00:00"
                             , time + " 23:59:59"
                     ).get(0).getVThd();
-                    channelEachData(item,overlimit.getUaberrance(),"getUaberrance",result,DicDataEnum.THD_V.getName(),timeInterval,maxData);
+                    channelEachData(item, overlimit.getUaberrance(), "getUaberrance", result, DicDataEnum.THD_V.getName(), timeInterval, maxData);
                 });
             }
         }
         //谐波电压
-        if (Objects.equals(targetCode,DicDataEnum.HARMONIC_VOLTAGE.getCode()) || Objects.equals(targetCode,DicDataEnum.TOTAL_INDICATOR.getCode())) {
+        if (Objects.equals(targetCode, DicDataEnum.HARMONIC_VOLTAGE.getCode()) || Objects.equals(targetCode, DicDataEnum.TOTAL_INDICATOR.getCode())) {
             //电压总谐波畸变率
-            List<RStatLimitRateDPO> list = limitRateDClient.getOverData(param.getLineId(),param.getSearchBeginTime(),param.getSearchEndTime(),4).getData();
+            List<RStatLimitRateDPO> list = limitRateDClient.getOverData(param.getLineId(), param.getSearchBeginTime(), param.getSearchEndTime(), 4).getData();
             if (CollUtil.isNotEmpty(list)) {
-                list.forEach(item->{
+                list.forEach(item -> {
                     String time = item.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN));
                     double maxData = getVThd(param.getLineId()
                             , time + " 00:00:00"
                             , time + " 23:59:59"
                     ).get(0).getVThd();
-                    channelEachData(item,overlimit.getUaberrance(),"getUaberrance",result,DicDataEnum.THD_V.getName(),timeInterval,maxData);
+                    channelEachData(item, overlimit.getUaberrance(), "getUaberrance", result, DicDataEnum.THD_V.getName(), timeInterval, maxData);
                 });
             }
             //谐波电压含有率2~25次
-            List<RStatLimitRateDPO> list2 = limitRateDClient.getOverData(param.getLineId(),param.getSearchBeginTime(),param.getSearchEndTime(),7).getData();
+            List<RStatLimitRateDPO> list2 = limitRateDClient.getOverData(param.getLineId(), param.getSearchBeginTime(), param.getSearchEndTime(), 7).getData();
             if (CollUtil.isNotEmpty(list2)) {
-                list2.forEach(item->{
+                list2.forEach(item -> {
                     String time = item.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN));
                     DataHarmRateV dataHarmRateV = getDataHarmRateV(param.getLineId()
                             , time + " 00:00:00"
                             , time + " 23:59:59").get(0);
-                    channelHarmonicData(dataHarmRateV,null,null,item,overlimit,result,"getUharm",DicDataEnum.HARMONIC_VOLTAGE.getName(),timeInterval,2,25);
+                    channelHarmonicData(dataHarmRateV, null, null, item, overlimit, result, "getUharm", DicDataEnum.HARMONIC_VOLTAGE.getName(), timeInterval, 2, 25);
                 });
             }
         }
         //谐波电流
-        if (Objects.equals(targetCode,DicDataEnum.HARMONIC_CURRENT.getCode()) || Objects.equals(targetCode,DicDataEnum.TOTAL_INDICATOR.getCode())) {
-            List<RStatLimitRateDPO> list = limitRateDClient.getOverData(param.getLineId(),param.getSearchBeginTime(),param.getSearchEndTime(),8).getData();
+        if (Objects.equals(targetCode, DicDataEnum.HARMONIC_CURRENT.getCode()) || Objects.equals(targetCode, DicDataEnum.TOTAL_INDICATOR.getCode())) {
+            List<RStatLimitRateDPO> list = limitRateDClient.getOverData(param.getLineId(), param.getSearchBeginTime(), param.getSearchEndTime(), 8).getData();
             if (CollUtil.isNotEmpty(list)) {
-                list.forEach(item->{
+                list.forEach(item -> {
                     String time = item.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN));
                     DataI dataI = getDataI(param.getLineId()
                             , time + " 00:00:00"
                             , time + " 23:59:59").get(0);
-                    channelHarmonicData(null,dataI,null,item,overlimit,result,"getIharm",DicDataEnum.HARMONIC_CURRENT.getName(),timeInterval,2,25);
+                    channelHarmonicData(null, dataI, null, item, overlimit, result, "getIharm", DicDataEnum.HARMONIC_CURRENT.getName(), timeInterval, 2, 25);
                 });
             }
         }
         //间谐波电压
-        if (Objects.equals(targetCode,DicDataEnum.INTERHARMONIC_VOLTAGE.getCode()) || Objects.equals(targetCode,DicDataEnum.TOTAL_INDICATOR.getCode())) {
-            List<RStatLimitRateDPO> list = limitRateDClient.getOverData(param.getLineId(),param.getSearchBeginTime(),param.getSearchEndTime(),9).getData();
+        if (Objects.equals(targetCode, DicDataEnum.INTERHARMONIC_VOLTAGE.getCode()) || Objects.equals(targetCode, DicDataEnum.TOTAL_INDICATOR.getCode())) {
+            List<RStatLimitRateDPO> list = limitRateDClient.getOverData(param.getLineId(), param.getSearchBeginTime(), param.getSearchEndTime(), 9).getData();
             if (CollUtil.isNotEmpty(list)) {
-                list.forEach(item->{
+                list.forEach(item -> {
                     String time = item.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN));
                     DataInHarmV dataInHarmV = getDataInHarmV(param.getLineId()
                             , time + " 00:00:00"
                             , time + " 23:59:59").get(0);
-                    channelHarmonicData(null,null,dataInHarmV,item,overlimit,result,"getInuharm",DicDataEnum.INTERHARMONIC_VOLTAGE.getName(),timeInterval,1,16);
+                    channelHarmonicData(null, null, dataInHarmV, item, overlimit, result, "getInuharm", DicDataEnum.INTERHARMONIC_VOLTAGE.getName(), timeInterval, 1, 16);
                 });
             }
         }
         //负序电压不平衡度
-        if (Objects.equals(targetCode,DicDataEnum.PHASE_VOLTAGE.getCode()) || Objects.equals(targetCode,DicDataEnum.TOTAL_INDICATOR.getCode())) {
-            List<RStatLimitRateDPO> list = limitRateDClient.getOverData(param.getLineId(),param.getSearchBeginTime(),param.getSearchEndTime(),5).getData();
+        if (Objects.equals(targetCode, DicDataEnum.PHASE_VOLTAGE.getCode()) || Objects.equals(targetCode, DicDataEnum.TOTAL_INDICATOR.getCode())) {
+            List<RStatLimitRateDPO> list = limitRateDClient.getOverData(param.getLineId(), param.getSearchBeginTime(), param.getSearchEndTime(), 5).getData();
             if (CollUtil.isNotEmpty(list)) {
-                list.forEach(item->{
+                list.forEach(item -> {
                     String time = item.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN));
                     double maxData = getUnbalance(param.getLineId()
                             , time + " 00:00:00"
                             , time + " 23:59:59"
                     ).get(0).getVUnbalance();
-                    channelEachData(item,overlimit.getUbalance(),"getUbalance",result,DicDataEnum.PHASE_VOLTAGE.getName(),timeInterval,maxData);
+                    channelEachData(item, overlimit.getUbalance(), "getUbalance", result, DicDataEnum.PHASE_VOLTAGE.getName(), timeInterval, maxData);
                 });
             }
         }
         //负序电流
-        if (Objects.equals(targetCode,DicDataEnum.NEG_CURRENT.getCode()) || Objects.equals(targetCode,DicDataEnum.TOTAL_INDICATOR.getCode())) {
-            List<RStatLimitRateDPO> list = limitRateDClient.getOverData(param.getLineId(),param.getSearchBeginTime(),param.getSearchEndTime(),6).getData();
+        if (Objects.equals(targetCode, DicDataEnum.NEG_CURRENT.getCode()) || Objects.equals(targetCode, DicDataEnum.TOTAL_INDICATOR.getCode())) {
+            List<RStatLimitRateDPO> list = limitRateDClient.getOverData(param.getLineId(), param.getSearchBeginTime(), param.getSearchEndTime(), 6).getData();
             if (CollUtil.isNotEmpty(list)) {
-                list.forEach(item->{
+                list.forEach(item -> {
                     String time = item.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN));
                     double maxData = getINeg(param.getLineId()
                             , time + " 00:00:00"
                             , time + " 23:59:59"
                     ).get(0).getINeg();
-                    channelEachData(item,overlimit.getINeg(),"getINeg",result,DicDataEnum.NEG_CURRENT.getName(),timeInterval,maxData);
+                    channelEachData(item, overlimit.getINeg(), "getINeg", result, DicDataEnum.NEG_CURRENT.getName(), timeInterval, maxData);
                 });
             }
         }
         if (CollUtil.isNotEmpty(result)) {
-            Map<LocalDate,List<LineLimitDetailVo>> map = result.stream().collect(Collectors.groupingBy(LineLimitDetailVo::getTime,LinkedHashMap::new,Collectors.toList()));
-            map.forEach((k,v)->{
+            Map<LocalDate, List<LineLimitDetailVo>> map = result.stream().collect(Collectors.groupingBy(LineLimitDetailVo::getTime, LinkedHashMap::new, Collectors.toList()));
+            map.forEach((k, v) -> {
                 StringBuilder describe = new StringBuilder();
                 LineLimitDetailVo lineLimitDetailVo = new LineLimitDetailVo();
                 lineLimitDetailVo.setTime(k);
-                v.forEach(item->{
+                v.forEach(item -> {
                     describe.append(item.getOverLimitInfo());
                 });
                 lineLimitDetailVo.setOverLimitInfo(describe.toString());
@@ -536,7 +538,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
             int value = (int) method.invoke(dpo);
             LineLimitDetailVo vo = new LineLimitDetailVo();
             vo.setTime(dpo.getTime());
-            vo.setOverLimitInfo(targetName + "最大幅值:" + PubUtils.doubleRound(2,maxData) + ",限值:" + limit + ",超标时间:" + value * timeInterval + "分钟;");
+            vo.setOverLimitInfo(targetName + "最大幅值:" + PubUtils.doubleRound(2, maxData) + ",限值:" + limit + ",超标时间:" + value * timeInterval + "分钟;");
             result.add(vo);
         } catch (Exception e) {
             throw new RuntimeException(e);
@@ -545,7 +547,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
 
     //处理谐波数据 谐波电压、谐波电流、间谐波电压
     public void channelHarmonicData(DataHarmRateV dataHarmRateV, DataI dataI, DataInHarmV dataInHarmV, RStatLimitRateDPO dpo, Overlimit overlimit, List<LineLimitDetailVo> result, String getColum, String targetName, Integer timeInterval, Integer startTimes, Integer endTimes) {
-        LinkedHashMap<Integer,Integer> overMap = new LinkedHashMap<>();
+        LinkedHashMap<Integer, Integer> overMap = new LinkedHashMap<>();
         StringBuilder describe = new StringBuilder();
         LineLimitDetailVo vo = new LineLimitDetailVo();
         vo.setTime(dpo.getTime());
@@ -557,7 +559,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
                 Method method = clazz.getMethod(methodName);
                 int value = (int) method.invoke(dpo);
                 if (value > 0) {
-                    overMap.put(i,value);
+                    overMap.put(i, value);
                 }
             } catch (Exception e) {
                 throw new RuntimeException(e);
@@ -565,7 +567,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
         }
         Class<?> clazz2 = null;
         String targetName2 = null;
-        double value2 = 0.0;
+        double value2;
         if (Objects.nonNull(dataHarmRateV)) {
             clazz2 = dataHarmRateV.getClass();
             targetName2 = "getV";
@@ -576,7 +578,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
             clazz2 = dataInHarmV.getClass();
             targetName2 = "getV";
         }
-        for(Integer key:overMap.keySet()){
+        for (Integer key : overMap.keySet()) {
             int value = overMap.get(key);
             String methodName = targetName2 + key;
             Method method;
@@ -584,13 +586,13 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
                 method = clazz2.getMethod(methodName);
                 if (Objects.nonNull(dataHarmRateV)) {
                     value2 = (double) method.invoke(dataHarmRateV);
-                    describe.append(key).append("次").append(targetName).append("CP95值最大幅值:").append(PubUtils.doubleRound(2,value2)).append("%,限值:").append(getOverLimitData(overlimit, getColum, key)).append("%,超标时间:").append(value * timeInterval).append("分钟;");
+                    describe.append(key).append("次").append(targetName).append("CP95值最大幅值:").append(PubUtils.doubleRound(2, value2)).append("%,限值:").append(getOverLimitData(overlimit, getColum, key)).append("%,超标时间:").append(value * timeInterval).append("分钟;");
                 } else if (Objects.nonNull(dataI)) {
                     value2 = (double) method.invoke(dataI);
-                    describe.append(key).append("次").append(targetName).append("CP95值最大幅值:").append(PubUtils.doubleRound(2,value2)).append("%,限值:").append(getOverLimitData(overlimit, getColum, key)).append("%,超标时间:").append(value * timeInterval).append("分钟;");
+                    describe.append(key).append("次").append(targetName).append("CP95值最大幅值:").append(PubUtils.doubleRound(2, value2)).append("%,限值:").append(getOverLimitData(overlimit, getColum, key)).append("%,超标时间:").append(value * timeInterval).append("分钟;");
                 } else if (Objects.nonNull(dataInHarmV)) {
                     value2 = (double) method.invoke(dataInHarmV);
-                    describe.append((key - 0.5)).append("次").append(targetName).append("CP95值最大幅值:").append(PubUtils.doubleRound(2,value2)).append("%,限值:").append(getOverLimitData(overlimit, getColum, key)).append("%,超标时间:").append(value * timeInterval).append("分钟;");
+                    describe.append((key - 0.5)).append("次").append(targetName).append("CP95值最大幅值:").append(PubUtils.doubleRound(2, value2)).append("%,限值:").append(getOverLimitData(overlimit, getColum, key)).append("%,超标时间:").append(value * timeInterval).append("分钟;");
                 }
             } catch (Exception e) {
                 throw new RuntimeException(e);
@@ -605,7 +607,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
      */
     public String getGdName(String deptName) {
         String gdName;
-        if (Objects.equals(deptName,"风光储") || Objects.equals(deptName,"超高压") ) {
+        if (Objects.equals(deptName, "风光储") || Objects.equals(deptName, "超高压")) {
             gdName = deptName + "公司";
         } else {
             gdName = deptName + "供电公司";
@@ -613,24 +615,24 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
         return gdName;
     }
 
-    public List<ReportLineInfoVo> getReportLineInfo(boolean type, List<String> idList, String codeId, String startTime, String endTime, String deptId,List<LineWarning> allLineWarnings) {
+    public List<ReportLineInfoVo> getReportLineInfo(boolean type, List<String> idList, String codeId, String startTime, String endTime, String deptId, List<LineWarning> allLineWarnings) {
         List<ReportLineInfoVo> list = new ArrayList<>();
         LambdaQueryWrapper<LineWarning> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         if (type) {
-            lambdaQueryWrapper.eq(LineWarning::getTargetType,"0")
-                    .eq(LineWarning::getDeptId,deptId)
-                    .between(LineWarning::getAlarmTime,startTime,endTime);
+            lambdaQueryWrapper.eq(LineWarning::getTargetType, "0")
+                    .eq(LineWarning::getDeptId, deptId)
+                    .between(LineWarning::getAlarmTime, startTime, endTime);
         } else {
-            lambdaQueryWrapper.eq(LineWarning::getTargetType,codeId)
-                    .in(LineWarning::getId,idList)
-                    .between(LineWarning::getAlarmTime,startTime,endTime);
+            lambdaQueryWrapper.eq(LineWarning::getTargetType, codeId)
+                    .in(LineWarning::getId, idList)
+                    .between(LineWarning::getAlarmTime, startTime, endTime);
         }
         List<LineWarning> warnings = this.baseMapper.selectList(lambdaQueryWrapper);
         if (CollUtil.isNotEmpty(warnings)) {
             allLineWarnings.addAll(warnings);
             List<String> lineList = warnings.stream().map(LineWarning::getLineId).collect(Collectors.toList());
             list = lineFeignClient.getReportLineInfo(lineList).getData();
-            if (!type){
+            if (!type) {
                 Map<String, Integer> lineIdOverLimitDayMap = warnings.stream().collect(Collectors.toMap(LineWarning::getLineId, LineWarning::getOverLimitDay));
                 list.forEach(item1 -> {
                     String lineId = item1.getLineId();
@@ -647,15 +649,15 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
     /**
      * 获取监测点各指标的超标天数
      */
-    public List<LineWarning> getTargetInfo(String lineId, Map<String, DictData> map, Map<String, RStatLimitTargetDPO> limitMap,String deptId) {
+    public List<LineWarning> getTargetInfo(String lineId, Map<String, DictData> map, Map<String, RStatLimitTargetDPO> limitMap, String deptId) {
         List<LineWarning> result = new ArrayList<>();
-        map.forEach((k,v)->{
+        map.forEach((k, v) -> {
             LineWarning lineWarning = new LineWarning();
             lineWarning.setAlarmTime(LocalDate.now().minusDays(1));
             lineWarning.setDeptId(deptId);
             lineWarning.setLineId(lineId);
             lineWarning.setTargetType(v.getId());
-            lineWarning.setOverLimitDay(overDay(k,limitMap.get(lineId)));
+            lineWarning.setOverLimitDay(overDay(k, limitMap.get(lineId)));
             lineWarning.setInitiateWarningFlag(0);
             lineWarning.setStep(0);
             result.add(lineWarning);
@@ -677,19 +679,19 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
         int result = 0;
         try {
             //频率偏差
-            if (Objects.equals(code,DicDataEnum.PLPC_ENUM.getCode())) {
+            if (Objects.equals(code, DicDataEnum.PLPC_ENUM.getCode())) {
                 result = limitTarget.getFreqDevOvertime();
             }
             //电压偏差
-            else if (Objects.equals(code,DicDataEnum.DYPC_ENUM.getCode())) {
+            else if (Objects.equals(code, DicDataEnum.DYPC_ENUM.getCode())) {
                 result = limitTarget.getVoltageDevOvertime();
             }
             //长时闪变
-            else if (Objects.equals(code,DicDataEnum.CSSB_ENUM.getCode())) {
+            else if (Objects.equals(code, DicDataEnum.CSSB_ENUM.getCode())) {
                 result = limitTarget.getFlickerOvertime();
             }
             //谐波电压
-            else if (Objects.equals(code,DicDataEnum.XBDY_ENUM.getCode())) {
+            else if (Objects.equals(code, DicDataEnum.XBDY_ENUM.getCode())) {
                 int sum = 0;
                 Class<?> clazz = limitTarget.getClass();
                 for (int i = 2; i <= 25; i++) {
@@ -701,7 +703,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
                 result = limitTarget.getUaberranceOvertime() + sum;
             }
             //谐波电流
-            else if (Objects.equals(code,DicDataEnum.XBDL_ENUM.getCode())) {
+            else if (Objects.equals(code, DicDataEnum.XBDL_ENUM.getCode())) {
                 int sum = 0;
                 Class<?> clazz = limitTarget.getClass();
                 for (int i = 2; i <= 25; i++) {
@@ -713,7 +715,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
                 result = sum;
             }
             //间谐波电压
-            else if (Objects.equals(code,DicDataEnum.JXBDY_ENUM.getCode())) {
+            else if (Objects.equals(code, DicDataEnum.JXBDY_ENUM.getCode())) {
                 int sum = 0;
                 Class<?> clazz = limitTarget.getClass();
                 for (int i = 1; i <= 16; i++) {
@@ -725,30 +727,33 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
                 result = sum;
             }
             //负序电压不平衡度
-            else if (Objects.equals(code,DicDataEnum.SXDYBPHD_ENUM.getCode())) {
+            else if (Objects.equals(code, DicDataEnum.SXDYBPHD_ENUM.getCode())) {
                 result = limitTarget.getUbalanceOvertime();
             }
             //负序电流
-            else if (Objects.equals(code,DicDataEnum.FXDL_ENUM.getCode())) {
+            else if (Objects.equals(code, DicDataEnum.FXDL_ENUM.getCode())) {
                 result = limitTarget.getINegOvertime();
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return result > 0 ? 1:0;
+        return result > 0 ? 1 : 0;
     }
 
     /**
      * 各指标计算 系统默认阈值:预警单10天 告警单15天
      */
     public void targetInfo(List<LineWarning> lineWarnings, Map<String, DictData> targetMap, String target, RStatLimitTargetDPO dpo, String item, List<LineWarning> addList, List<LineWarning> updateList, String deptId) {
-        List<LineWarning> l1 = lineWarnings.stream().filter(o->Objects.equals(o.getTargetType(),targetMap.get(target).getId())).collect(Collectors.toList());
+        List<LineWarning> l1 = lineWarnings.stream().filter(o -> Objects.equals(o.getTargetType(), targetMap.get(target).getId())).collect(Collectors.toList());
         //获取最新的一条记录
         LineWarning line = l1.stream().max(Comparator.comparing(LineWarning::getAlarmTime)).orElse(null);
         //当前监测点连续越限天数
-        int day = line.getOverLimitDay();
+        int day = 0;
+        if (line != null) {
+            day = line.getOverLimitDay();
+        }
         //当天是否越限 0:未越限 1:越限
-        int result = overDay(target,dpo);
+        int result = overDay(target, dpo);
         if (result == 0) {
             if (day < 10) {
                 line.setOverLimitDay(0);
@@ -824,7 +829,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
             return "1";
         }
         // 编译正则表达式，用于匹配文件中的编号
-        Pattern pattern = Pattern.compile("年(\\d+)号");
+        Pattern pattern = compile("年(\\d+)号");
         int maxNumber = 0;
         for (WarningLeaflet leaflet : list) {
             String filePath = leaflet.getFilePath();
@@ -844,7 +849,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
         InfluxQueryWrapper influxQueryWrapper2 = new InfluxQueryWrapper(DataV.class);
         influxQueryWrapper2.eq(DataV::getLineId, lineIndex)
                 .eq(DataV::getValueType, InfluxDbSqlConstant.MAX)
-                .eq(DataV::getPhaseType,"T")
+                .eq(DataV::getPhaseType, "T")
                 .max(DataV::getFreqDev)
                 .between(DataV::getTime, startTime, endTime);
         return dataVMapper.getStatisticsByWraper(influxQueryWrapper2);
@@ -857,14 +862,14 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
         influxQueryWrapper.eq(DataV::getLineId, lineIndex)
                 .eq(DataV::getValueType, InfluxDbSqlConstant.MIN)
-                .regular(DataV::getPhaseType,Arrays.asList("A","B","C"))
+                .regular(DataV::getPhaseType, Arrays.asList("A", "B", "C"))
                 .min(DataV::getVuDev)
                 .between(DataV::getTime, startTime, endTime);
         List<DataV> result = new ArrayList<>(dataVMapper.getStatisticsByWraper(influxQueryWrapper));
         InfluxQueryWrapper influxQueryWrapper2 = new InfluxQueryWrapper(DataV.class);
         influxQueryWrapper2.eq(DataV::getLineId, lineIndex)
                 .eq(DataV::getValueType, InfluxDbSqlConstant.MAX)
-                .regular(DataV::getPhaseType,Arrays.asList("A","B","C"))
+                .regular(DataV::getPhaseType, Arrays.asList("A", "B", "C"))
                 .max(DataV::getVuDev)
                 .between(DataV::getTime, startTime, endTime);
         result.addAll(dataVMapper.getStatisticsByWraper(influxQueryWrapper2));
@@ -877,7 +882,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
     public List<DataPlt> getFlicker(String lineIndex, String startTime, String endTime) {
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataPlt.class);
         influxQueryWrapper.eq(DataPlt::getLineId, lineIndex)
-                .regular(DataPlt::getPhaseType,Arrays.asList("A","B","C"))
+                .regular(DataPlt::getPhaseType, Arrays.asList("A", "B", "C"))
                 .max(DataPlt::getPlt)
                 .between(DataPlt::getTime, startTime, endTime);
         return dataPltMapper.getStatisticsByWraper(influxQueryWrapper);
@@ -890,7 +895,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
         influxQueryWrapper.eq(DataV::getLineId, lineIndex)
                 .eq(DataV::getValueType, InfluxDbSqlConstant.CP95)
-                .regular(DataV::getPhaseType,Arrays.asList("A","B","C"))
+                .regular(DataV::getPhaseType, Arrays.asList("A", "B", "C"))
                 .max(DataV::getVThd)
                 .between(DataV::getTime, startTime, endTime);
         return dataVMapper.getStatisticsByWraper(influxQueryWrapper);
@@ -903,7 +908,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
         influxQueryWrapper.eq(DataV::getLineId, lineIndex)
                 .eq(DataV::getValueType, InfluxDbSqlConstant.MAX)
-                .eq(DataV::getPhaseType,"T")
+                .eq(DataV::getPhaseType, "T")
                 .max(DataV::getVUnbalance)
                 .between(DataV::getTime, startTime, endTime);
         return dataVMapper.getStatisticsByWraper(influxQueryWrapper);
@@ -916,7 +921,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataI.class);
         influxQueryWrapper.eq(DataI::getLineId, lineIndex)
                 .eq(DataI::getValueType, InfluxDbSqlConstant.MAX)
-                .eq(DataI::getPhaseType,"T")
+                .eq(DataI::getPhaseType, "T")
                 .max(DataI::getINeg)
                 .between(DataI::getTime, startTime, endTime);
         return dataIMapper.getStatisticsByWraper(influxQueryWrapper);
@@ -927,10 +932,10 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
      */
     public List<DataHarmRateV> getDataHarmRateV(String lineIndex, String startTime, String endTime) {
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmRateV.class);
-        influxQueryWrapper.maxSamePrefixAndSuffix(InfluxDbSqlConstant.V,"", HarmonicTimesUtil.harmonicTimesList(2,25,1));
+        influxQueryWrapper.maxSamePrefixAndSuffix(InfluxDbSqlConstant.V, "", HarmonicTimesUtil.harmonicTimesList(2, 25, 1));
         influxQueryWrapper.eq(DataHarmRateV::getLineId, lineIndex)
                 .eq(DataHarmRateV::getValueType, InfluxDbSqlConstant.CP95)
-                .regular(DataHarmRateV::getPhaseType,Arrays.asList("A","B","C"))
+                .regular(DataHarmRateV::getPhaseType, Arrays.asList("A", "B", "C"))
                 .between(DataHarmRateV::getTime, startTime, endTime);
         return dataHarmRateVMapper.getStatisticsByWraper(influxQueryWrapper);
     }
@@ -940,10 +945,10 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
      */
     public List<DataI> getDataI(String lineIndex, String startTime, String endTime) {
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataI.class);
-        influxQueryWrapper.maxSamePrefixAndSuffix(InfluxDbSqlConstant.I,"", HarmonicTimesUtil.harmonicTimesList(2,25,1));
+        influxQueryWrapper.maxSamePrefixAndSuffix(InfluxDbSqlConstant.I, "", HarmonicTimesUtil.harmonicTimesList(2, 25, 1));
         influxQueryWrapper.eq(DataI::getLineId, lineIndex)
                 .eq(DataI::getValueType, InfluxDbSqlConstant.CP95)
-                .regular(DataI::getPhaseType,Arrays.asList("A","B","C"))
+                .regular(DataI::getPhaseType, Arrays.asList("A", "B", "C"))
                 .between(DataI::getTime, startTime, endTime);
         return dataIMapper.getStatisticsByWraper(influxQueryWrapper);
     }
@@ -953,10 +958,10 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
      */
     public List<DataInHarmV> getDataInHarmV(String lineIndex, String startTime, String endTime) {
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataInHarmV.class);
-        influxQueryWrapper.maxSamePrefixAndSuffix(InfluxDbSqlConstant.V,"", HarmonicTimesUtil.harmonicTimesList(1,16,1));
+        influxQueryWrapper.maxSamePrefixAndSuffix(InfluxDbSqlConstant.V, "", HarmonicTimesUtil.harmonicTimesList(1, 16, 1));
         influxQueryWrapper.eq(DataInHarmV::getLineId, lineIndex)
                 .eq(DataInHarmV::getValueType, InfluxDbSqlConstant.CP95)
-                .regular(DataInHarmV::getPhaseType,Arrays.asList("A","B","C"))
+                .regular(DataInHarmV::getPhaseType, Arrays.asList("A", "B", "C"))
                 .between(DataInHarmV::getTime, startTime, endTime);
         return dataInHarmVMapper.getStatisticsByWraper(influxQueryWrapper);
     }
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java
index 8f18012a1..0488ad5cd 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java
@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.StrPool;
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -31,7 +30,6 @@ import com.njcn.supervision.enums.SupervisionUserStatusEnum;
 import com.njcn.supervision.mapper.device.QuitRunningDeviceMapper;
 import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam;
 import com.njcn.supervision.pojo.po.device.QuitRunningDevice;
-import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
 import com.njcn.supervision.pojo.vo.device.QuitRunningDeviceVO;
 import com.njcn.supervision.service.device.IQuitRunningDeviceService;
 import com.njcn.supervision.service.user.UserReportPOService;
@@ -90,7 +88,6 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl<QuitRunningDeviceM
 
         }
 
-//        quitRunningDevice.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
         this.saveOrUpdate(quitRunningDevice);
         quitRunningDevice = this.baseMapper.selectById(quitRunningDevice.getId());
 
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java
index 828199f88..6c3f2af46 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java
@@ -27,7 +27,6 @@ import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
 import com.njcn.device.biz.pojo.dto.SubGetBase;
 import com.njcn.device.biz.pojo.param.SubstationParam;
 import com.njcn.device.pms.utils.PubUtil;
-import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.api.NodeClient;
 import com.njcn.device.pq.pojo.po.Node;
 import com.njcn.poi.excel.ExcelUtil;
@@ -40,10 +39,8 @@ import com.njcn.supervision.mapper.device.SupervisionDevMainReportPOMapper;
 import com.njcn.supervision.pojo.dto.SupervisionDevMainReportExcel;
 import com.njcn.supervision.pojo.param.device.SupervisionDevMainReportParam;
 import com.njcn.supervision.pojo.param.device.SupervisionTempDeviceReportParam;
-import com.njcn.supervision.pojo.po.device.QuitRunningDevice;
 import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
 import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport;
-import com.njcn.supervision.pojo.po.user.UserReportPO;
 import com.njcn.supervision.pojo.vo.device.SupervisionDevMainReportVO;
 import com.njcn.supervision.service.device.SupervisionDevMainReportPOService;
 import com.njcn.supervision.service.device.SupervisionTempDeviceReportService;
@@ -87,7 +84,6 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
     private final SupervisionTempDeviceReportService supervisionTempDeviceReportService;
     private final DeptFeignClient deptFeignClient;
     private final UserFeignClient userFeignClient;
-    private final LineFeignClient lineFeignClient;
     private final DicDataFeignClient dicDataFeignClient;
     private final NodeClient nodeClient;
     private final CommTerminalGeneralClient commterminalGeneralClient;
@@ -99,14 +95,7 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
         SupervisionDevMainReportPO supervisionDevMainReportPO = new SupervisionDevMainReportPO();
         BeanUtils.copyProperties(supervisionDevMainReportParam, supervisionDevMainReportPO);
         if (Objects.equals(supervisionDevMainReportParam.getSaveOrCheckflag(), "2")) {
-            if (StringUtils.isEmpty(supervisionDevMainReportParam.getId())) {
-                //设备校验ip
-                checkIp(supervisionDevMainReportParam, false);
-            } else {
-                //设备校验ip
-                checkIp(supervisionDevMainReportParam, true);
-
-            }
+            checkIp(supervisionDevMainReportParam, !StringUtils.isEmpty(supervisionDevMainReportParam.getId()));
         }
 
         //设置状态
@@ -147,7 +136,7 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
         // 发起 BPM 流程
         // 如何未提交审则不需要发起 BPM 流程
         if (Objects.equals(supervisionDevMainReportParam.getSaveOrCheckflag(), "2")) {
-            Map<String, Object> processInstanceVariables = new HashMap<>();
+            Map<String, Object> processInstanceVariables = new HashMap<>(16);
             BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
             bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.DEVICE_INFO_ADD.getKey());
             bpmProcessInstanceCreateReqDTO.setBusinessKey(id);
@@ -174,7 +163,7 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
         //处理历史流程id列表
         String historyInstanceIds = InstanceUtil.dealHistoryId(supervisionDevMainReportPO.getProcessInstanceId(), supervisionDevMainReportPO.getHistoryInstanceId());
         // 发起 BPM 流程
-        Map<String, Object> processInstanceVariables = new HashMap<>();
+        Map<String, Object> processInstanceVariables = new HashMap<>(16);
         BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
         bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.DEVICE_INFO_ADD.getKey());
         bpmProcessInstanceCreateReqDTO.setBusinessKey(supervisionDevMainReportPO.getId());
@@ -237,7 +226,7 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
                 DateUtil.endOfDay(DateUtil.parse(supervisionDevMainReportQuery.getSearchEndTime())));
         queryWrapper.orderByDesc("supervision_dev_main_report.Update_Time");
         Page<SupervisionDevMainReportVO> page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(supervisionDevMainReportQuery), PageFactory.getPageSize(supervisionDevMainReportQuery)), queryWrapper);
-        page.getRecords().stream().forEach(temp -> {
+        page.getRecords().forEach(temp -> {
 //            temp.setOrgName((deptFeignClient.getDeptById(temp.getOrgId()).getData().getName()));
             //处理特殊字段，用户名、部门名
             UserVO userVO = userFeignClient.getUserById(temp.getReporter()).getData();
@@ -306,10 +295,8 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
                 .list();
         if (CollectionUtil.isNotEmpty(list)) {
             List<String> collect = list.stream().map(SupervisionDevMainReportPO::getId).collect(Collectors.toList());
-            List<SupervisionTempDeviceReport> list1 = supervisionTempDeviceReportService.lambdaQuery().in(SupervisionTempDeviceReport::getId, collect).list();
-            return list1;
+            return supervisionTempDeviceReportService.lambdaQuery().in(SupervisionTempDeviceReport::getId, collect).list();
         }
-
         return new ArrayList<>();
     }
 
@@ -506,8 +493,10 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
     @Override
     public void importDevData(MultipartFile file, HttpServletResponse response) {
         ImportParams params = new ImportParams();
-        params.setHeadRows(1);//表头
-        params.setTitleRows(1);//标题
+        //表头
+        params.setHeadRows(1);
+        //标题
+        params.setTitleRows(1);
         params.setNeedVerify(true);
         params.setStartSheetIndex(0);
         params.setSheetNum(1);
@@ -725,8 +714,7 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
 
     /**
      * @Description: 判断设备ip是否重复，如果重复提示
-     * @Param: supervisionDevMainReportParam终端详情 isExcludeSelf是否排除自己，一般新增不排除，更新时需要排除自己
-     * @return: void
+     * @param supervisionDevMainReportParam 终端详情 isExcludeSelf是否排除自己，一般新增不排除，更新时需要排除自己
      * @Author: clam
      * @Date: 2024/5/11
      */
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java
index 5d33c0e08..cca266058 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java
@@ -32,7 +32,6 @@ import com.njcn.supervision.enums.UserNatureEnum;
 import com.njcn.supervision.mapper.device.SupervisionTempLineDebugPOMapper;
 import com.njcn.supervision.mapper.user.UserReportNormalMapper;
 import com.njcn.supervision.pojo.param.device.SupervisionTempLineDebugParam;
-import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
 import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport;
 import com.njcn.supervision.pojo.po.device.SupervisionTempLineDebugPO;
 import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;
@@ -67,7 +66,6 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
- *
  * Description:
  * Date: 2024/5/17  15:26【需求编号】
  *
@@ -76,7 +74,7 @@ import java.util.stream.Stream;
  */
 @Service
 @RequiredArgsConstructor
-public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<SupervisionTempLineDebugPOMapper, SupervisionTempLineDebugPO> implements SupervisionTempLineDebugPOService{
+public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<SupervisionTempLineDebugPOMapper, SupervisionTempLineDebugPO> implements SupervisionTempLineDebugPOService {
 
     private final BpmProcessFeignClient bpmProcessFeignClient;
     private final DeptFeignClient deptFeignClient;
@@ -133,20 +131,20 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
         );
         if (CollUtil.isNotEmpty(list)) {
             Optional<UserReportNormalPO> netInReport = list.stream().filter(x -> 0 == x.getType()).findFirst();
-            if(netInReport.isPresent()){
-                if(netInReport.get().getStatus()!=2){
+            if (netInReport.isPresent()) {
+                if (netInReport.get().getStatus() != 2) {
                     throw new BusinessException("最新入网验收方案流程,暂未审核通过!");
                 }
-            }else{
+            } else {
                 throw new BusinessException("请填写入网验收方案流程,审核通过后方可操作!");
             }
             if (needGovernance == 1) {
                 Optional<UserReportNormalPO> governReport = list.stream().filter(x -> 1 == x.getType()).findFirst();
-                if(governReport.isPresent()){
-                    if(governReport.get().getStatus()!=2){
+                if (governReport.isPresent()) {
+                    if (governReport.get().getStatus() != 2) {
                         throw new BusinessException("最新治理工程验收方案流程,暂未审核通过!");
                     }
-                }else{
+                } else {
                     throw new BusinessException("请填写治理工程验收方案流程,审核通过后方可操作!");
                 }
             }
@@ -155,12 +153,12 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
         }
 
         SupervisionTempLineDebugPO supervisionTempLineDebugPO = new SupervisionTempLineDebugPO();
-        BeanUtils.copyProperties(supervisionTempLineReportParam,supervisionTempLineDebugPO);
+        BeanUtils.copyProperties(supervisionTempLineReportParam, supervisionTempLineDebugPO);
         //设置状态
-        if(Objects.equals(supervisionTempLineReportParam.getSaveOrCheckflag(),"1")){
+        if (Objects.equals(supervisionTempLineReportParam.getSaveOrCheckflag(), "1")) {
             supervisionTempLineDebugPO.setStatus(BpmTaskStatusEnum.WAIT.getStatus());
 
-        }else {
+        } else {
             supervisionTempLineDebugPO.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
 
         }
@@ -168,16 +166,16 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
         this.saveOrUpdate(supervisionTempLineDebugPO);
         String id = supervisionTempLineDebugPO.getId();
         supervisionTempLineDebugPO = this.baseMapper.selectById(id);
-        if(Objects.equals(supervisionTempLineReportParam.getSaveOrCheckflag(),"2")) {
+        if (Objects.equals(supervisionTempLineReportParam.getSaveOrCheckflag(), "2")) {
             // 发起 BPM 流程
-            Map<String, Object> processInstanceVariables = new HashMap<>();
+            Map<String, Object> processInstanceVariables = new HashMap<>(16);
             BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
             bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.TEMP_LINE_DEBUG.getKey());
             bpmProcessInstanceCreateReqDTO.setBusinessKey(id);
             bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(supervisionTempLineReportParam.getStartUserSelectAssignees());
             bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables);
             //fixme 这边supervisionTempLineDebugPO.getUpdateBy()为null，先改成当前用户
-            String processInstanceId = bpmProcessFeignClient.createProcessInstance(RequestUtil.getUserIndex(),bpmProcessInstanceCreateReqDTO).getData();
+            String processInstanceId = bpmProcessFeignClient.createProcessInstance(RequestUtil.getUserIndex(), bpmProcessInstanceCreateReqDTO).getData();
             // 将工作流的编号，更新到流程单中
             supervisionTempLineDebugPO.setProcessInstanceId(processInstanceId);
             this.updateById(supervisionTempLineDebugPO);
@@ -189,16 +187,16 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
     public String updateTempLineDebug(SupervisionTempLineDebugParam.SupervisionTempLineDebugUpdateParam supervisionTempLineReportParam) {
         SupervisionTempLineDebugPO supervisionTempLineDebugPO = this.baseMapper.selectById(supervisionTempLineReportParam.getId());
         //判断是否有权限操作
-        InstanceUtil.judgeUserPower(RequestUtil.getUserIndex(),supervisionTempLineDebugPO.getCreateBy());
+        InstanceUtil.judgeUserPower(RequestUtil.getUserIndex(), supervisionTempLineDebugPO.getCreateBy());
         supervisionTempLineReportParam.setProcessInstanceId(supervisionTempLineDebugPO.getProcessInstanceId());
         supervisionTempLineReportParam.setHistoryInstanceId(supervisionTempLineDebugPO.getHistoryInstanceId());
-        BeanUtils.copyProperties(supervisionTempLineReportParam,supervisionTempLineDebugPO);
+        BeanUtils.copyProperties(supervisionTempLineReportParam, supervisionTempLineDebugPO);
         supervisionTempLineDebugPO.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
         supervisionTempLineDebugPO.setState(DataStateEnum.ENABLE.getCode());
         //处理历史流程id列表
         String historyInstanceIds = InstanceUtil.dealHistoryId(supervisionTempLineDebugPO.getProcessInstanceId(), supervisionTempLineDebugPO.getHistoryInstanceId());
         // 发起 BPM 流程
-        Map<String, Object> processInstanceVariables = new HashMap<>();
+        Map<String, Object> processInstanceVariables = new HashMap<>(16);
         BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
         bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.TEMP_LINE_DEBUG.getKey());
         bpmProcessInstanceCreateReqDTO.setBusinessKey(supervisionTempLineDebugPO.getId());
@@ -218,14 +216,14 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
         QueryWrapper<SupervisionDevMainReportVO> queryWrapper = new QueryWrapper<>();
         List<String> colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData();
         queryWrapper.in("supervision_temp_line_debug.create_by", colleaguesIds)
-                    .eq("supervision_temp_line_debug.state", DataStateEnum.ENABLE.getCode());
+                .eq("supervision_temp_line_debug.state", DataStateEnum.ENABLE.getCode());
         if (StrUtil.isNotBlank(supervisionTempLineDebugQuery.getOrgNo())) {
             /*获取直接下属子单位*/
             List<String> data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineDebugQuery.getOrgNo()).getData();
             queryWrapper.in("supervision_temp_line_report.org_id", data);
         }
         queryWrapper
-                .and(CollUtil.isNotEmpty(InstanceUtil.filterTaskStatus()),w -> w.in("supervision_temp_line_debug.status", InstanceUtil.filterTaskStatus())
+                .and(CollUtil.isNotEmpty(InstanceUtil.filterTaskStatus()), w -> w.in("supervision_temp_line_debug.status", InstanceUtil.filterTaskStatus())
                         .or()
                         .eq("supervision_temp_line_debug.create_by", RequestUtil.getUserIndex())
                 );
@@ -234,7 +232,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
             queryWrapper.eq("supervision_temp_line_debug.status", supervisionTempLineDebugQuery.getStatus());
         }
         if (StrUtil.isNotBlank(supervisionTempLineDebugQuery.getSearchValue())) {
-            queryWrapper.and(x->x
+            queryWrapper.and(x -> x
                     .like("supervision_temp_line_report.Power_Substation_Name", supervisionTempLineDebugQuery.getSearchValue())
                     .or()
                     .like("supervision_temp_line_report.connected_bus", supervisionTempLineDebugQuery.getSearchValue())
@@ -249,8 +247,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
                 DateUtil.beginOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchBeginTime())),
                 DateUtil.endOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchEndTime())));
         queryWrapper.orderByDesc("supervision_temp_line_debug.Update_Time");
-        Page<SupervisionTempLineDebugVO> page =this.baseMapper.page(new Page<>(PageFactory.getPageNum(supervisionTempLineDebugQuery), PageFactory.getPageSize(supervisionTempLineDebugQuery)), queryWrapper);
-        return page;
+        return this.baseMapper.page(new Page<>(PageFactory.getPageNum(supervisionTempLineDebugQuery), PageFactory.getPageSize(supervisionTempLineDebugQuery)), queryWrapper);
     }
 
     @Override
@@ -265,7 +262,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
             queryWrapper.in("supervision_temp_line_report.org_id", data);
         }
         queryWrapper
-                .and(CollUtil.isNotEmpty(InstanceUtil.filterTaskStatus()),w -> w.in("supervision_temp_line_debug.status", InstanceUtil.filterTaskStatus())
+                .and(CollUtil.isNotEmpty(InstanceUtil.filterTaskStatus()), w -> w.in("supervision_temp_line_debug.status", InstanceUtil.filterTaskStatus())
                         .or()
                         .eq("supervision_temp_line_debug.create_by", RequestUtil.getUserIndex())
                 );
@@ -277,16 +274,15 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
                 DateUtil.beginOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchBeginTime())),
                 DateUtil.endOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchEndTime())));
         queryWrapper.orderByDesc("supervision_temp_line_debug.Update_Time");
-        Page<SupervisionTempLineDebugVO> page =this.baseMapper.pageHasDebug(new Page<>(PageFactory.getPageNum(supervisionTempLineDebugQuery), PageFactory.getPageSize(supervisionTempLineDebugQuery)), queryWrapper);
-        return page;
+        return this.baseMapper.pageHasDebug(new Page<>(PageFactory.getPageNum(supervisionTempLineDebugQuery), PageFactory.getPageSize(supervisionTempLineDebugQuery)), queryWrapper);
     }
 
     @Override
     public SupervisionTempLineDebugVO getDetailTempLineDebug(String id) {
-        SupervisionTempLineDebugVO supervisionTempLineDebugVO =null;
+        SupervisionTempLineDebugVO supervisionTempLineDebugVO = null;
         SupervisionTempLineReport supervisionTempLineReport = supervisionTempLineReportService.getById(id);
         SupervisionTempLineDebugPO supervisionTempLineDebugPO = this.getById(id);
-        if(ObjectUtil.isNotNull(supervisionTempLineDebugPO)){
+        if (ObjectUtil.isNotNull(supervisionTempLineDebugPO)) {
             supervisionTempLineDebugVO = new SupervisionTempLineDebugVO();
             supervisionTempLineDebugVO.setId(id);
             supervisionTempLineDebugVO.setUserName(supervisionTempLineReport.getUserName());
@@ -306,7 +302,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
 
     @Override
     public void updateProcessStatus(String businessKey, Integer status) {
-        this.lambdaUpdate().set(SupervisionTempLineDebugPO::getStatus,status).eq(SupervisionTempLineDebugPO::getId,businessKey).update();
+        this.lambdaUpdate().set(SupervisionTempLineDebugPO::getStatus, status).eq(SupervisionTempLineDebugPO::getId, businessKey).update();
 
     }
 
@@ -314,14 +310,14 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
     public BpmInstanceInfo getInstanceInfo(String businessId) {
         BpmInstanceInfo bpmInstanceInfo = new BpmInstanceInfo();
         SupervisionTempLineDebugVO supervisionTempLineDebugVO = this.getDetailTempLineDebug(businessId);
-        if(ObjectUtil.isNotNull(supervisionTempLineDebugVO)){
+        if (ObjectUtil.isNotNull(supervisionTempLineDebugVO)) {
             bpmInstanceInfo.setHistoryInstanceId(supervisionTempLineDebugVO.getHistoryInstanceId());
             String sign = "";
-            if(StrUtil.isNotBlank(supervisionTempLineDebugVO.getPowerSubstationName())){
-                sign=supervisionTempLineDebugVO.getPowerSubstationName()
+            if (StrUtil.isNotBlank(supervisionTempLineDebugVO.getPowerSubstationName())) {
+                sign = supervisionTempLineDebugVO.getPowerSubstationName()
                         .concat(StrPool.SLASH);
             }
-                sign =  sign
+            sign = sign
                     .concat(supervisionTempLineDebugVO.getMonitoringTerminalName())
                     .concat(StrPool.SLASH)
                     .concat(supervisionTempLineDebugVO.getLineName());
@@ -347,16 +343,14 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
     }
 
     /**
-    * @Description: 临时表台账数据同步到实际表中
-    * @Param:
-    * @return: java.lang.String
-    * @Author: clam
-    * @Date: 2024/5/29
-    */
+     * @Description: 临时表台账数据同步到实际表中
+     * @Author: clam
+     * @Date: 2024/5/29
+     */
     @Override
     public String ledgerSync(String id) {
         SupervisionTempLineDebugPO byId = this.getById(id);
-        if(byId.getStatus()!=2){
+        if (byId.getStatus() != 2) {
             throw new BusinessException("未审核通过无法同步台账");
         }
         //获取临时监测点详情
@@ -366,7 +360,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
         SyncTerminalParam syncTerminalParam = new SyncTerminalParam();
         //用于绑定监测点部门
         syncTerminalParam.setDeptId(tempDevice.getPowerCompany());
-        if(tempDevice.getCustomSubstationFlag()==0){
+        if (tempDevice.getCustomSubstationFlag() == 0) {
             List<Line> data = lineFeignClient.getBaseLineList(Stream.of(tempDevice.getSubstation()).collect(Collectors.toList())).getData();
             String pids = data.get(0).getPids();
             String[] idsArray = pids.split(",");
@@ -376,7 +370,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
             syncTerminalParam.setGdIndex(idsArray[2]);
             syncTerminalParam.setSubIndex(tempDevice.getSubstation());
 
-        }else {
+        } else {
             //电站可能后期要录 todo
             List<String> data1 = deptLineFeignClient.getLineNodeByDeptId(tempDevice.getPowerCompany()).getData();
             List<Line> data = lineFeignClient.getBaseLineList(data1).getData();
@@ -403,14 +397,14 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
         SubVoltageParam subVoltageParam = new SubVoltageParam();
         LineParam lineParam = new LineParam();
 
-        assembleSyncTerminalParam(deviceParam,tempDevice,subVoltageParam,lineParam,tempLine);
+        assembleSyncTerminalParam(deviceParam, tempDevice, subVoltageParam, lineParam, tempLine);
 
         syncTerminalParam.setDeviceParam(deviceParam);
         syncTerminalParam.setSubVoltageParam(subVoltageParam);
         syncTerminalParam.setLineParam(lineParam);
 
         String substation = terminalBaseClient.terminalSync(syncTerminalParam).getData();
-        this.updateProcessStatus(id,5);
+        this.updateProcessStatus(id, 5);
         tempDevice.setSubstation(substation);
         supervisionTempDeviceReportService.updateById(tempDevice);
         return null;
@@ -421,7 +415,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
         //准备取消该流程，需要远程调用接口
         SupervisionTempLineDebugPO supervisionTempLineDebugPO = this.baseMapper.selectById(cancelReqVO.getId());
         //判断是否有权限操作
-        InstanceUtil.judgeUserPower(RequestUtil.getUserIndex(),supervisionTempLineDebugPO.getCreateBy());
+        InstanceUtil.judgeUserPower(RequestUtil.getUserIndex(), supervisionTempLineDebugPO.getCreateBy());
         //取消流程
         bpmProcessFeignClient.cancelProcessInstanceByStartUser(cancelReqVO);
         //更新状态
@@ -433,7 +427,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
     @Override
     public Boolean deleteTempLineDebugReport(List<String> supervisionId) {
         List<SupervisionTempLineDebugPO> supervisionTempLineDebugPOS = this.listByIds(supervisionId);
-        if(CollUtil.isEmpty(supervisionTempLineDebugPOS)){
+        if (CollUtil.isEmpty(supervisionTempLineDebugPOS)) {
             throw new BusinessException(SupervisionResponseEnum.EXISTENCE_OR_NOT);
         }
         //判断是否有权限操作
@@ -441,12 +435,12 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
         long count = supervisionTempLineDebugPOS.stream().filter(x -> !BpmTaskStatusEnum.WAIT.getStatus().equals(x.getStatus())).count();
         InstanceUtil.deleteRole(RequestUtil.getUserIndex(), collect, count);
         return this.update(new LambdaUpdateWrapper<SupervisionTempLineDebugPO>().set(SupervisionTempLineDebugPO::getState, DataStateEnum.DELETED.getCode())
-                    .in(SupervisionTempLineDebugPO::getId, supervisionId));
+                .in(SupervisionTempLineDebugPO::getId, supervisionId));
 
     }
 
 
-    private void assembleSyncTerminalParam(DeviceParam deviceParam, SupervisionTempDeviceReport tempDevice,SubVoltageParam subVoltageParam,LineParam lineParam ,SupervisionTempLineReport tempLine) {
+    private void assembleSyncTerminalParam(DeviceParam deviceParam, SupervisionTempDeviceReport tempDevice, SubVoltageParam subVoltageParam, LineParam lineParam, SupervisionTempLineReport tempLine) {
         //包装device
         deviceParam.setDevIndex(tempDevice.getId());
         deviceParam.setName(tempDevice.getMonitoringTerminalName());
@@ -509,7 +503,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
         lineParam.setPowerSubstationName(tempLine.getPowerSubstationName());
 //        lineParam.setCalssificationGrade();
 //        lineParam.setSuperiorsSubstation();
-        lineParam.setStatFlag(Integer.valueOf(tempLine.getIsStatistical()));
+        lineParam.setStatFlag(tempLine.getIsStatistical());
 //        lineParam.setHangLine();
 //        lineParam.setOwner();
 //        lineParam.setOwnerDuty();
@@ -517,7 +511,6 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
         lineParam.setWiringDiagram(tempLine.getMainWiringDiagram());
 
 
-
     }
 
     private String reflectionBusinessType(String businessType) {
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
index f9f18c38e..c5644bf8c 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
@@ -26,7 +26,6 @@ import com.njcn.supervision.enums.SupervisionUserStatusEnum;
 import com.njcn.supervision.mapper.device.SupervisionTempLineDebugPOMapper;
 import com.njcn.supervision.mapper.device.SupervisionTempLineReportMapper;
 import com.njcn.supervision.pojo.param.device.SupervisionTempLineReportParam;
-import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
 import com.njcn.supervision.pojo.po.device.SupervisionTempLineDebugPO;
 import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;
 import com.njcn.supervision.pojo.vo.device.SupervisionTempLineReportVO;
@@ -48,10 +47,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static javafx.beans.binding.Bindings.concat;
 
 /**
- *
  * Description:
  * Date: 2024/5/11  14:07【需求编号】
  *
@@ -60,7 +57,7 @@ import static javafx.beans.binding.Bindings.concat;
  */
 @Service
 @RequiredArgsConstructor
-public class SupervisionTempLineReportServiceImpl extends ServiceImpl<SupervisionTempLineReportMapper, SupervisionTempLineReport> implements SupervisionTempLineReportService{
+public class SupervisionTempLineReportServiceImpl extends ServiceImpl<SupervisionTempLineReportMapper, SupervisionTempLineReport> implements SupervisionTempLineReportService {
 
 
     private final BpmProcessFeignClient bpmProcessFeignClient;
@@ -75,23 +72,15 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
     @Transactional(rollbackFor = Exception.class)
     public String addTempLineReport(SupervisionTempLineReportParam supervisionTempLineReportParam) {
         SupervisionTempLineReport supervisionTempLineReport = new SupervisionTempLineReport();
-        BeanUtils.copyProperties(supervisionTempLineReportParam,supervisionTempLineReport);
-        if(Objects.equals(supervisionTempLineReportParam.getSaveOrCheckflag(),"2")){
-            if(StringUtils.isEmpty(supervisionTempLineReportParam.getId())){
-                //判断监测点是否重复
-                checkLineId(supervisionTempLineReportParam, false);
-
-            }else {
-                //判断监测点是否重复
-                checkLineId(supervisionTempLineReportParam, true);
-
-            }
+        BeanUtils.copyProperties(supervisionTempLineReportParam, supervisionTempLineReport);
+        if (Objects.equals(supervisionTempLineReportParam.getSaveOrCheckflag(), "2")) {
+            checkLineId(supervisionTempLineReportParam, !StringUtils.isEmpty(supervisionTempLineReportParam.getId()));
         }
         //设置状态
-        if(Objects.equals(supervisionTempLineReportParam.getSaveOrCheckflag(),"1")){
+        if (Objects.equals(supervisionTempLineReportParam.getSaveOrCheckflag(), "1")) {
             supervisionTempLineReport.setStatus(BpmTaskStatusEnum.WAIT.getStatus());
 
-        }else {
+        } else {
             supervisionTempLineReport.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
 
         }
@@ -103,9 +92,9 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
         String id = supervisionTempLineReport.getId();
         supervisionTempLineReport = this.baseMapper.selectById(id);
 
-        if(Objects.equals(supervisionTempLineReportParam.getSaveOrCheckflag(),"2")) {
+        if (Objects.equals(supervisionTempLineReportParam.getSaveOrCheckflag(), "2")) {
             // 发起 BPM 流程
-            Map<String, Object> processInstanceVariables = new HashMap<>();
+            Map<String, Object> processInstanceVariables = new HashMap<>(16);
             BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
             bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.LINE_INFO_ADD.getKey());
             bpmProcessInstanceCreateReqDTO.setBusinessKey(id);
@@ -123,16 +112,16 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
     public String updateLineReport(SupervisionTempLineReportParam.SupervisionTempLineReportUpdate supervisionTempLineReportParam) {
         SupervisionTempLineReport supervisionTempLineReport = this.baseMapper.selectById(supervisionTempLineReportParam.getId());
         //判断是否有权限操作
-        InstanceUtil.judgeUserPower(RequestUtil.getUserIndex(),supervisionTempLineReport.getCreateBy());
+        InstanceUtil.judgeUserPower(RequestUtil.getUserIndex(), supervisionTempLineReport.getCreateBy());
         supervisionTempLineReportParam.setProcessInstanceId(supervisionTempLineReport.getProcessInstanceId());
         supervisionTempLineReportParam.setHistoryInstanceId(supervisionTempLineReport.getHistoryInstanceId());
-        BeanUtils.copyProperties(supervisionTempLineReportParam,supervisionTempLineReport);
+        BeanUtils.copyProperties(supervisionTempLineReportParam, supervisionTempLineReport);
         supervisionTempLineReport.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
         supervisionTempLineReport.setState(DataStateEnum.ENABLE.getCode());
         //处理历史流程id列表
         String historyInstanceIds = InstanceUtil.dealHistoryId(supervisionTempLineReport.getProcessInstanceId(), supervisionTempLineReport.getHistoryInstanceId());
         // 发起 BPM 流程
-        Map<String, Object> processInstanceVariables = new HashMap<>();
+        Map<String, Object> processInstanceVariables = new HashMap<>(16);
         BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
         bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.LINE_INFO_ADD.getKey());
         bpmProcessInstanceCreateReqDTO.setBusinessKey(supervisionTempLineReport.getId());
@@ -154,14 +143,14 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
         List<String> colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData();
         queryWrapper.in("supervision_temp_line_report.create_by", colleaguesIds)
                 .eq("supervision_temp_line_report.state", DataStateEnum.ENABLE.getCode())
-                .in(CollectionUtil.isNotEmpty(supervisionTempLineReportQuery.getStatueList()),"supervision_temp_line_report.status",supervisionTempLineReportQuery.getStatueList());
+                .in(CollectionUtil.isNotEmpty(supervisionTempLineReportQuery.getStatueList()), "supervision_temp_line_report.status", supervisionTempLineReportQuery.getStatueList());
         if (StrUtil.isNotBlank(supervisionTempLineReportQuery.getOrgNo())) {
             /*获取直接下属子单位*/
             List<String> data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineReportQuery.getOrgNo()).getData();
             queryWrapper.in("supervision_temp_line_report.org_id", data);
         }
         queryWrapper
-                .and(CollUtil.isNotEmpty(InstanceUtil.filterTaskStatus()),w -> w.in("supervision_temp_line_report.status", InstanceUtil.filterTaskStatus())
+                .and(CollUtil.isNotEmpty(InstanceUtil.filterTaskStatus()), w -> w.in("supervision_temp_line_report.status", InstanceUtil.filterTaskStatus())
                         .or()
                         .eq("supervision_temp_line_report.create_by", RequestUtil.getUserIndex())
                 );
@@ -170,7 +159,7 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
             queryWrapper.eq("supervision_temp_line_report.status", supervisionTempLineReportQuery.getStatus());
         }
         if (StrUtil.isNotBlank(supervisionTempLineReportQuery.getSearchValue())) {
-            queryWrapper.and(x->x
+            queryWrapper.and(x -> x
                     .like("supervision_temp_line_report.Power_Substation_Name", supervisionTempLineReportQuery.getSearchValue())
                     .or()
                     .like("supervision_temp_line_report.connected_bus", supervisionTempLineReportQuery.getSearchValue())
@@ -185,15 +174,14 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
                 DateUtil.beginOfDay(DateUtil.parse(supervisionTempLineReportQuery.getSearchBeginTime())),
                 DateUtil.endOfDay(DateUtil.parse(supervisionTempLineReportQuery.getSearchEndTime())));
         queryWrapper.orderByDesc("supervision_temp_line_report.Update_Time");
-        Page<SupervisionTempLineReportVO> page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(supervisionTempLineReportQuery), PageFactory.getPageSize(supervisionTempLineReportQuery)), queryWrapper);
-        return page;
+        return this.baseMapper.page(new Page<>(PageFactory.getPageNum(supervisionTempLineReportQuery), PageFactory.getPageSize(supervisionTempLineReportQuery)), queryWrapper);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateProcessStatus(String businessKey, Integer status) {
-        this.lambdaUpdate().set(SupervisionTempLineReport::getStatus,status).eq(SupervisionTempLineReport::getId,businessKey).update();
-        if(status.equals(BpmProcessInstanceStatusEnum.APPROVE.getStatus())){
+        this.lambdaUpdate().set(SupervisionTempLineReport::getStatus, status).eq(SupervisionTempLineReport::getId, businessKey).update();
+        if (status.equals(BpmProcessInstanceStatusEnum.APPROVE.getStatus())) {
             SupervisionTempLineReport byId = this.getById(businessKey);
 
             userReportPOService.updateUserStatus(businessKey, SupervisionUserStatusEnum.BUILD.getCode());
@@ -212,13 +200,13 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
     public BpmInstanceInfo getInstanceInfo(String businessId) {
         BpmInstanceInfo bpmInstanceInfo = new BpmInstanceInfo();
         SupervisionTempLineReportVO supervisionTempLineReportVO = this.getDetailTempLine(businessId);
-        if(ObjectUtil.isNotNull(supervisionTempLineReportVO)){
+        if (ObjectUtil.isNotNull(supervisionTempLineReportVO)) {
             bpmInstanceInfo.setHistoryInstanceId(supervisionTempLineReportVO.getHistoryInstanceId());
             String powerSubstationName = supervisionTempLineReportVO.getPowerSubstationName();
-            if(StrUtil.isNotBlank(powerSubstationName)){
-                powerSubstationName.concat(StrPool.SLASH);
-            }else{
-                powerSubstationName="";
+            if (StrUtil.isNotBlank(powerSubstationName)) {
+                powerSubstationName = powerSubstationName.concat(StrPool.SLASH);
+            } else {
+                powerSubstationName = "";
             }
             String sign = powerSubstationName
                     .concat(supervisionTempLineReportVO.getMonitoringTerminalName())
@@ -262,21 +250,21 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
 
     @Override
     public SupervisionTempLineReportVO getDetailTempLine(String id) {
-        SupervisionTempLineReportVO vo=null;
+        SupervisionTempLineReportVO vo = null;
         SupervisionTempLineReport byId = this.getById(id);
-        if(ObjectUtil.isNotNull(byId)){
-            vo  =new SupervisionTempLineReportVO();
-            BeanUtils.copyProperties(byId,vo);
+        if (ObjectUtil.isNotNull(byId)) {
+            vo = new SupervisionTempLineReportVO();
+            BeanUtils.copyProperties(byId, vo);
             //处理特殊字段，用户名、部门名
             UserVO userVO = userFeignClient.getUserById(vo.getCreateBy()).getData();
             vo.setReporter(userVO.getName());
-            if(StringUtils.isNotEmpty(vo.getOrgId())){
+            if (StringUtils.isNotEmpty(vo.getOrgId())) {
                 vo.setOrgName(deptFeignClient.getDeptById(vo.getOrgId()).getData().getName());
             }
-            if(StringUtils.isNotEmpty(vo.getLoadType())){
+            if (StringUtils.isNotEmpty(vo.getLoadType())) {
                 vo.setLoadType(dictTreeFeignClient.queryById(vo.getLoadType()).getData().getName());
             }
-            if(StringUtils.isNotEmpty(vo.getBusinessType())){
+            if (StringUtils.isNotEmpty(vo.getBusinessType())) {
                 vo.setBusinessType(dictTreeFeignClient.queryById(vo.getBusinessType()).getData().getName());
             }
         }
@@ -286,7 +274,7 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
     @Override
     public Boolean deleteTempLineReport(List<String> supervisionId) {
         List<SupervisionTempLineReport> supervisionTempLineReports = this.listByIds(supervisionId);
-        if(CollUtil.isEmpty(supervisionTempLineReports)){
+        if (CollUtil.isEmpty(supervisionTempLineReports)) {
             throw new BusinessException(SupervisionResponseEnum.EXISTENCE_OR_NOT);
         }
         //判断是否有权限操作
@@ -294,12 +282,12 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
         long count = supervisionTempLineReports.stream().filter(x -> !BpmTaskStatusEnum.WAIT.getStatus().equals(x.getStatus())).count();
         InstanceUtil.deleteRole(RequestUtil.getUserIndex(), collect, count);
         return this.update(new LambdaUpdateWrapper<SupervisionTempLineReport>().set(SupervisionTempLineReport::getState, DataStateEnum.DELETED.getCode())
-                    .in(SupervisionTempLineReport::getId, supervisionId));
+                .in(SupervisionTempLineReport::getId, supervisionId));
     }
 
     private void checkLineId(SupervisionTempLineReportParam supervisionTempLineReportParam, boolean isExcludeSelf) {
         //保存时不为空则不校验
-        if(Objects.nonNull(supervisionTempLineReportParam.getNum())||Objects.nonNull(supervisionTempLineReportParam.getLineName())) {
+        if (Objects.nonNull(supervisionTempLineReportParam.getNum()) || Objects.nonNull(supervisionTempLineReportParam.getLineName())) {
             LambdaQueryWrapper<SupervisionTempLineReport> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper
                     .eq(SupervisionTempLineReport::getMonitoringTerminalCode, supervisionTempLineReportParam.getMonitoringTerminalCode())
@@ -312,7 +300,7 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
             if (isExcludeSelf) {
                 if (supervisionTempLineReportParam instanceof SupervisionTempLineReportParam.SupervisionTempLineReportUpdate) {
                     lambdaQueryWrapper.ne(SupervisionTempLineReport::getId, ((SupervisionTempLineReportParam.SupervisionTempLineReportUpdate) supervisionTempLineReportParam).getId());
-                }else {
+                } else {
                     lambdaQueryWrapper.ne(SupervisionTempLineReport::getId, (supervisionTempLineReportParam).getId());
 
                 }
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java
index f444e9fa3..f5f2024f5 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java
@@ -37,7 +37,6 @@ import com.njcn.supervision.enums.SupervisionUserStatusEnum;
 import com.njcn.supervision.mapper.device.SupervisionTempLineReportMapper;
 import com.njcn.supervision.mapper.device.SupervisionTempLineRunTestMapper;
 import com.njcn.supervision.pojo.param.device.SupervisionTempLineRunTestParam;
-import com.njcn.supervision.pojo.po.device.CheckDevice;
 import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;
 import com.njcn.supervision.pojo.po.device.SupervisionTempLineRunTestPO;
 import com.njcn.supervision.pojo.po.device.TempLineRunTestWarning;
@@ -259,11 +258,11 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl<Supervisi
                         po.setHistoryInstanceId(historyInstanceIds);
                     }
                     // 发起 BPM 流程
-                    Map<String, Object> processInstanceVariables = new HashMap<>();
+                    Map<String, Object> processInstanceVariables = new HashMap<>(16);
                     BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
                     bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.LINE_RUN_TEST.getKey());
                     bpmProcessInstanceCreateReqDTO.setBusinessKey(supervisionTempLineRunTestPO.getId());
-                    bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>());
+                    bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>(16));
                     bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables);
                     String processInstanceId = bpmProcessFeignClient.createProcessInstance(supervisionTempLineRunTestPO.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData();
                     po.setProcessInstanceId(processInstanceId);
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/TempLineRunTestWarningServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/TempLineRunTestWarningServiceImpl.java
index d84ee86bc..ab631a579 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/TempLineRunTestWarningServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/TempLineRunTestWarningServiceImpl.java
@@ -7,9 +7,7 @@ import com.njcn.supervision.service.device.TempLineRunTestWarningService;
 import org.springframework.stereotype.Service;
 
 /**
-* @author web2023
-* @description 针对表【supervision_temp_line_run_test_warning】的数据库操作Service实现
-* @createDate 2024-07-03 13:52:39
+* @author wr
 */
 @Service
 public class TempLineRunTestWarningServiceImpl extends ServiceImpl<TempLineRunTestWarningMapper, TempLineRunTestWarning> implements TempLineRunTestWarningService {
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/GridDiagramService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/GridDiagramService.java
index a3740d097..5639c27d9 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/GridDiagramService.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/GridDiagramService.java
@@ -5,26 +5,23 @@ import com.njcn.supervision.pojo.vo.gridDiagram.GridDiagramVO;
 
 import java.util.List;
 
+/**
+ * @author wr
+ */
 public interface GridDiagramService {
 
     /**
      * 技术监督首页数据展示
-     * @param param
-     * @return
      */
     GridDiagramVO.Info getSupervisionData(StatisticsBizBaseParam param);
 
     /**
      * 技术监督详细页面展示
-     * @param param
-     * @return
      */
     List<GridDiagramVO.Info> getSupervisionDetailsData(StatisticsBizBaseParam param);
 
     /**
      * 技术监督市级详细页面展示
-     * @param param
-     * @return
      */
     GridDiagramVO.City getSupervisionCityDetailsData(StatisticsBizBaseParam param);
 }
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java
index db55cf1c7..f78147082 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java
@@ -32,7 +32,6 @@ import java.util.stream.Collectors;
 
 /**
  * @author wr
- * @description
  * @date 2024/6/13 14:53
  */
 @Service
@@ -137,7 +136,7 @@ public class GridDiagramServiceImpl implements GridDiagramService {
         List<String> handleList = warn.stream().filter(x -> x.getStatus() == 2).map(WarningLeaflet::getId).collect(Collectors.toList());
         warnVo.setWorkNum(warn.size());
         warnVo.setProcessedNum(handleList.size());
-        warnVo.setDisposalNum(warn.size() == 0 ? 0.0f : NumberUtil.round(handleList.size() * 100.0 / warn.size(), 2).floatValue());
+        warnVo.setDisposalNum(warn.isEmpty() ? 0.0f : NumberUtil.round(handleList.size() * 100.0 / warn.size(), 2).floatValue());
 
         //用户投诉问题(添加出来就是有问题的)
         GridDiagramVO userVo=new GridDiagramVO();
@@ -149,7 +148,7 @@ public class GridDiagramServiceImpl implements GridDiagramService {
         List<String> userHandleList = user.stream().filter(x -> x.getStatus() == 2).map(WarningLeaflet::getId).collect(Collectors.toList());
         userVo.setWorkNum(user.size());
         userVo.setProcessedNum(userHandleList.size());
-        userVo.setDisposalNum(user.size() == 0 ? 0.0f : NumberUtil.round(userHandleList.size() * 100.0 / user.size(), 2).floatValue());
+        userVo.setDisposalNum(user.isEmpty() ? 0.0f : NumberUtil.round(userHandleList.size() * 100.0 / user.size(), 2).floatValue());
 
         //计划问题(有问题的单子)
         GridDiagramVO surveyVo=new GridDiagramVO();
@@ -161,7 +160,7 @@ public class GridDiagramServiceImpl implements GridDiagramService {
         List<String> surveyHandleList = survey.stream().filter(x -> x.getStatus() == 2).map(WarningLeaflet::getId).collect(Collectors.toList());
         surveyVo.setWorkNum(survey.size());
         surveyVo.setProcessedNum(surveyHandleList.size());
-        surveyVo.setDisposalNum(survey.size() == 0 ? 0.0f : NumberUtil.round(surveyHandleList.size() * 100.0 / survey.size(), 2).floatValue());
+        surveyVo.setDisposalNum(survey.isEmpty() ? 0.0f : NumberUtil.round(surveyHandleList.size() * 100.0 / survey.size(), 2).floatValue());
 
         //试运行监测点问题
         GridDiagramVO trialRunVo=new GridDiagramVO();
@@ -172,7 +171,7 @@ public class GridDiagramServiceImpl implements GridDiagramService {
         List<String> trialRunHandleList = trialRun.stream().filter(x -> x.getStatus() == 2).map(WarningLeaflet::getId).collect(Collectors.toList());
         trialRunVo.setWorkNum(trialRun.size());
         trialRunVo.setProcessedNum(trialRunHandleList.size());
-        trialRunVo.setDisposalNum(trialRun.size() == 0 ? 0.0f : NumberUtil.round(trialRunHandleList.size() * 100.0 / trialRun.size(), 2).floatValue());
+        trialRunVo.setDisposalNum(trialRun.isEmpty() ? 0.0f : NumberUtil.round(trialRunHandleList.size() * 100.0 / trialRun.size(), 2).floatValue());
 
         City.setOnLine(warnVo);
         City.setUser(userVo);
@@ -185,7 +184,6 @@ public class GridDiagramServiceImpl implements GridDiagramService {
      * @param deptDTO   子集部门
      * @param ids       子集下所有部门信息
      * @param baseParam 查询条件
-     * @return
      */
     private GridDiagramVO.Info supervisionDetailsAdd(DeptDTO deptDTO, List<String> ids, StatisticsBizBaseParam baseParam) {
         GridDiagramVO.Info gridDiagramVO = new GridDiagramVO.Info();
@@ -242,7 +240,7 @@ public class GridDiagramServiceImpl implements GridDiagramService {
             List<String> handleList = list.stream().filter(x -> x.getStatus() == 2).map(WarningLeaflet::getId).collect(Collectors.toList());
             gridDiagramVO.setWorkNum(list.size());
             gridDiagramVO.setProcessedNum(handleList.size());
-            gridDiagramVO.setDisposalNum(list.size() == 0 ? 0.0f : NumberUtil.round(handleList.size() * 100.0 / list.size(), 2).floatValue());
+            gridDiagramVO.setDisposalNum(list.isEmpty() ? 0.0f : NumberUtil.round(handleList.size() * 100.0 / list.size(), 2).floatValue());
 
         } else {
             gridDiagramVO.setAssociatedNum(0);
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/ILineRunTestProblemService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/ILineRunTestProblemService.java
index ca54fef06..8e96276b3 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/ILineRunTestProblemService.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/ILineRunTestProblemService.java
@@ -15,14 +15,11 @@ public interface ILineRunTestProblemService{
 
     /**
      * 查询审核不通过，试运行列表。来表示电能问题
-     * @param supervisionTempLineDebugQuery
-     * @return
      */
     Page<SupervisionTempLineDebugVO> pageProblem(SupervisionTempLineDebugParam.SupervisionTempLineDebugQuery supervisionTempLineDebugQuery);
 
     /**
      * 发起告警单
-     * @param warningAddParam
      */
     void initiateWarningLeaflet(WarningAddParam.Extend warningAddParam);
 }
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/IWarningLeafletService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/IWarningLeafletService.java
index fa021b056..af49799bd 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/IWarningLeafletService.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/IWarningLeafletService.java
@@ -52,8 +52,6 @@ public interface IWarningLeafletService extends IBpmService<WarningLeaflet> {
 
     /**
      * 查询告警单信息，包含预警单和告警单
-     * @param warningLeafletQueryParam
-     * @return
      */
     Page<WarningLeafletVO> allPageData(WarningLeafletParam.WarningLeafletQueryParam warningLeafletQueryParam);
 
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/LineRunTestProblemServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/LineRunTestProblemServiceImpl.java
index 2bdb22747..37e8ad517 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/LineRunTestProblemServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/LineRunTestProblemServiceImpl.java
@@ -60,8 +60,7 @@ public class LineRunTestProblemServiceImpl implements ILineRunTestProblemService
                 DateUtil.beginOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchBeginTime())),
                 DateUtil.endOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchEndTime())));
         queryWrapper.orderByDesc("supervision_temp_line_run_test_warning.create_time");
-        Page<SupervisionTempLineDebugVO> page = lineDebugPOMapper.pageProblem(new Page<>(PageFactory.getPageNum(supervisionTempLineDebugQuery), PageFactory.getPageSize(supervisionTempLineDebugQuery)), queryWrapper);
-        return page;
+        return lineDebugPOMapper.pageProblem(new Page<>(PageFactory.getPageNum(supervisionTempLineDebugQuery), PageFactory.getPageSize(supervisionTempLineDebugQuery)), queryWrapper);
     }
 
     @Override
@@ -94,7 +93,7 @@ public class LineRunTestProblemServiceImpl implements ILineRunTestProblemService
     }
 
     private String assembleWarningDetail(SupervisionTempLineRunTestVO byId) {
-        String issueDetail = byId.getPowerSubstationName()
+        return byId.getPowerSubstationName()
                 .concat("_")
                 .concat(byId.getMonitoringTerminalName())
                 .concat("_")
@@ -102,6 +101,5 @@ public class LineRunTestProblemServiceImpl implements ILineRunTestProblemService
                 .concat("_")
                 .concat(byId.getLineName())
                 .concat("试运行评估问题");
-        return issueDetail;
     }
 }
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java
index 0d03cdefd..74fc26354 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java
@@ -31,7 +31,6 @@ import com.njcn.supervision.pojo.po.leaflet.WarningLeaflet;
 import com.njcn.supervision.pojo.vo.leaflet.WarningLeafletVO;
 import com.njcn.supervision.service.device.TempLineRunTestWarningService;
 import com.njcn.supervision.service.leaflet.IWarningLeafletService;
-import com.njcn.supervision.service.survey.ISurveyTestService;
 import com.njcn.supervision.utils.InstanceUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataTypeEnum;
@@ -43,7 +42,6 @@ import com.njcn.user.pojo.vo.UserVO;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.utils.RequestUtil;
 import org.springframework.beans.BeanUtils;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -69,9 +67,6 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
     @Resource
     private BpmProcessFeignClient bpmProcessFeignClient;
 
-    @Resource
-    private ISurveyTestService surveyTestService;
-
     @Resource
     private DeptFeignClient deptFeignClient;
 
@@ -133,7 +128,7 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
             if (CollUtil.isNotEmpty(deptIds)) {
                 List<Dept> data = deptFeignClient.getDeptInfoListByIds(deptIds).getData();
                 Map<String, String> deptMap = data.stream().collect(Collectors.toMap(Dept::getId, Dept::getName));
-                warningLeafletVOPage.getRecords().stream().forEach(x -> {
+                warningLeafletVOPage.getRecords().forEach(x -> {
                     if (deptMap.containsKey(x.getDutyOrgId())) {
                         x.setDutyOrgName(deptMap.get(x.getDutyOrgId()));
                     }
@@ -162,7 +157,7 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
         }
         if (Objects.equals(warningLeafletUpdateParam.getSaveOrCheckflag(), "2")) {
             // 发起 BPM 流程
-            Map<String, Object> processInstanceVariables = new HashMap<>();
+            Map<String, Object> processInstanceVariables = new HashMap<>(16);
             BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
             bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.WARN_LEAFLET.getKey());
             bpmProcessInstanceCreateReqDTO.setBusinessKey(warningLeaflet.getId());
@@ -191,7 +186,7 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
         warningLeaflet.setState(DataStateEnum.ENABLE.getCode());
 
         // 发起 BPM 流程
-        Map<String, Object> processInstanceVariables = new HashMap<>();
+        Map<String, Object> processInstanceVariables = new HashMap<>(16);
         BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
         bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.WARN_LEAFLET.getKey());
         bpmProcessInstanceCreateReqDTO.setBusinessKey(warningLeaflet.getId());
@@ -286,11 +281,11 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
         }
         warningLeafletVOQueryWrapper
                 .and(w -> w.in("supervision_warning_leaflet.status", Arrays.asList(BpmTaskStatusEnum.RUNNING.getStatus(),
-                                BpmTaskStatusEnum.APPROVE.getStatus(),
-                                BpmTaskStatusEnum.RETURN.getStatus()
+                                        BpmTaskStatusEnum.APPROVE.getStatus(),
+                                        BpmTaskStatusEnum.RETURN.getStatus()
                                 ))
-                        .or()
-                        .eq("supervision_warning_leaflet.dept_id", RequestUtil.getDeptIndex())
+                                .or()
+                                .eq("supervision_warning_leaflet.dept_id", RequestUtil.getDeptIndex())
                 );
         //筛选负责单位
         if (StrUtil.isNotBlank(warningLeafletQueryParam.getDeptIndex())) {
@@ -307,7 +302,7 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
         List<WarningLeafletVO> records = warningLeafletVOPage.getRecords();
         if (CollectionUtil.isNotEmpty(records)) {
             List<String> deptIds = records.stream().distinct().map(WarningLeafletVO::getDutyOrgId).collect(Collectors.toList());
-            Map<String, String> deptMap = new HashMap<>();
+            Map<String, String> deptMap = new HashMap<>(16);
             if (CollUtil.isNotEmpty(deptIds)) {
                 List<Dept> data = deptFeignClient.getDeptInfoListByIds(deptIds).getData();
                 deptMap.putAll(data.stream().collect(Collectors.toMap(Dept::getId, Dept::getName)));
@@ -391,7 +386,7 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
         List<WarningLeafletVO> records = warningLeafletVOPage.getRecords();
         if (CollectionUtil.isNotEmpty(records)) {
             List<String> deptIds = records.stream().distinct().map(WarningLeafletVO::getDutyOrgId).collect(Collectors.toList());
-            Map<String, String> deptMap = new HashMap<>();
+            Map<String, String> deptMap = new HashMap<>(16);
             if (CollUtil.isNotEmpty(deptIds)) {
                 List<Dept> data = deptFeignClient.getDeptInfoListByIds(deptIds).getData();
                 deptMap.putAll(data.stream().collect(Collectors.toMap(Dept::getId, Dept::getName)));
@@ -418,7 +413,7 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
     @Override
     public Boolean deleteWarningLeaflet(List<String> supervisionId) {
         List<WarningLeaflet> warningLeaflets = this.listByIds(supervisionId);
-        if(CollUtil.isEmpty(warningLeaflets)){
+        if (CollUtil.isEmpty(warningLeaflets)) {
             throw new BusinessException(SupervisionResponseEnum.EXISTENCE_OR_NOT);
         }
         //判断是否有权限操作
@@ -434,12 +429,12 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
         List<TodoVO> todoVOList = new ArrayList<>();
         //如果用户为管理员则不查
         UserVO userVO = userFeignClient.getUserById(RequestUtil.getUserIndex()).getData();
-        if(Objects.nonNull(userVO) && userVO.getType() == 1){
+        if (Objects.nonNull(userVO) && userVO.getType() == 1) {
             return todoVOList;
         }
         QueryWrapper<WarningLeafletVO> queryWrapper = new QueryWrapper<>();
         List<String> deptIds = deptFeignClient.getDepSonIdtByDeptId(RequestUtil.getDeptIndex()).getData();
-        if(CollectionUtil.isEmpty(deptIds)){
+        if (CollectionUtil.isEmpty(deptIds)) {
             return todoVOList;
         }
         queryWrapper.in("supervision_warning_leaflet.dept_id", deptIds)
@@ -447,12 +442,12 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
                 .eq("supervision_warning_leaflet.state", DataStateEnum.ENABLE.getCode())
                 .orderByDesc("supervision_warning_leaflet.Update_Time");
         List<WarningLeafletVO> warningLeafletVOList = this.baseMapper.getTodoBusiness(queryWrapper);
-        if(CollectionUtil.isNotEmpty(warningLeafletVOList)){
+        if (CollectionUtil.isNotEmpty(warningLeafletVOList)) {
             todoVOList = warningLeafletVOList.stream().map(item -> {
                 TodoVO todoVO = new TodoVO();
                 String title = "预警单";
-                Integer tabValue = 3;
-                if(item.getLeafletType()==2){
+                int tabValue = 3;
+                if (item.getLeafletType() == 2) {
                     title = "告警单";
                     tabValue = 4;
                 }
@@ -473,7 +468,7 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
 
 
     private String assembleOverLimitInfo(RMpPartHarmonicDetailDTO rMpPartHarmonicDetailDTO) {
-        String info = "";
+        String info;
         String leafletType = Objects.equals(rMpPartHarmonicDetailDTO.getAlarmFlag(), 1) ? "告警单" : "预警单";
         /*获取稳态统计指标*/
         List<DictData> steadyStatis = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.INDICATOR_TYPE.getCode()).getData();
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionPlanPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionPlanPOServiceImpl.java
index 130176d88..225753c13 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionPlanPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionPlanPOServiceImpl.java
@@ -20,16 +20,14 @@ import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.utils.PubUtils;
+import com.njcn.db.constant.DbConstant;
 import com.njcn.supervision.enums.SupervisionKeyEnum;
 import com.njcn.supervision.mapper.plan.SupervisionPlanPOMapper;
 import com.njcn.supervision.pojo.param.plan.SupervisionPlanParam;
-import com.njcn.supervision.pojo.po.device.CheckDevice;
 import com.njcn.supervision.pojo.po.plan.SupervisionPlanPO;
 import com.njcn.supervision.pojo.po.plan.SupervisionProblemPO;
 import com.njcn.supervision.pojo.vo.plan.SupervisionPlanVO;
-import com.njcn.supervision.service.leaflet.IWarningLeafletService;
 import com.njcn.supervision.service.plan.SupervisionPlanPOService;
-import com.njcn.supervision.service.plan.SupervisionProblemPOService;
 import com.njcn.supervision.utils.InstanceUtil;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.api.UserFeignClient;
@@ -62,8 +60,6 @@ public class SupervisionPlanPOServiceImpl extends ServiceImpl<SupervisionPlanPOM
     private final UserFeignClient userFeignClient;
     private final DeptFeignClient deptFeignClient;
     private final BpmProcessFeignClient bpmProcessFeignClient;
-    private final SupervisionProblemPOService supervisionProblemPOService;
-    private final IWarningLeafletService warningLeafletService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -171,11 +167,11 @@ public class SupervisionPlanPOServiceImpl extends ServiceImpl<SupervisionPlanPOM
 
 
         // 发起 BPM 流程
-        Map<String, Object> processInstanceVariables = new HashMap<>();
+        Map<String, Object> processInstanceVariables = new HashMap<>(16);
         BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
         bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.SUP_PLAN_ADD.getKey());
         bpmProcessInstanceCreateReqDTO.setBusinessKey(supervisionPlanPO.getPlanId());
-        bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>());
+        bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>(16));
         bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables);
         String processInstanceId = bpmProcessFeignClient.createProcessInstance(supervisionPlanPO.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData();
         // 将工作流的编号，更新到流程单中
@@ -199,7 +195,7 @@ public class SupervisionPlanPOServiceImpl extends ServiceImpl<SupervisionPlanPOM
         }
 
         if(StrUtil.isNotBlank(supvPlanParam.getSortBy())){
-            if(supvPlanParam.getOrderBy().equals("desc")){
+            if(DbConstant.DESC.equals(supvPlanParam.getOrderBy())){
                 lambdaQueryWrapper.orderByDesc(SupervisionPlanPO::getPlanSupvDate);
             }else {
                 lambdaQueryWrapper.orderByAsc(SupervisionPlanPO::getPlanSupvDate);
@@ -224,7 +220,7 @@ public class SupervisionPlanPOServiceImpl extends ServiceImpl<SupervisionPlanPOM
         List<SupervisionPlanVO> supvPlanVOList = BeanUtil.copyToList(page.getRecords(), SupervisionPlanVO.class);
         List<String> userIds = supvPlanVOList.stream().map(SupervisionPlanVO::getPlanUserId).distinct().collect(Collectors.toList());
         supvPlanVOList.forEach(item -> {
-            PvTerminalTreeVO pvTerminalTreeVO = null;
+            PvTerminalTreeVO pvTerminalTreeVO ;
             if (mapList.containsKey(item.getSupvOrgId())) {
                 pvTerminalTreeVO = mapList.get(item.getSupvOrgId());
                 item.setSupvOrgName(pvTerminalTreeVO.getName());
@@ -294,11 +290,11 @@ public class SupervisionPlanPOServiceImpl extends ServiceImpl<SupervisionPlanPOM
 //            throw new BusinessException("请填写完实施问题提交审核");
 //        }
         // 发起 BPM 流程
-        Map<String, Object> processInstanceVariables = new HashMap<>();
+        Map<String, Object> processInstanceVariables = new HashMap<>(16);
         BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
         bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.SUP_PLAN_ADD.getKey());
         bpmProcessInstanceCreateReqDTO.setBusinessKey(id);
-        bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<String, List<String>> ());
+        bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<> (16));
         bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables);
         String processInstanceId = bpmProcessFeignClient.createProcessInstance(byId.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData();
         // 将工作流的编号，更新到流程单中
@@ -316,7 +312,7 @@ public class SupervisionPlanPOServiceImpl extends ServiceImpl<SupervisionPlanPOM
         BeanUtils.copyProperties(byId,supervisionPlanVO);
 
         if (mapList.containsKey(supervisionPlanVO.getSupvOrgId())) {
-            PvTerminalTreeVO pvTerminalTreeVO = null;
+            PvTerminalTreeVO pvTerminalTreeVO ;
 
             pvTerminalTreeVO = mapList.get(supervisionPlanVO.getSupvOrgId());
             supervisionPlanVO.setSupvOrgName(pvTerminalTreeVO.getName());
@@ -446,8 +442,8 @@ public class SupervisionPlanPOServiceImpl extends ServiceImpl<SupervisionPlanPOM
      * 格式：planCreateTime发起的planName普测计划，由负责人leader测试后，于planComplateTime完成，其中subName在本次普测计划测试中存在电能质量问题，详细请查看附件
      */
     private String assembleIssueDetail(List<SupervisionProblemPO> supervisionProblemPOList, SupervisionPlanPO supervisionPlanPO) {
-        String join = String.join(",", supervisionProblemPOList.stream().map(SupervisionProblemPO::getRemark).collect(Collectors.toList()));
-        String issueDetail = "于"
+        String join = supervisionProblemPOList.stream().map(SupervisionProblemPO::getRemark).collect(Collectors.joining(","));
+        return "于"
                 .concat(LocalDateTimeUtil.format(supervisionPlanPO.getCreateTime(), DatePattern.CHINESE_DATE_PATTERN))
                 .concat("发起的")
                 .concat(supervisionPlanPO.getWorkPlanName())
@@ -458,7 +454,6 @@ public class SupervisionPlanPOServiceImpl extends ServiceImpl<SupervisionPlanPOM
                 .concat("完成，其中存在问题")
                 .concat(join)
                 .concat("在本次技术监督计划测试中存在电能质量问题，详细请查看问题附件");
-        return issueDetail;
     }
 
 
@@ -517,7 +512,7 @@ public class SupervisionPlanPOServiceImpl extends ServiceImpl<SupervisionPlanPOM
                 DateTime effectStartTime = DateUtil.parse(supvPlanParam.getEffectStartTime(), "yyyy-MM-dd HH:mm:ss");
                 //问题发现时间
                 DateTime problemOcTime = DateUtil.parse(problemOcTime1, "yyyy-MM-dd HH:mm:ss");
-                Boolean fly = false;
+                boolean fly = false;
                 if(StrUtil.isNotBlank(supvPlanParam.getEffectEndTime())){
                     //实施结束时间
                     DateTime effectEndTime = DateUtil.parse(supvPlanParam.getEffectEndTime(), "yyyy-MM-dd HH:mm:ss");
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionProblemPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionProblemPOServiceImpl.java
index 440ebd0a2..eff582807 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionProblemPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionProblemPOServiceImpl.java
@@ -17,8 +17,6 @@ import com.njcn.supervision.pojo.param.plan.SupervisopnProblemParam;
 import com.njcn.supervision.pojo.po.plan.SupervisionPlanPO;
 import com.njcn.supervision.pojo.po.plan.SupervisionProblemPO;
 import com.njcn.supervision.service.plan.SupervisionProblemPOService;
-import com.njcn.system.api.DicDataFeignClient;
-import com.njcn.system.pojo.po.DictData;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.pojo.vo.PvTerminalTreeVO;
 import com.njcn.web.factory.PageFactory;
@@ -44,7 +42,6 @@ public class SupervisionProblemPOServiceImpl extends ServiceImpl<SupervisionProb
 
 
     private final SupervisionPlanPOMapper supervisionPlanPOMapper;
-    private final DicDataFeignClient dicDataFeignClient;
 
     private final DeptFeignClient deptFeignClient;
 
@@ -63,7 +60,7 @@ public class SupervisionProblemPOServiceImpl extends ServiceImpl<SupervisionProb
 
     @Override
     public Page<SupervisionProblemPO> pageProblem(SupervisopnProblemParam supvProblemParam) {
-        DictData stamped_report = dicDataFeignClient.getDicDataByCode("Stamped_Report").getData();
+
 
         LambdaQueryWrapper<SupervisionProblemPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(SupervisionProblemPO::getPlanId, supvProblemParam.getPlanId());
@@ -77,6 +74,7 @@ public class SupervisionProblemPOServiceImpl extends ServiceImpl<SupervisionProb
                 item.setDutyOrgName(mapCode.get(item.getDutyOrgId()).getName());
             }
 
+//            DictData stamped_report = dicDataFeignClient.getDicDataByCode("Stamped_Report").getData();
 //            List<SupvFile> supvFileList = supvFileMapper.selectList(new LambdaQueryWrapper<SupvFile>().eq(SupvFile::getBusiId, item.getProblemId()).eq(SupvFile::getType, 1));
 //            if (CollUtil.isNotEmpty(supvFileList)) {
 //                for(SupvFile supvFile:supvFileList){
@@ -93,7 +91,9 @@ public class SupervisionProblemPOServiceImpl extends ServiceImpl<SupervisionProb
         return page;
     }
 
-    //判断是否存在时间范围内
+    /**
+     * 判断是否存在时间范围内
+     */
     public void checkParam(String id, String time) {
         if (StrUtil.isNotBlank(time)) {
             SupervisionPlanPO supvPlan = supervisionPlanPOMapper.selectById(id);
@@ -106,7 +106,7 @@ public class SupervisionProblemPOServiceImpl extends ServiceImpl<SupervisionProb
                     DateTime effectStartTime = DateUtil.parse(DateUtil.formatLocalDateTime(supvPlan.getEffectStartTime()), "yyyy-MM-dd HH:mm:ss");
                     //问题发现时间
                     DateTime problemOcTime = DateUtil.parse(time, "yyyy-MM-dd HH:mm:ss");
-                    Boolean fly = false;
+                    boolean fly = false;
                     if (ObjectUtil.isNotNull(supvPlan.getEffectEndTime())) {
                         //实施结束时间
                         DateTime effectEndTime = DateUtil.parse(DateUtil.formatLocalDateTime(supvPlan.getEffectEndTime()), "yyyy-MM-dd HH:mm:ss");
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java
index 7c4285cc1..e13bd9473 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java
@@ -2,9 +2,7 @@ package com.njcn.supervision.service.problem.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -83,7 +81,7 @@ public class SupervisionUserComplaintPOServiceImpl extends ServiceImpl<Supervisi
             if (CollUtil.isNotEmpty(deptIds)) {
                 List<Dept> data = deptFeignClient.getDeptInfoListByIds(deptIds).getData();
                 Map<String, String> deptMap = data.stream().collect(Collectors.toMap(Dept::getId, Dept::getName));
-                page.getRecords().stream().forEach(x -> {
+                page.getRecords().forEach(x -> {
                     if (deptMap.containsKey(x.getDutyOrgId())) {
                         x.setDutyOrgName(deptMap.get(x.getDutyOrgId()));
                     }
@@ -97,8 +95,6 @@ public class SupervisionUserComplaintPOServiceImpl extends ServiceImpl<Supervisi
     @Transactional(rollbackFor = Exception.class)
     public void initiateWarningLeaflet(WarningAddParam warningAddParam) {
         SupervisionUserComplaintPO supervisionUserComplaintPO = this.getById(warningAddParam.getId());
-        //组装告警单
-        String complainteDetail = assembleComplainteDetail(supervisionUserComplaintPO);
         /*
          * 1、预告警单名称，此处暂时用用户名+投诉
          * 2、预告警编号暂时随机by yxb
@@ -121,16 +117,4 @@ public class SupervisionUserComplaintPOServiceImpl extends ServiceImpl<Supervisi
         this.lambdaUpdate().eq(SupervisionUserComplaintPO::getId,warningAddParam.getId()).set(SupervisionUserComplaintPO::getInitiateWarningFlag,1).update();
     }
 
-    private String assembleComplainteDetail(SupervisionUserComplaintPO byId) {
-        String issueDetail = "于"
-                .concat(LocalDateTimeUtil.format(byId.getCreateTime(), DatePattern.CHINESE_DATE_PATTERN))
-                .concat(",用户")
-                .concat(byId.getUserName())
-                .concat("发起的用户投诉")
-                .concat("投诉内容")
-                .concat(byId.getComplaintText())
-                ;
-        return issueDetail;
-    }
-
 }
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/SupervisionGeneralSurveyPlanDetailPOService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/SupervisionGeneralSurveyPlanDetailPOService.java
index ad84d1715..e857cf003 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/SupervisionGeneralSurveyPlanDetailPOService.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/SupervisionGeneralSurveyPlanDetailPOService.java
@@ -2,11 +2,10 @@ package com.njcn.supervision.service.survey;
 
 import com.github.jeffreyning.mybatisplus.service.IMppService;
 import com.njcn.supervision.pojo.po.survey.SupervisionGeneralSurveyPlanDetailPO;
-    /**
- * 
+
+/**
  * Description:
  * Date: 2024/5/13  18:35【需求编号】
- *
  * @author clam
  * @version V1.0.0
  */
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java
index 839910e40..0028d5273 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java
@@ -26,9 +26,6 @@ import com.njcn.supervision.enums.SupervisionKeyEnum;
 import com.njcn.supervision.enums.SupervisionResponseEnum;
 import com.njcn.supervision.mapper.survey.SurveyPlanMapper;
 import com.njcn.supervision.pojo.param.survey.SurveyPlanParam;
-import com.njcn.supervision.pojo.po.device.CheckDevice;
-import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
-import com.njcn.supervision.pojo.po.device.SupervisionTempLineRunTestPO;
 import com.njcn.supervision.pojo.po.survey.SurveyPlan;
 import com.njcn.supervision.pojo.po.survey.SurveyTest;
 import com.njcn.supervision.pojo.vo.survey.SurveyPlanVO;
@@ -39,7 +36,6 @@ import com.njcn.supervision.utils.InstanceUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.pojo.po.DictData;
 import com.njcn.user.api.DeptFeignClient;
-import com.njcn.user.api.UserFeignClient;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.utils.RequestUtil;
 import org.apache.commons.lang.StringUtils;
@@ -62,8 +58,6 @@ import java.util.stream.Collectors;
 @Service
 public class SurveyPlanServiceImpl extends ServiceImpl<SurveyPlanMapper, SurveyPlan> implements ISurveyPlanService {
 
-    @Resource
-    private UserFeignClient userFeignClient;
 
     @Resource
     private BpmProcessFeignClient bpmProcessFeignClient;
@@ -163,11 +157,11 @@ public class SurveyPlanServiceImpl extends ServiceImpl<SurveyPlanMapper, SurveyP
 
         // 发起 BPM 流程
         if(Objects.equals(surveyPlanParam.getSaveOrCheckflag(),"2")){
-            Map<String, Object> processInstanceVariables = new HashMap<>();
+            Map<String, Object> processInstanceVariables = new HashMap<>(16);
             BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
             bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.SURVEY_PLAN.getKey());
             bpmProcessInstanceCreateReqDTO.setBusinessKey(surveyPlan.getId());
-            bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>());
+            bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>(16));
             bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables);
             String processInstanceId = bpmProcessFeignClient.createProcessInstance(surveyPlan.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData();
             // 将工作流的编号，更新到流程单中
@@ -192,11 +186,11 @@ public class SurveyPlanServiceImpl extends ServiceImpl<SurveyPlanMapper, SurveyP
         //处理历史流程id列表
         String historyInstanceIds = InstanceUtil.dealHistoryId(surveyPlan.getProcessInstanceId(), surveyPlan.getHistoryInstanceId());
         // 发起 BPM 流程
-        Map<String, Object> processInstanceVariables = new HashMap<>();
+        Map<String, Object> processInstanceVariables = new HashMap<>(16);
         BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
         bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.SURVEY_PLAN.getKey());
         bpmProcessInstanceCreateReqDTO.setBusinessKey(surveyPlan.getId());
-        bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>());
+        bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>(16));
         bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables);
         String processInstanceId = bpmProcessFeignClient.createProcessInstance(surveyPlan.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData();
         // 将工作流的编号，更新到流程单中
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java
index 108db5e29..d7b28ad1f 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java
@@ -2,7 +2,6 @@ package com.njcn.supervision.service.survey.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.text.StrPool;
@@ -317,16 +316,6 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
         if(Objects.nonNull(data)){
             name = data.getName();
         }
-//        String sign = name.concat("由")
-//                .concat(surveyTestVO.getDeptName())
-//                .concat("负责")
-//                .concat(surveyTestVO.getPlanName())
-//                .concat("，由")
-//                .concat(surveyTestVO.getCompleteBy())
-//                .concat("，在")
-//                .concat(LocalDateTimeUtil.format(surveyTestVO.getCompleteTime(),DatePattern.CHINESE_DATE_PATTERN))
-//                .concat("完成计划测试。")
-//                ;
         String  sign = name.concat("->")
                 .concat(surveyTestVO.getSupvObjectName());
         bpmInstanceInfo.setInstanceSign(sign);
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/IUserReportDeleteService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/IUserReportDeleteService.java
index a6694c57e..9ca7fc00a 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/IUserReportDeleteService.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/IUserReportDeleteService.java
@@ -17,15 +17,11 @@ public interface IUserReportDeleteService extends IBpmService<UserReportPO> {
 
     /**
      * 干扰源用户管理信息删除功能
-     * @param userReportParam
-     * @return
      */
     String addEditor(UserReportParam userReportParam);
 
     /**
      * 干扰源用户管理删除重新发送功能
-     * @param userReportParam
-     * @return
      */
     String resend(UserReportParam userReportParam);
 }
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/IUserReportRenewalService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/IUserReportRenewalService.java
index ff7ddff1e..2908653d2 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/IUserReportRenewalService.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/IUserReportRenewalService.java
@@ -18,29 +18,21 @@ public interface IUserReportRenewalService extends IBpmService<UserReportRenewal
 
     /**
      * 干扰源用户管理更新后信息查看
-     * @param
-     * @return
      */
     UserReportRenewalPO getUserReportUpdateById(String id);
 
     /**
      * 干扰源用户管理更新信息新增功能
-     * @param userReportParam
-     * @return
      */
     String addEditor(UserReportParam userReportParam);
 
     /**
      * 干扰源用户管理更新信息重新发送功能
-     * @param userReportParam
-     * @return
      */
     String resend(UserReportParam userReportParam);
 
     /**
      * 取消功能
-     * @param cancelReqVO
-     * @return
      */
     String cancelUserReportRenewal(BpmProcessInstanceCancelParam cancelReqVO);
 }
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportDeleteServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportDeleteServiceImpl.java
index 32dc1cf85..67cbbf0f9 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportDeleteServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportDeleteServiceImpl.java
@@ -11,7 +11,6 @@ import com.njcn.bpm.pojo.dto.BpmInstanceInfo;
 import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.device.pq.api.TerminalBaseClient;
 import com.njcn.supervision.enums.SupervisionKeyEnum;
 import com.njcn.supervision.mapper.user.UserReportPOMapper;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
@@ -49,19 +48,18 @@ public class UserReportDeleteServiceImpl extends ServiceImpl<UserReportPOMapper,
     private final UserReportSubstationPOService userReportSubstationPOService;
     private final UserReportSensitivePOService userReportSensitivePOService;
     private final BpmProcessFeignClient bpmProcessFeignClient;
-    private final TerminalBaseClient translateClient;
     private final SupervisionTempLineReportService lineReportService;
     private final SupervisionTempLineDebugPOService lineDebugService;
     private final ISupervisionTempLineRunTestService lineRunTestService;
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateProcessStatus(String businessId, Integer status) {
-        if (status == BpmTaskStatusEnum.RUNNING.getStatus()) {
-            /**
+        if (Objects.equals(status, BpmTaskStatusEnum.RUNNING.getStatus())) {
+
+            /*
              * 1。删除常态化用户所有信息（）
              * 2.删除绑定监测点信息（根据常态化用户信息找到监测点）
              * 3.删除试运行信息，
-             *
              */
             //电网工程类用户额外数据
             userReportProjectPOService.update(new LambdaUpdateWrapper<UserReportProjectPO>()
@@ -133,7 +131,7 @@ public class UserReportDeleteServiceImpl extends ServiceImpl<UserReportPOMapper,
         //处理历史流程id列表
         String historyInstanceIds = InstanceUtil.dealHistoryId(po.getProcessInstanceId(), po.getHistoryInstanceId());
         // 发起 BPM 流程
-        Map<String, Object> processInstanceVariables = new HashMap<>();
+        Map<String, Object> processInstanceVariables = new HashMap<>(16);
         BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
         bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.USER_REPORT_DELETE.getKey());
         bpmProcessInstanceCreateReqDTO.setBusinessKey(userReportParam.getId());
@@ -166,7 +164,7 @@ public class UserReportDeleteServiceImpl extends ServiceImpl<UserReportPOMapper,
         //处理历史流程id列表
         String historyInstanceIds = InstanceUtil.dealHistoryId(po.getProcessInstanceId(), po.getHistoryInstanceId());
         // 发起 BPM 流程
-        Map<String, Object> processInstanceVariables = new HashMap<>();
+        Map<String, Object> processInstanceVariables = new HashMap<>(16);
         BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
         bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.USER_REPORT_DELETE.getKey());
         bpmProcessInstanceCreateReqDTO.setBusinessKey(userReportParam.getId());
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java
index 65d696a9d..dbd2ba580 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java
@@ -19,7 +19,6 @@ import com.njcn.supervision.enums.SupervisionKeyEnum;
 import com.njcn.supervision.enums.UserNatureEnum;
 import com.njcn.supervision.mapper.user.UserReportNormalMapper;
 import com.njcn.supervision.pojo.param.user.UserReportNormalParam;
-import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
 import com.njcn.supervision.pojo.po.user.*;
 import com.njcn.supervision.pojo.vo.user.UserReportVO;
 import com.njcn.supervision.service.user.*;
@@ -78,7 +77,7 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
         userReportNormalPO = this.getById(userReportNormalPO.getId());
         if (Objects.equals(userReportNormalParam.getSaveOrCheckflag(), "2")) {
             // 发起 BPM 流程
-            Map<String, Object> processInstanceVariables = new HashMap<>();
+            Map<String, Object> processInstanceVariables = new HashMap<>(16);
             BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
             if (0 == userReportNormalParam.getType()) {
                 bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.USER_GO_NET.getKey());
@@ -108,7 +107,7 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
         userReportNormalPO.setState(DataStateEnum.ENABLE.getCode());
         userReportNormalPO.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
         // 发起 BPM 流程
-        Map<String, Object> processInstanceVariables = new HashMap<>();
+        Map<String, Object> processInstanceVariables = new HashMap<>(16);
         BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
         if (userReportNormalPO.getType() == 0) {
             bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.USER_GO_NET.getKey());
@@ -277,8 +276,8 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
         );
         Optional<String> netInReport = list.stream().filter(x -> 0 == x.getType()).map(UserReportNormalPO::getReportUrl).findFirst();
         Optional<String> governReport = list.stream().filter(x -> 1 == x.getType()).map(UserReportNormalPO::getReportUrl).findFirst();
-        userReportVO.setNetInReport(Arrays.asList(netInReport.isPresent() ? netInReport.get() : null));
-        userReportVO.setGovernReport(Arrays.asList(governReport.isPresent() ? governReport.get() : null));
+        userReportVO.setNetInReport(Collections.singletonList(netInReport.orElse(null)));
+        userReportVO.setGovernReport(Collections.singletonList(governReport.orElse(null)));
         return userReportVO;
     }
 }
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
index 2df7113a8..9c81eaac6 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
@@ -17,7 +17,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.bpm.api.BpmProcessFeignClient;
 import com.njcn.bpm.enums.BpmProcessInstanceStatusEnum;
-import com.njcn.bpm.enums.BpmResponseEnum;
 import com.njcn.bpm.enums.BpmTaskStatusEnum;
 import com.njcn.bpm.pojo.dto.BpmInstanceInfo;
 import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO;
@@ -40,7 +39,6 @@ import com.njcn.supervision.mapper.user.UserReportPOMapper;
 import com.njcn.supervision.pojo.dto.SensitiveReportExcel;
 import com.njcn.supervision.pojo.dto.SensitiveUserSExcel;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
-import com.njcn.supervision.pojo.po.device.CheckDevice;
 import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;
 import com.njcn.supervision.pojo.po.user.*;
 import com.njcn.supervision.pojo.vo.user.UserReportVO;
@@ -105,11 +103,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
         BeanUtils.copyProperties(userReportParam, userReportPO);
         userReportPO.setState(DataStateEnum.ENABLE.getCode());
         if (Objects.equals(userReportParam.getSaveOrCheckflag(), "2")) {
-            if (StringUtils.isEmpty(userReportParam.getId())) {
-                checkProjectName(userReportParam, false);
-            } else {
-                checkProjectName(userReportParam, true);
-            }
+            checkProjectName(userReportParam, !StringUtils.isEmpty(userReportParam.getId()));
         }
         //判断工程名称是否有重复的
         if (Objects.equals(userReportParam.getSaveOrCheckflag(), "1")) {
@@ -164,7 +158,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
 
         // 如何未提交审则不需要发起 BPM 流程
         if (Objects.equals(userReportParam.getSaveOrCheckflag(), "2")) {
-            Map<String, Object> processInstanceVariables = new HashMap<>();
+            Map<String, Object> processInstanceVariables = new HashMap<>(16);
             BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
             //干扰源用户台账和敏感用户审核流程
             if (ObjectUtil.isNotNull(userReportParam.getDataType())) {
@@ -232,7 +226,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
 
 
         // 发起 BPM 流程
-        Map<String, Object> processInstanceVariables = new HashMap<>();
+        Map<String, Object> processInstanceVariables = new HashMap<>(16);
         BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
         String key = SupervisionKeyEnum.BUILD_USER_INFO.getKey();
         if(ObjectUtil.isNotNull(userReportPO.getDataType())){
@@ -403,8 +397,8 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
         );
         Optional<String> netInReport = list.stream().filter(x -> 0 == x.getType()).map(UserReportNormalPO::getReportUrl).findFirst();
         Optional<String> governReport = list.stream().filter(x -> 1 == x.getType()).map(UserReportNormalPO::getReportUrl).findFirst();
-        userReportVO.setNetInReport(Arrays.asList(netInReport.isPresent() ? netInReport.get() : null));
-        userReportVO.setGovernReport(Arrays.asList(governReport.isPresent() ? governReport.get() : null));
+        userReportVO.setNetInReport(Collections.singletonList(netInReport.orElse(null)));
+        userReportVO.setGovernReport(Collections.singletonList(governReport.orElse(null)));
         return userReportVO;
     }
 
@@ -451,7 +445,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
                 .eq(UserReportPO::getDataType, 0)
                 .in(CollectionUtil.isNotEmpty(data), UserReportPO::getOrgId, data)
                 .list();
-        List<UserReportVO> collect = list.stream().map(temp -> {
+        return list.stream().map(temp -> {
             UserReportVO vo = new UserReportVO();
             BeanUtils.copyProperties(temp, vo);
             UserVO userVO = userFeignClient.getUserById(temp.getReporter()).getData();
@@ -460,7 +454,6 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
             vo.setOrgName(deptFeignClient.getDeptById(temp.getOrgId()).getData().getName());
             return vo;
         }).collect(Collectors.toList());
-        return collect;
     }
 
     @Override
@@ -538,7 +531,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
             }
             temp.setNeedGovernance(needGovernance);
             //添加治理评估文件，需先判断入网评估是否审核通过
-            Boolean type = true;
+            boolean type = true;
             if (1 == temp.getNeedGovernance()) {
                 List<UserReportNormalPO> list = userReportNormalMapper.selectList(new LambdaQueryWrapper<UserReportNormalPO>()
                         .eq(UserReportNormalPO::getUserReportId, temp.getId())
@@ -672,7 +665,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
         pullDown = new PullDown();
         pullDown.setFirstCol(1);
         pullDown.setLastCol(1);
-        pullDown.setStrings(jiBeiArea.stream().filter(x -> !x.getName().equals("风光储") && !x.getName().equals("超高压")).map(DictData::getName).collect(Collectors.toList()));
+        pullDown.setStrings(jiBeiArea.stream().filter(x -> !"风光储".equals(x.getName()) && !"超高压".equals(x.getName())).map(DictData::getName).collect(Collectors.toList()));
         pullDowns.add(pullDown);
 
         pullDown = new PullDown();
@@ -760,8 +753,10 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
     @Transactional(rollbackFor = Exception.class)
     public void importSensitiveUserData(MultipartFile file, HttpServletResponse response) {
         ImportParams params = new ImportParams();
-        params.setHeadRows(1);//表头
-        params.setTitleRows(1);//标题
+        //表头
+        params.setHeadRows(1);
+        //标题
+        params.setTitleRows(1);
         params.setNeedVerify(true);
         params.setStartSheetIndex(0);
         params.setSheetNum(1);
@@ -951,7 +946,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
         pullDown = new PullDown();
         pullDown.setFirstCol(16);
         pullDown.setLastCol(16);
-        pullDown.setStrings(treeString.keySet().stream().collect(Collectors.toList()));
+        pullDown.setStrings(new ArrayList<>(treeString.keySet()));
         pullDowns.add(pullDown);
 
         pullDown = new PullDown();
@@ -973,8 +968,10 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
     @Transactional(rollbackFor = Exception.class)
     public void importSensitiveReportData(MultipartFile file, HttpServletResponse response) {
         ImportParams params = new ImportParams();
-        params.setHeadRows(1);//表头
-        params.setTitleRows(1);//标题
+        //表头
+        params.setHeadRows(1);
+        //标题
+        params.setTitleRows(1);
         params.setNeedVerify(true);
         params.setStartSheetIndex(0);
         params.setSheetNum(1);
@@ -1051,7 +1048,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
                             userReportProjectPO.setAgreementCapacity(reportExcel.getUserAgreementCapacity().doubleValue());
                         }
                         if (StrUtil.isNotBlank(reportExcel.getNonlinearLoadType())) {
-                            userReportProjectPO.setNonlinearDeviceType(treeString.containsKey(reportExcel.getNonlinearLoadType()) ? treeString.get(reportExcel.getNonlinearLoadType()) : null);
+                            userReportProjectPO.setNonlinearDeviceType(treeString.getOrDefault(reportExcel.getNonlinearLoadType(), null));
                         }
 
                         userReportProjectPO.setNeedGovernance(reportExcel.getNeedGovernance());
@@ -1135,9 +1132,6 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
 
     /**
      * 获取所有字段为null的属性名
-     *
-     * @param source
-     * @return
      */
     public String[] getNullPropertyNames(Object source) {
         final BeanWrapper src = new BeanWrapperImpl(source);
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportRenewalServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportRenewalServiceImpl.java
index 140f2a1e4..aa607198f 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportRenewalServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportRenewalServiceImpl.java
@@ -19,7 +19,6 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.supervision.enums.*;
 import com.njcn.supervision.mapper.user.UserReportRenewalMapper;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
-import com.njcn.supervision.pojo.po.device.CheckDevice;
 import com.njcn.supervision.pojo.po.user.*;
 import com.njcn.supervision.service.user.*;
 import com.njcn.supervision.utils.InstanceUtil;
@@ -58,7 +57,7 @@ public class UserReportRenewalServiceImpl extends ServiceImpl<UserReportRenewalM
     public void updateProcessStatus(String businessId, Integer status) {
         UserReportRenewalPO userReportPO = this.getById(businessId);
         if (ObjUtil.isNotNull(userReportPO)) {
-            if (BpmTaskStatusEnum.APPROVE.getStatus() == status) {
+            if (Objects.equals(BpmTaskStatusEnum.APPROVE.getStatus(), status)) {
                 UserReportParam userReportParam = new UserReportParam();
                 userReportParam.setId(businessId);
                 userReportPO.getUserReportMessageJson().setSaveOrCheckflag("0");
@@ -119,11 +118,7 @@ public class UserReportRenewalServiceImpl extends ServiceImpl<UserReportRenewalM
         userReportPO.setState(DataStateEnum.ENABLE.getCode());
         if (Objects.equals(userReportParam.getSaveOrCheckflag(), "2")) {
             po.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
-            if (StringUtils.isEmpty(userReportParam.getId())) {
-                userReportPOService.checkProjectName(userReportParam, false);
-            } else {
-                userReportPOService.checkProjectName(userReportParam, true);
-            }
+            userReportPOService.checkProjectName(userReportParam, !StringUtils.isEmpty(userReportParam.getId()));
         }else {
             po.setStatus(BpmTaskStatusEnum.WAIT.getStatus());
         }
@@ -140,14 +135,14 @@ public class UserReportRenewalServiceImpl extends ServiceImpl<UserReportRenewalM
         if (Objects.equals(userReportParam.getSaveOrCheckflag(), "2")) {
             UserReportRenewalPO byId = this.getById(userReportParam.getId());
             if(ObjectUtil.isNotNull(byId)){
-                if(FlowStatusEnum.APPROVE.getCode()==byId.getStatus()) {
+                if(Objects.equals(FlowStatusEnum.APPROVE.getCode(), byId.getStatus())) {
                     //处理历史流程id列表
                     String historyInstanceIds = InstanceUtil.dealHistoryId(byId.getProcessInstanceId(), byId.getHistoryInstanceId());
                     //保存历史流程id列表
                     po.setHistoryInstanceId(historyInstanceIds);
                 }
             }
-            Map<String, Object> processInstanceVariables = new HashMap<>();
+            Map<String, Object> processInstanceVariables = new HashMap<>(16);
             BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
             bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.USER_REPORT_RENEWAL.getKey());
             bpmProcessInstanceCreateReqDTO.setBusinessKey(userReportPO.getId());
@@ -182,7 +177,7 @@ public class UserReportRenewalServiceImpl extends ServiceImpl<UserReportRenewalM
         addition(userReportParam, userReportParam.getUserType());
 
         // 发起 BPM 流程
-        Map<String, Object> processInstanceVariables = new HashMap<>();
+        Map<String, Object> processInstanceVariables = new HashMap<>(16);
         BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
         bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.USER_REPORT_RENEWAL.getKey());
         bpmProcessInstanceCreateReqDTO.setBusinessKey(userReportParam.getId());
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/utils/InstanceUtil.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/utils/InstanceUtil.java
index 4a9c81bf7..ed8678a9e 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/utils/InstanceUtil.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/utils/InstanceUtil.java
@@ -15,6 +15,7 @@ import java.util.stream.Collectors;
 
 /**
  * 处理流程实例的工具类
+ * @author hongawen
  */
 public class InstanceUtil {
 
diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/SysDicTreePO.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/SysDicTreePO.java
index e2c4ef0f4..6cdfee042 100644
--- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/SysDicTreePO.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/SysDicTreePO.java
@@ -42,7 +42,7 @@ public class SysDicTreePO extends BaseEntity {
     /**
      * 名称
      */
-    @TableField(value = "`name`")
+    @TableField(value = "name")
     private String name;
 
     /**
@@ -76,7 +76,7 @@ public class SysDicTreePO extends BaseEntity {
     /**
      * 状态（字典 0正常 1停用 2删除）
      */
-    @TableField(value = "`status`")
+    @TableField(value = "status")
     private Integer status;
 
     /**
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictDataMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictDataMapper.xml
index bcf022d74..3c10167cf 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictDataMapper.xml
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictDataMapper.xml
@@ -38,7 +38,7 @@
                  LEFT JOIN sys_dict_type sdt ON sdt.Id = sys_dict_data.Type_Id
         WHERE sys_dict_data.name = #{dicName}
           and sys_dict_data.state = 1
-          and sdt.`Name`= #{typeName}
+          and sdt.Name= #{typeName}
         order by sys_dict_data.sort
     </select>