diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 80b4026..59b729c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -148,7 +148,7 @@
      */
     @RequestMapping(value = "/delete")
     @ResponseBody
-    public Object delete(@RequestParam Integer id) {
+    public Object delete(@RequestParam Long id) {
         alarmRuleService.removeById(id);
         return ResponseData.success();
     }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 80b4026..59b729c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -148,7 +148,7 @@
      */
     @RequestMapping(value = "/delete")
     @ResponseBody
-    public Object delete(@RequestParam Integer id) {
+    public Object delete(@RequestParam Long id) {
         alarmRuleService.removeById(id);
         return ResponseData.success();
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index a9ced11..e079aa7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        bwi.WELL_CODE as "wellCode",
+        ar.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -80,16 +80,15 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+        JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
+        WHERE 1=1
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ar.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">
@@ -129,7 +128,7 @@
         ar.JOB_ID AS "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
+        JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
         WHERE STATUS = '1'
         <if test="keywords!='' and keywords!=null">
             and ar.WELL_CODE like

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 80b4026..59b729c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -148,7 +148,7 @@
      */
     @RequestMapping(value = "/delete")
     @ResponseBody
-    public Object delete(@RequestParam Integer id) {
+    public Object delete(@RequestParam Long id) {
         alarmRuleService.removeById(id);
         return ResponseData.success();
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index a9ced11..e079aa7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        bwi.WELL_CODE as "wellCode",
+        ar.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -80,16 +80,15 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+        JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
+        WHERE 1=1
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ar.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">
@@ -129,7 +128,7 @@
         ar.JOB_ID AS "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
+        JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
         WHERE STATUS = '1'
         <if test="keywords!='' and keywords!=null">
             and ar.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 5da6fa8..731a5d2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -31,11 +31,10 @@
 
     <select id="countNowAlarmRecords" resultType="Integer">
         SELECT  count(*)
-        FROM  alarm_records ar
-        JOIN bus_device_well rdv ON  ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        JOIN alarm_job aj ON  ar.job_id = aj.ID
-        WHERE  rdv.VALID = '1'
+        FROM alarm_records ar
+        JOIN alarm_job aj ON ar.JOB_ID = aj.ID
+        JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
+        WHERE   1=1
         <choose>
             <when test="alarmType != null and alarmType != ''">
                 <if test="alarmType == 1">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 80b4026..59b729c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -148,7 +148,7 @@
      */
     @RequestMapping(value = "/delete")
     @ResponseBody
-    public Object delete(@RequestParam Integer id) {
+    public Object delete(@RequestParam Long id) {
         alarmRuleService.removeById(id);
         return ResponseData.success();
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index a9ced11..e079aa7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        bwi.WELL_CODE as "wellCode",
+        ar.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -80,16 +80,15 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+        JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
+        WHERE 1=1
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ar.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">
@@ -129,7 +128,7 @@
         ar.JOB_ID AS "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
+        JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
         WHERE STATUS = '1'
         <if test="keywords!='' and keywords!=null">
             and ar.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 5da6fa8..731a5d2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -31,11 +31,10 @@
 
     <select id="countNowAlarmRecords" resultType="Integer">
         SELECT  count(*)
-        FROM  alarm_records ar
-        JOIN bus_device_well rdv ON  ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        JOIN alarm_job aj ON  ar.job_id = aj.ID
-        WHERE  rdv.VALID = '1'
+        FROM alarm_records ar
+        JOIN alarm_job aj ON ar.JOB_ID = aj.ID
+        JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
+        WHERE   1=1
         <choose>
             <when test="alarmType != null and alarmType != ''">
                 <if test="alarmType == 1">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
index 7741dae..1bcedf7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
@@ -28,7 +28,7 @@
         if (ObjectUtil.isEmpty(pipeCode)) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-        return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode));
+        return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode.split("-")[0]));
     }
 
     /**

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 80b4026..59b729c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -148,7 +148,7 @@
      */
     @RequestMapping(value = "/delete")
     @ResponseBody
-    public Object delete(@RequestParam Integer id) {
+    public Object delete(@RequestParam Long id) {
         alarmRuleService.removeById(id);
         return ResponseData.success();
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index a9ced11..e079aa7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        bwi.WELL_CODE as "wellCode",
+        ar.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -80,16 +80,15 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+        JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
+        WHERE 1=1
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ar.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">
@@ -129,7 +128,7 @@
         ar.JOB_ID AS "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
+        JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
         WHERE STATUS = '1'
         <if test="keywords!='' and keywords!=null">
             and ar.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 5da6fa8..731a5d2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -31,11 +31,10 @@
 
     <select id="countNowAlarmRecords" resultType="Integer">
         SELECT  count(*)
-        FROM  alarm_records ar
-        JOIN bus_device_well rdv ON  ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        JOIN alarm_job aj ON  ar.job_id = aj.ID
-        WHERE  rdv.VALID = '1'
+        FROM alarm_records ar
+        JOIN alarm_job aj ON ar.JOB_ID = aj.ID
+        JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
+        WHERE   1=1
         <choose>
             <when test="alarmType != null and alarmType != ''">
                 <if test="alarmType == 1">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
index 7741dae..1bcedf7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
@@ -28,7 +28,7 @@
         if (ObjectUtil.isEmpty(pipeCode)) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-        return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode));
+        return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode.split("-")[0]));
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index f3b0d75..cfce573 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -684,7 +684,7 @@
                 JSONArray jsonArray = JSONArray.parseArray(positions);
                 for (int i = 0; i < jsonArray.size(); i++) {
                     JSONArray jsonArray1 = (JSONArray)jsonArray.get(i);
-                    areaPointDtoList.add(new AreaPointDto(jsonArray1.get(0).toString(),jsonArray1.get(1).toString()));
+                    areaPointDtoList.add(new AreaPointDto(jsonArray1.get(1).toString(),jsonArray1.get(0).toString()));
                 }
                 areaDto.setPositions(areaPointDtoList);
             }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 80b4026..59b729c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -148,7 +148,7 @@
      */
     @RequestMapping(value = "/delete")
     @ResponseBody
