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 995846ace..c01ed817d 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,
@@ -51,8 +51,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}
@@ -85,7 +85,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>
 
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqDataVerifyCountMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqDataVerifyCountMapper.xml
index 8e343716c..5d6529efd 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqDataVerifyCountMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqDataVerifyCountMapper.xml
@@ -30,12 +30,12 @@
 
 	<select id="getAnomalousData" resultType="OnlineMonitorVo">
 		SELECT DISTINCT
-		t6.`Name` gdName,
-		t5.`Name` subName,
-		t4.`Name` deviceName,
+		t6.Name gdName,
+		t5.Name subName,
+		t4.Name deviceName,
 		t1.Line_Id lineId,
-		t2.`Name` lineName,
-		t8.`Name` monitorObjType,
+		t2.Name lineName,
+		t8.Name monitorObjType,
 		t7.Obj_Name monitorObj,
 		"异常数据" as target,
 		count(t1.time_id) lastDay
@@ -67,4 +67,4 @@
 		order by lastDay desc
 	</select>
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TreeMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TreeMapper.xml
index 3d59ca347..e5d2c6293 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TreeMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TreeMapper.xml
@@ -381,7 +381,7 @@
             line.LEVEL,
             line.sort,
             line.pids,
-            CONCAT(voltage.name, '_', line.name, '(',device.`Name`,')') name,
+            CONCAT(voltage.name, '_', line.name, '(',device.Name,')') name,
             comFlag.Com_Flag,
             detail.pt_type,
             detail.obj_id
diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml
index c1f71647b..5f97b9e0e 100644
--- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml
+++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml
@@ -1542,7 +1542,7 @@
     <select id="selectByIds" resultType="com.njcn.device.pq.pojo.vo.LineDetailVO$Detail">
         SELECT DISTINCT
             line.id as lineId,
-            dept.`Name` deptName,
+            dept.Name deptName,
             area.name as areaId,
             gd.NAME gdName,
             substation.NAME subName,
diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/rstatintegrity/mapper/mapping/RStatIntegrityDMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/rstatintegrity/mapper/mapping/RStatIntegrityDMapper.xml
index 79711d91d..ca7f10e2f 100644
--- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/rstatintegrity/mapper/mapping/RStatIntegrityDMapper.xml
+++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/rstatintegrity/mapper/mapping/RStatIntegrityDMapper.xml
@@ -112,12 +112,12 @@
 
     <select id="getNoData" resultType="OnlineMonitorVo">
         SELECT DISTINCT
-            t6.`Name` gdName,
-            t5.`Name` subName,
-            t4.`Name` deviceName,
+            t6.Name gdName,
+            t5.Name subName,
+            t4.Name deviceName,
             t1.line_index lineId,
-            t2.`Name` lineName,
-            t8.`Name` monitorObjType,
+            t2.Name lineName,
+            t8.Name monitorObjType,
             t7.Obj_Name monitorObj,
             "完整性为0" as target,
             count(t1.time_id) lastDay
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java
index 932db2455..c79bcd1cb 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java
@@ -22,10 +22,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -67,7 +64,7 @@ public class AreaInfoServiceImpl implements AreaInfoService {
 
         if (CollectionUtil.isNotEmpty(lineIds)) {
             List<AreaLineInfoVO> resList = lineFeignClient.getBaseLineAreaInfo(lineIds).getData();
-            if (1 == deviceInfoParam.getIsPollution()) {
+            if (Objects.equals(1,deviceInfoParam.getIsPollution())) {
                 OnlineRateParam.Info param = new OnlineRateParam.Info();
                 param.setIds(resList.stream().map(AreaLineInfoVO::getLineId).distinct().collect(Collectors.toList()));
                 param.setDicData(deviceInfoParam.getDicData());
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/PmsLineWarningMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/PmsLineWarningMapper.xml
index 3aac7c07f..67f9c82b9 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/PmsLineWarningMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/PmsLineWarningMapper.xml
@@ -7,10 +7,10 @@
             p1.id id,
             p2.Org_Name dept,
             p2.Powerr_Name substation,
-            p3.`Name` deviceName,
-            p2.`Name` lineName,
+            p3.Name deviceName,
+            p2.Name lineName,
             p1.line_id lineId,
-            p4.`Name` businessType,
+            p4.Name businessType,
             p2.Monitor_Object_Name objectName,
             p1.target_type targetType,
             p1.over_limit_day overLimitDay,
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/PqDashboardPageMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/PqDashboardPageMapper.xml
index 9ba4d29c5..6ad9e483e 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/PqDashboardPageMapper.xml
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/PqDashboardPageMapper.xml
@@ -18,7 +18,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    Id, page_name, thumbnail, remark, container_config, sort, `state`, Create_By, Create_Time, 
+    Id, page_name, thumbnail, remark, container_config, sort, "state", Create_By, Create_Time,
     Update_By, Update_Time
   </sql>
 
@@ -31,4 +31,4 @@
        ${ew.sqlSegment}
     </where>
   </select>
-</mapper>
\ No newline at end of file
+</mapper>