-    public Object delete(@RequestParam Integer id) {
+    public Object delete(@RequestParam Long id) {
         alarmRuleService.removeById(id);
         return ResponseData.success();
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index a9ced11..e079aa7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        bwi.WELL_CODE as "wellCode",
+        ar.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -80,16 +80,15 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+        JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
+        WHERE 1=1
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ar.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">
@@ -129,7 +128,7 @@
         ar.JOB_ID AS "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
+        JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
         WHERE STATUS = '1'
         <if test="keywords!='' and keywords!=null">
             and ar.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 5da6fa8..731a5d2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -31,11 +31,10 @@
 
     <select id="countNowAlarmRecords" resultType="Integer">
         SELECT  count(*)
-        FROM  alarm_records ar
-        JOIN bus_device_well rdv ON  ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        JOIN alarm_job aj ON  ar.job_id = aj.ID
-        WHERE  rdv.VALID = '1'
+        FROM alarm_records ar
+        JOIN alarm_job aj ON ar.JOB_ID = aj.ID
+        JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
+        WHERE   1=1
         <choose>
             <when test="alarmType != null and alarmType != ''">
                 <if test="alarmType == 1">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
index 7741dae..1bcedf7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
@@ -28,7 +28,7 @@
         if (ObjectUtil.isEmpty(pipeCode)) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-        return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode));
+        return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode.split("-")[0]));
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index f3b0d75..cfce573 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -684,7 +684,7 @@
                 JSONArray jsonArray = JSONArray.parseArray(positions);
                 for (int i = 0; i < jsonArray.size(); i++) {
                     JSONArray jsonArray1 = (JSONArray)jsonArray.get(i);
-                    areaPointDtoList.add(new AreaPointDto(jsonArray1.get(0).toString(),jsonArray1.get(1).toString()));
+                    areaPointDtoList.add(new AreaPointDto(jsonArray1.get(1).toString(),jsonArray1.get(0).toString()));
                 }
                 areaDto.setPositions(areaPointDtoList);
             }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index fd6ffdc..ecd8e9a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -288,7 +288,7 @@
         JOIN bus_device_well bdw ON bdw.device_id = bd.id
         JOIN bus_well_info bwi ON bwi.ID = bdw.well_id
         JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE
-        WHERE bd.online_State = '0'
+        WHERE bd.online_State = '0' and bd.VALID = '1' AND bwi.VALID='1'
         <if test="deviceCode != null and deviceCode !=''">
             AND bd.DEVCODE = #{deviceCode}
         </if>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 80b4026..59b729c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -148,7 +148,7 @@
      */
     @RequestMapping(value = "/delete")
     @ResponseBody
-    public Object delete(@RequestParam Integer id) {
+    public Object delete(@RequestParam Long id) {
         alarmRuleService.removeById(id);
         return ResponseData.success();
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index a9ced11..e079aa7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        bwi.WELL_CODE as "wellCode",
+        ar.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -80,16 +80,15 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+        JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
+        WHERE 1=1
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ar.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">
@@ -129,7 +128,7 @@
         ar.JOB_ID AS "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
+        JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
         WHERE STATUS = '1'
         <if test="keywords!='' and keywords!=null">
             and ar.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 5da6fa8..731a5d2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -31,11 +31,10 @@
 
     <select id="countNowAlarmRecords" resultType="Integer">
         SELECT  count(*)
-        FROM  alarm_records ar
-        JOIN bus_device_well rdv ON  ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        JOIN alarm_job aj ON  ar.job_id = aj.ID
-        WHERE  rdv.VALID = '1'
+        FROM alarm_records ar
+        JOIN alarm_job aj ON ar.JOB_ID = aj.ID
+        JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
+        WHERE   1=1
         <choose>
             <when test="alarmType != null and alarmType != ''">
                 <if test="alarmType == 1">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
index 7741dae..1bcedf7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
@@ -28,7 +28,7 @@
         if (ObjectUtil.isEmpty(pipeCode)) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-        return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode));
+        return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode.split("-")[0]));
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index f3b0d75..cfce573 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -684,7 +684,7 @@
                 JSONArray jsonArray = JSONArray.parseArray(positions);
                 for (int i = 0; i < jsonArray.size(); i++) {
                     JSONArray jsonArray1 = (JSONArray)jsonArray.get(i);
-                    areaPointDtoList.add(new AreaPointDto(jsonArray1.get(0).toString(),jsonArray1.get(1).toString()));
+                    areaPointDtoList.add(new AreaPointDto(jsonArray1.get(1).toString(),jsonArray1.get(0).toString()));
                 }
                 areaDto.setPositions(areaPointDtoList);
             }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index fd6ffdc..ecd8e9a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -288,7 +288,7 @@
         JOIN bus_device_well bdw ON bdw.device_id = bd.id
         JOIN bus_well_info bwi ON bwi.ID = bdw.well_id
         JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE
-        WHERE bd.online_State = '0'
+        WHERE bd.online_State = '0' and bd.VALID = '1' AND bwi.VALID='1'
         <if test="deviceCode != null and deviceCode !=''">
             AND bd.DEVCODE = #{deviceCode}
         </if>
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java
index 3a91852..2dada1d 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java
@@ -14,8 +14,8 @@
     /**
      * 主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID")
+    private Long id;
     /**
      * 告警内容类别
      */
@@ -32,11 +32,11 @@
     @TableField("DEVICE_TYPE")
     private Integer deviceType;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 80b4026..59b729c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -148,7 +148,7 @@
      */
     @RequestMapping(value = "/delete")
     @ResponseBody
-    public Object delete(@RequestParam Integer id) {
+    public Object delete(@RequestParam Long id) {
         alarmRuleService.removeById(id);
         return ResponseData.success();
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index a9ced11..e079aa7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        bwi.WELL_CODE as "wellCode",
+        ar.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -80,16 +80,15 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+        JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
+        WHERE 1=1
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ar.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">
@@ -129,7 +128,7 @@
         ar.JOB_ID AS "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
+        JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
         WHERE STATUS = '1'
         <if test="keywords!='' and keywords!=null">
             and ar.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 5da6fa8..731a5d2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -31,11 +31,10 @@
 
     <select id="countNowAlarmRecords" resultType="Integer">
         SELECT  count(*)
-        FROM  alarm_records ar
-        JOIN bus_device_well rdv ON  ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        JOIN alarm_job aj ON  ar.job_id = aj.ID
-        WHERE  rdv.VALID = '1'
+        FROM alarm_records ar
+        JOIN alarm_job aj ON ar.JOB_ID = aj.ID
+        JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
+        WHERE   1=1
         <choose>
             <when test="alarmType != null and alarmType != ''">
                 <if test="alarmType == 1">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
index 7741dae..1bcedf7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
@@ -28,7 +28,7 @@
         if (ObjectUtil.isEmpty(pipeCode)) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-        return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode));
+        return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode.split("-")[0]));
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index f3b0d75..cfce573 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -684,7 +684,7 @@
                 JSONArray jsonArray = JSONArray.parseArray(positions);
                 for (int i = 0; i < jsonArray.size(); i++) {
                     JSONArray jsonArray1 = (JSONArray)jsonArray.get(i);
-                    areaPointDtoList.add(new AreaPointDto(jsonArray1.get(0).toString(),jsonArray1.get(1).toString()));
+                    areaPointDtoList.add(new AreaPointDto(jsonArray1.get(1).toString(),jsonArray1.get(0).toString()));
                 }
                 areaDto.setPositions(areaPointDtoList);
             }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index fd6ffdc..ecd8e9a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -288,7 +288,7 @@
         JOIN bus_device_well bdw ON bdw.device_id = bd.id
         JOIN bus_well_info bwi ON bwi.ID = bdw.well_id
         JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE
-        WHERE bd.online_State = '0'
+        WHERE bd.online_State = '0' and bd.VALID = '1' AND bwi.VALID='1'
         <if test="deviceCode != null and deviceCode !=''">
             AND bd.DEVCODE = #{deviceCode}
         </if>
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java
index 3a91852..2dada1d 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java
@@ -14,8 +14,8 @@
     /**
      * 主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID")
+    private Long id;
     /**
      * 告警内容类别
      */
@@ -32,11 +32,11 @@
     @TableField("DEVICE_TYPE")
     private Integer deviceType;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java
index ae5dd9d..75bf5ec 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java
@@ -25,8 +25,8 @@
     /**
      * 自增主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID")
+    private Long id;
     /**
      * 设备编号
      */
@@ -69,11 +69,11 @@
     private Date ts;
 
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 80b4026..59b729c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -148,7 +148,7 @@
      */
     @RequestMapping(value = "/delete")
     @ResponseBody
-    public Object delete(@RequestParam Integer id) {
+    public Object delete(@RequestParam Long id) {
         alarmRuleService.removeById(id);
         return ResponseData.success();
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index a9ced11..e079aa7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        bwi.WELL_CODE as "wellCode",
+        ar.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -80,16 +80,15 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+        JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
+        WHERE 1=1
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ar.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">
@@ -129,7 +128,7 @@
         ar.JOB_ID AS "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
+        JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
         WHERE STATUS = '1'
         <if test="keywords!='' and keywords!=null">
             and ar.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 5da6fa8..731a5d2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -31,11 +31,10 @@
 
     <select id="countNowAlarmRecords" resultType="Integer">
         SELECT  count(*)
-        FROM  alarm_records ar
-        JOIN bus_device_well rdv ON  ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        JOIN alarm_job aj ON  ar.job_id = aj.ID
-        WHERE  rdv.VALID = '1'
+        FROM alarm_records ar
+        JOIN alarm_job aj ON ar.JOB_ID = aj.ID
+        JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
+        WHERE   1=1
         <choose>
             <when test="alarmType != null and alarmType != ''">
                 <if test="alarmType == 1">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
index 7741dae..1bcedf7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
@@ -28,7 +28,7 @@
         if (ObjectUtil.isEmpty(pipeCode)) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-        return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode));
+        return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode.split("-")[0]));
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index f3b0d75..cfce573 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -684,7 +684,7 @@
                 JSONArray jsonArray = JSONArray.parseArray(positions);
                 for (int i = 0; i < jsonArray.size(); i++) {
                     JSONArray jsonArray1 = (JSONArray)jsonArray.get(i);
-                    areaPointDtoList.add(new AreaPointDto(jsonArray1.get(0).toString(),jsonArray1.get(1).toString()));
+                    areaPointDtoList.add(new AreaPointDto(jsonArray1.get(1).toString(),jsonArray1.get(0).toString()));
                 }
                 areaDto.setPositions(areaPointDtoList);
             }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index fd6ffdc..ecd8e9a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -288,7 +288,7 @@
         JOIN bus_device_well bdw ON bdw.device_id = bd.id
         JOIN bus_well_info bwi ON bwi.ID = bdw.well_id
         JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE
-        WHERE bd.online_State = '0'
+        WHERE bd.online_State = '0' and bd.VALID = '1' AND bwi.VALID='1'
         <if test="deviceCode != null and deviceCode !=''">
             AND bd.DEVCODE = #{deviceCode}
         </if>
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java
index 3a91852..2dada1d 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java
@@ -14,8 +14,8 @@
     /**
      * 主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID")
+    private Long id;
     /**
      * 告警内容类别
      */
@@ -32,11 +32,11 @@
     @TableField("DEVICE_TYPE")
     private Integer deviceType;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java
index ae5dd9d..75bf5ec 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java
@@ -25,8 +25,8 @@
     /**
      * 自增主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID")
+    private Long id;
     /**
      * 设备编号
      */
@@ -69,11 +69,11 @@
     private Date ts;
 
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index eca6b80..4e36bee 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -269,15 +269,12 @@
                     return new ErrorResponseData(list.get(0));
                 }
             }
-        } catch (MybatisPlusException e) {
-            logger.error("导入点位列表失败", e);
-            String message = e.getCause().getCause().getCause().getMessage();
-            if (message.contains("Duplicate entry '")) {
-                return new ErrorResponseData("导入点位列表失败，点位编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'WELL_CODE'", "") + "已存在");
+        }catch (Exception e) {
+            if (e instanceof DuplicateKeyException) {
+                String errorMsg= e.getCause().getMessage();
+                errorMsg =errorMsg.substring(errorMsg.indexOf("well_code")).replace("well_code","点位编号").replace(")=(",":").replace(")\"","");
+                return new ErrorResponseData(errorMsg);
             }
-            return new ErrorResponseData("导入点位列表失败");
-
-        } catch (Exception e) {
             logger.error("导入点位列表失败", e);
             return new ErrorResponseData("导入点位列表失败");
         }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 80b4026..59b729c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -148,7 +148,7 @@
      */
     @RequestMapping(value = "/delete")
     @ResponseBody
-    public Object delete(@RequestParam Integer id) {
+    public Object delete(@RequestParam Long id) {
         alarmRuleService.removeById(id);
         return ResponseData.success();
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index a9ced11..e079aa7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        bwi.WELL_CODE as "wellCode",
+        ar.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -80,16 +80,15 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+        JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
+        WHERE 1=1
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ar.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">
@@ -129,7 +128,7 @@
         ar.JOB_ID AS "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
+        JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
         WHERE STATUS = '1'
         <if test="keywords!='' and keywords!=null">
             and ar.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 5da6fa8..731a5d2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -31,11 +31,10 @@
 
     <select id="countNowAlarmRecords" resultType="Integer">
         SELECT  count(*)
-        FROM  alarm_records ar
-        JOIN bus_device_well rdv ON  ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        JOIN alarm_job aj ON  ar.job_id = aj.ID
-        WHERE  rdv.VALID = '1'
+        FROM alarm_records ar
+        JOIN alarm_job aj ON ar.JOB_ID = aj.ID
+        JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
+        WHERE   1=1
         <choose>
             <when test="alarmType != null and alarmType != ''">
                 <if test="alarmType == 1">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
index 7741dae..1bcedf7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
@@ -28,7 +28,7 @@
         if (ObjectUtil.isEmpty(pipeCode)) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-        return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode));
+        return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode.split("-")[0]));
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index f3b0d75..cfce573 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -684,7 +684,7 @@
                 JSONArray jsonArray = JSONArray.parseArray(positions);
                 for (int i = 0; i < jsonArray.size(); i++) {
                     JSONArray jsonArray1 = (JSONArray)jsonArray.get(i);
-                    areaPointDtoList.add(new AreaPointDto(jsonArray1.get(0).toString(),jsonArray1.get(1).toString()));
+                    areaPointDtoList.add(new AreaPointDto(jsonArray1.get(1).toString(),jsonArray1.get(0).toString()));
                 }
                 areaDto.setPositions(areaPointDtoList);
             }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index fd6ffdc..ecd8e9a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -288,7 +288,7 @@
         JOIN bus_device_well bdw ON bdw.device_id = bd.id
         JOIN bus_well_info bwi ON bwi.ID = bdw.well_id
         JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE
-        WHERE bd.online_State = '0'
+        WHERE bd.online_State = '0' and bd.VALID = '1' AND bwi.VALID='1'
         <if test="deviceCode != null and deviceCode !=''">
             AND bd.DEVCODE = #{deviceCode}
         </if>
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java
index 3a91852..2dada1d 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java
@@ -14,8 +14,8 @@
     /**
      * 主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID")
+    private Long id;
     /**
      * 告警内容类别
      */
@@ -32,11 +32,11 @@
     @TableField("DEVICE_TYPE")
     private Integer deviceType;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java
index ae5dd9d..75bf5ec 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java
@@ -25,8 +25,8 @@
     /**
      * 自增主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID")
+    private Long id;
     /**
      * 设备编号
      */
@@ -69,11 +69,11 @@
     private Date ts;
 
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index eca6b80..4e36bee 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -269,15 +269,12 @@
                     return new ErrorResponseData(list.get(0));
                 }
             }
-        } catch (MybatisPlusException e) {
-            logger.error("导入点位列表失败", e);
-            String message = e.getCause().getCause().getCause().getMessage();
-            if (message.contains("Duplicate entry '")) {
-                return new ErrorResponseData("导入点位列表失败，点位编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'WELL_CODE'", "") + "已存在");
+        }catch (Exception e) {
+            if (e instanceof DuplicateKeyException) {
+                String errorMsg= e.getCause().getMessage();
+                errorMsg =errorMsg.substring(errorMsg.indexOf("well_code")).replace("well_code","点位编号").replace(")=(",":").replace(")\"","");
+                return new ErrorResponseData(errorMsg);
             }
-            return new ErrorResponseData("导入点位列表失败");
-
-        } catch (Exception e) {
             logger.error("导入点位列表失败", e);
             return new ErrorResponseData("导入点位列表失败");
         }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index 267e6b5..4bcbc9a 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -16,6 +16,7 @@
 import com.casic.missiles.modular.system.dto.BatchExportDataDto;
 import com.casic.missiles.modular.system.dto.BusWellInfoDto;
 import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.model.Dict;
 import com.casic.missiles.modular.system.service.IBusWellInfoService;
 import com.casic.missiles.modular.system.service.IBusWellInfoSupportService;
@@ -35,6 +36,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -139,6 +141,8 @@
 
         List<String> list = new ArrayList<>();
         List<String> gpsCoordinates = new ArrayList<>();
+        List<Dept> deptList = service.getDeptService().list(null);
+        List<Long> idList = deptList.stream().map(Dept::getId).collect(Collectors.toList());
 
         if (CollectionUtil.isNotEmpty(results)) {
             List<Dict> dicts = dictService.findInDictByCode(BusWellConst.SLUICEWELL_TYPE);//闸井类型
@@ -182,6 +186,14 @@
                     break;
                 }
 
+                if (!idList.contains(well.getDeptid())) {
+                    list.add("第" + index[0] + "行，权属单位代码不存在！");
+                }
+                if (!idList.contains(well.getResponsibleDept())) {
+                    list.add("第" + index[0] + "行，点位维护单位代码不存在！");
+                }
+
+
                 String coordinateX = well.getCoordinateX().length() > 10 ? well.getCoordinateX().substring(0, 10) : well.getCoordinateX();
                 String coordinateY = well.getCoordinateY().length() > 9 ? well.getCoordinateY().substring(0, 9) : well.getCoordinateY();
                 well.setCoordinateX(coordinateX);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 80b4026..59b729c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -148,7 +148,7 @@
      */
     @RequestMapping(value = "/delete")
     @ResponseBody
-    public Object delete(@RequestParam Integer id) {
+    public Object delete(@RequestParam Long id) {
         alarmRuleService.removeById(id);
         return ResponseData.success();
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index a9ced11..e079aa7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        bwi.WELL_CODE as "wellCode",
+        ar.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -80,16 +80,15 @@
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
-        WHERE rdv.VALID='1'
+        JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
+        WHERE 1=1
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and bwi.WELL_CODE like
+            and ar.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">
@@ -129,7 +128,7 @@
         ar.JOB_ID AS "jobId",
         bwi.DEPTID AS deptid
         FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
+        JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
         WHERE STATUS = '1'
         <if test="keywords!='' and keywords!=null">
             and ar.WELL_CODE like
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 5da6fa8..731a5d2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -31,11 +31,10 @@
 
     <select id="countNowAlarmRecords" resultType="Integer">
         SELECT  count(*)
-        FROM  alarm_records ar
-        JOIN bus_device_well rdv ON  ar.device_id = rdv.device_id
-        JOIN bus_well_info wi ON rdv.well_id = wi.ID
-        JOIN alarm_job aj ON  ar.job_id = aj.ID
-        WHERE  rdv.VALID = '1'
+        FROM alarm_records ar
+        JOIN alarm_job aj ON ar.JOB_ID = aj.ID
+        JOIN bus_well_info bwi  ON  ar.WELL_CODE = bwi.WELL_CODE
+        WHERE   1=1
         <choose>
             <when test="alarmType != null and alarmType != ''">
                 <if test="alarmType == 1">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
index 7741dae..1bcedf7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java
@@ -28,7 +28,7 @@
         if (ObjectUtil.isEmpty(pipeCode)) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-        return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode));
+        return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode.split("-")[0]));
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index f3b0d75..cfce573 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -684,7 +684,7 @@
                 JSONArray jsonArray = JSONArray.parseArray(positions);
                 for (int i = 0; i < jsonArray.size(); i++) {
                     JSONArray jsonArray1 = (JSONArray)jsonArray.get(i);
-                    areaPointDtoList.add(new AreaPointDto(jsonArray1.get(0).toString(),jsonArray1.get(1).toString()));
+                    areaPointDtoList.add(new AreaPointDto(jsonArray1.get(1).toString(),jsonArray1.get(0).toString()));
                 }
                 areaDto.setPositions(areaPointDtoList);
             }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index fd6ffdc..ecd8e9a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -288,7 +288,7 @@
         JOIN bus_device_well bdw ON bdw.device_id = bd.id
         JOIN bus_well_info bwi ON bwi.ID = bdw.well_id
         JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE
-        WHERE bd.online_State = '0'
+        WHERE bd.online_State = '0' and bd.VALID = '1' AND bwi.VALID='1'
         <if test="deviceCode != null and deviceCode !=''">
             AND bd.DEVCODE = #{deviceCode}
         </if>
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java
index 3a91852..2dada1d 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmContentType.java
@@ -14,8 +14,8 @@
     /**
      * 主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID")
+    private Long id;
     /**
      * 告警内容类别
      */
@@ -32,11 +32,11 @@
     @TableField("DEVICE_TYPE")
     private Integer deviceType;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java
index ae5dd9d..75bf5ec 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java
@@ -25,8 +25,8 @@
     /**
      * 自增主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID")
+    private Long id;
     /**
      * 设备编号
      */
@@ -69,11 +69,11 @@
     private Date ts;
 
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index eca6b80..4e36bee 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -269,15 +269,12 @@
                     return new ErrorResponseData(list.get(0));
                 }
             }
-        } catch (MybatisPlusException e) {
-            logger.error("导入点位列表失败", e);
-            String message = e.getCause().getCause().getCause().getMessage();
-            if (message.contains("Duplicate entry '")) {
-                return new ErrorResponseData("导入点位列表失败，点位编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'WELL_CODE'", "") + "已存在");
+        }catch (Exception e) {
+            if (e instanceof DuplicateKeyException) {
+                String errorMsg= e.getCause().getMessage();
+                errorMsg =errorMsg.substring(errorMsg.indexOf("well_code")).replace("well_code","点位编号").replace(")=(",":").replace(")\"","");
+                return new ErrorResponseData(errorMsg);
             }
-            return new ErrorResponseData("导入点位列表失败");
-
-        } catch (Exception e) {
             logger.error("导入点位列表失败", e);
             return new ErrorResponseData("导入点位列表失败");
         }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index 267e6b5..4bcbc9a 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -16,6 +16,7 @@
 import com.casic.missiles.modular.system.dto.BatchExportDataDto;
 import com.casic.missiles.modular.system.dto.BusWellInfoDto;
 import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.model.Dict;
 import com.casic.missiles.modular.system.service.IBusWellInfoService;
 import com.casic.missiles.modular.system.service.IBusWellInfoSupportService;
@@ -35,6 +36,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -139,6 +141,8 @@
 
         List<String> list = new ArrayList<>();
         List<String> gpsCoordinates = new ArrayList<>();
+        List<Dept> deptList = service.getDeptService().list(null);
+        List<Long> idList = deptList.stream().map(Dept::getId).collect(Collectors.toList());
 
         if (CollectionUtil.isNotEmpty(results)) {
             List<Dict> dicts = dictService.findInDictByCode(BusWellConst.SLUICEWELL_TYPE);//闸井类型
@@ -182,6 +186,14 @@
                     break;
                 }
 
+                if (!idList.contains(well.getDeptid())) {
+                    list.add("第" + index[0] + "行，权属单位代码不存在！");
+                }
+                if (!idList.contains(well.getResponsibleDept())) {
+                    list.add("第" + index[0] + "行，点位维护单位代码不存在！");
+                }
+
+
                 String coordinateX = well.getCoordinateX().length() > 10 ? well.getCoordinateX().substring(0, 10) : well.getCoordinateX();
                 String coordinateY = well.getCoordinateY().length() > 9 ? well.getCoordinateY().substring(0, 9) : well.getCoordinateY();
                 well.setCoordinateX(coordinateX);
diff --git a/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx b/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx
index 9145a70..d4e3d79 100644
--- a/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx
+++ b/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx
Binary files differ