diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
index 687fe02..e0547bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@
 @Mapper
 public interface CtUserMapper extends BaseMapper<CtUser> {
 
+    @Select("SELECT USER_ID FROM `ct_role_user` WHERE ROLE_ID='6a050c90c1e648ee8d2034baea6856df'")
+    List<String> getCtUserGroupIds();
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
index 687fe02..e0547bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@
 @Mapper
 public interface CtUserMapper extends BaseMapper<CtUser> {
 
+    @Select("SELECT USER_ID FROM `ct_role_user` WHERE ROLE_ID='6a050c90c1e648ee8d2034baea6856df'")
+    List<String> getCtUserGroupIds();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 60f32a3..99ef10b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -156,9 +156,9 @@
             <if test="request.endTime != null and request.endTime !='' ">
                 and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
             </if>
-            AND (
+            <!--AND (
             ar.`STATUS` = 0
-            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))-->
         </where>
         ORDER BY ar.ALARM_TIME DESC
     </select>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
index 687fe02..e0547bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@
 @Mapper
 public interface CtUserMapper extends BaseMapper<CtUser> {
 
+    @Select("SELECT USER_ID FROM `ct_role_user` WHERE ROLE_ID='6a050c90c1e648ee8d2034baea6856df'")
+    List<String> getCtUserGroupIds();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 60f32a3..99ef10b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -156,9 +156,9 @@
             <if test="request.endTime != null and request.endTime !='' ">
                 and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
             </if>
-            AND (
+            <!--AND (
             ar.`STATUS` = 0
-            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))-->
         </where>
         ORDER BY ar.ALARM_TIME DESC
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
index 0f603c4..4788357 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
@@ -18,5 +18,23 @@
     <sql id="Base_Column_List">
         ID, GRID_CODE, DEPTID, PRINCIPAL, TELEPHONE, PRESS_TYPE, PIPE_LENGTH, TS
     </sql>
-
+    <select id="getSyncUserDTOList" resultType="com.casic.missiles.modular.device.dto.SyncUserDTO">
+        WITH user_temp AS (
+            SELECT
+                ID,
+                ACCOUNT,
+                NAME,
+                PHONE,
+                DEPT_ID
+            FROM
+                sys_user
+            WHERE
+                DEPT_ID IN ( SELECT id FROM `sys_dept` WHERE tips = 'grid' ))
+        SELECT
+            *
+        FROM
+            ( SELECT *, ROW_NUMBER() OVER ( PARTITION BY DEPT_ID ORDER BY ID DESC ) AS rn FROM user_temp ) t
+        WHERE
+            rn = 1
+    </select>
 </mapper>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
index 687fe02..e0547bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@
 @Mapper
 public interface CtUserMapper extends BaseMapper<CtUser> {
 
+    @Select("SELECT USER_ID FROM `ct_role_user` WHERE ROLE_ID='6a050c90c1e648ee8d2034baea6856df'")
+    List<String> getCtUserGroupIds();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 60f32a3..99ef10b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -156,9 +156,9 @@
             <if test="request.endTime != null and request.endTime !='' ">
                 and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
             </if>
-            AND (
+            <!--AND (
             ar.`STATUS` = 0
-            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))-->
         </where>
         ORDER BY ar.ALARM_TIME DESC
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
index 0f603c4..4788357 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
@@ -18,5 +18,23 @@
     <sql id="Base_Column_List">
         ID, GRID_CODE, DEPTID, PRINCIPAL, TELEPHONE, PRESS_TYPE, PIPE_LENGTH, TS
     </sql>
-
+    <select id="getSyncUserDTOList" resultType="com.casic.missiles.modular.device.dto.SyncUserDTO">
+        WITH user_temp AS (
+            SELECT
+                ID,
+                ACCOUNT,
+                NAME,
+                PHONE,
+                DEPT_ID
+            FROM
+                sys_user
+            WHERE
+                DEPT_ID IN ( SELECT id FROM `sys_dept` WHERE tips = 'grid' ))
+        SELECT
+            *
+        FROM
+            ( SELECT *, ROW_NUMBER() OVER ( PARTITION BY DEPT_ID ORDER BY ID DESC ) AS rn FROM user_temp ) t
+        WHERE
+            rn = 1
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
index a716a72..aa6c790 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
@@ -70,19 +70,15 @@
 
     <select id="pageGridList" resultType="com.casic.missiles.modular.device.entity.BusGrid">
         SELECT
-        bg.*,
-        sd.FULL_NAME as deptName
+        bg.*
         FROM
         bus_grid bg
-        LEFT JOIN sys_dept sd ON bg.DEPTID = sd.ID
         WHERE 1=1
 
         <if test="request.gridCode != null and request.gridCode !='' ">
             and bg.GRID_CODE like concat('%', #{request.gridCode}, '%')
         </if>
-        <if test="request.deptid != null and request.deptid !=''">
-            and bg.DEPTID = #{request.responsibleDept}
-        </if>
+
         <if test="request.locationState != null and request.locationState !=''">
             and bg.LOCATION_STATE = #{request.locationState}
         </if>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
index 687fe02..e0547bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@
 @Mapper
 public interface CtUserMapper extends BaseMapper<CtUser> {
 
+    @Select("SELECT USER_ID FROM `ct_role_user` WHERE ROLE_ID='6a050c90c1e648ee8d2034baea6856df'")
+    List<String> getCtUserGroupIds();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 60f32a3..99ef10b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -156,9 +156,9 @@
             <if test="request.endTime != null and request.endTime !='' ">
                 and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
             </if>
-            AND (
+            <!--AND (
             ar.`STATUS` = 0
-            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))-->
         </where>
         ORDER BY ar.ALARM_TIME DESC
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
index 0f603c4..4788357 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
@@ -18,5 +18,23 @@
     <sql id="Base_Column_List">
         ID, GRID_CODE, DEPTID, PRINCIPAL, TELEPHONE, PRESS_TYPE, PIPE_LENGTH, TS
     </sql>
-
+    <select id="getSyncUserDTOList" resultType="com.casic.missiles.modular.device.dto.SyncUserDTO">
+        WITH user_temp AS (
+            SELECT
+                ID,
+                ACCOUNT,
+                NAME,
+                PHONE,
+                DEPT_ID
+            FROM
+                sys_user
+            WHERE
+                DEPT_ID IN ( SELECT id FROM `sys_dept` WHERE tips = 'grid' ))
+        SELECT
+            *
+        FROM
+            ( SELECT *, ROW_NUMBER() OVER ( PARTITION BY DEPT_ID ORDER BY ID DESC ) AS rn FROM user_temp ) t
+        WHERE
+            rn = 1
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
index a716a72..aa6c790 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
@@ -70,19 +70,15 @@
 
     <select id="pageGridList" resultType="com.casic.missiles.modular.device.entity.BusGrid">
         SELECT
-        bg.*,
-        sd.FULL_NAME as deptName
+        bg.*
         FROM
         bus_grid bg
-        LEFT JOIN sys_dept sd ON bg.DEPTID = sd.ID
         WHERE 1=1
 
         <if test="request.gridCode != null and request.gridCode !='' ">
             and bg.GRID_CODE like concat('%', #{request.gridCode}, '%')
         </if>
-        <if test="request.deptid != null and request.deptid !=''">
-            and bg.DEPTID = #{request.responsibleDept}
-        </if>
+
         <if test="request.locationState != null and request.locationState !=''">
             and bg.LOCATION_STATE = #{request.locationState}
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 7965bfc..5f8d90f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.device.dto;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -74,5 +75,11 @@
     @ApiModelProperty("左侧指示带长度")
     private String rightLength;
 
+    @ApiModelProperty("监控状态（1：正常，2：异常，3：离线，0：未监测）")
+    private String monitorState;
+
+    @ApiModelProperty("监控状态名称")
+    private String monitorStateName;
+
 
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
index 687fe02..e0547bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@
 @Mapper
 public interface CtUserMapper extends BaseMapper<CtUser> {
 
+    @Select("SELECT USER_ID FROM `ct_role_user` WHERE ROLE_ID='6a050c90c1e648ee8d2034baea6856df'")
+    List<String> getCtUserGroupIds();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 60f32a3..99ef10b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -156,9 +156,9 @@
             <if test="request.endTime != null and request.endTime !='' ">
                 and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
             </if>
-            AND (
+            <!--AND (
             ar.`STATUS` = 0
-            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))-->
         </where>
         ORDER BY ar.ALARM_TIME DESC
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
index 0f603c4..4788357 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
@@ -18,5 +18,23 @@
     <sql id="Base_Column_List">
         ID, GRID_CODE, DEPTID, PRINCIPAL, TELEPHONE, PRESS_TYPE, PIPE_LENGTH, TS
     </sql>
-
+    <select id="getSyncUserDTOList" resultType="com.casic.missiles.modular.device.dto.SyncUserDTO">
+        WITH user_temp AS (
+            SELECT
+                ID,
+                ACCOUNT,
+                NAME,
+                PHONE,
+                DEPT_ID
+            FROM
+                sys_user
+            WHERE
+                DEPT_ID IN ( SELECT id FROM `sys_dept` WHERE tips = 'grid' ))
+        SELECT
+            *
+        FROM
+            ( SELECT *, ROW_NUMBER() OVER ( PARTITION BY DEPT_ID ORDER BY ID DESC ) AS rn FROM user_temp ) t
+        WHERE
+            rn = 1
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
index a716a72..aa6c790 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
@@ -70,19 +70,15 @@
 
     <select id="pageGridList" resultType="com.casic.missiles.modular.device.entity.BusGrid">
         SELECT
-        bg.*,
-        sd.FULL_NAME as deptName
+        bg.*
         FROM
         bus_grid bg
-        LEFT JOIN sys_dept sd ON bg.DEPTID = sd.ID
         WHERE 1=1
 
         <if test="request.gridCode != null and request.gridCode !='' ">
             and bg.GRID_CODE like concat('%', #{request.gridCode}, '%')
         </if>
-        <if test="request.deptid != null and request.deptid !=''">
-            and bg.DEPTID = #{request.responsibleDept}
-        </if>
+
         <if test="request.locationState != null and request.locationState !=''">
             and bg.LOCATION_STATE = #{request.locationState}
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 7965bfc..5f8d90f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.device.dto;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -74,5 +75,11 @@
     @ApiModelProperty("左侧指示带长度")
     private String rightLength;
 
+    @ApiModelProperty("监控状态（1：正常，2：异常，3：离线，0：未监测）")
+    private String monitorState;
+
+    @ApiModelProperty("监控状态名称")
+    private String monitorStateName;
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
new file mode 100644
index 0000000..8edbe2d
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SyncUserDTO {
+
+    @ApiModelProperty("人员id")
+    private Long id;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("人员名称")
+    private String name;
+
+    @ApiModelProperty("电话")
+    private String phone;
+
+    @ApiModelProperty("账号")
+    private String account;
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
index 687fe02..e0547bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@
 @Mapper
 public interface CtUserMapper extends BaseMapper<CtUser> {
 
+    @Select("SELECT USER_ID FROM `ct_role_user` WHERE ROLE_ID='6a050c90c1e648ee8d2034baea6856df'")
+    List<String> getCtUserGroupIds();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 60f32a3..99ef10b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -156,9 +156,9 @@
             <if test="request.endTime != null and request.endTime !='' ">
                 and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
             </if>
-            AND (
+            <!--AND (
             ar.`STATUS` = 0
-            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))-->
         </where>
         ORDER BY ar.ALARM_TIME DESC
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
index 0f603c4..4788357 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
@@ -18,5 +18,23 @@
     <sql id="Base_Column_List">
         ID, GRID_CODE, DEPTID, PRINCIPAL, TELEPHONE, PRESS_TYPE, PIPE_LENGTH, TS
     </sql>
-
+    <select id="getSyncUserDTOList" resultType="com.casic.missiles.modular.device.dto.SyncUserDTO">
+        WITH user_temp AS (
+            SELECT
+                ID,
+                ACCOUNT,
+                NAME,
+                PHONE,
+                DEPT_ID
+            FROM
+                sys_user
+            WHERE
+                DEPT_ID IN ( SELECT id FROM `sys_dept` WHERE tips = 'grid' ))
+        SELECT
+            *
+        FROM
+            ( SELECT *, ROW_NUMBER() OVER ( PARTITION BY DEPT_ID ORDER BY ID DESC ) AS rn FROM user_temp ) t
+        WHERE
+            rn = 1
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
index a716a72..aa6c790 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
@@ -70,19 +70,15 @@
 
     <select id="pageGridList" resultType="com.casic.missiles.modular.device.entity.BusGrid">
         SELECT
-        bg.*,
-        sd.FULL_NAME as deptName
+        bg.*
         FROM
         bus_grid bg
-        LEFT JOIN sys_dept sd ON bg.DEPTID = sd.ID
         WHERE 1=1
 
         <if test="request.gridCode != null and request.gridCode !='' ">
             and bg.GRID_CODE like concat('%', #{request.gridCode}, '%')
         </if>
-        <if test="request.deptid != null and request.deptid !=''">
-            and bg.DEPTID = #{request.responsibleDept}
-        </if>
+
         <if test="request.locationState != null and request.locationState !=''">
             and bg.LOCATION_STATE = #{request.locationState}
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 7965bfc..5f8d90f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.device.dto;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -74,5 +75,11 @@
     @ApiModelProperty("左侧指示带长度")
     private String rightLength;
 
+    @ApiModelProperty("监控状态（1：正常，2：异常，3：离线，0：未监测）")
+    private String monitorState;
+
+    @ApiModelProperty("监控状态名称")
+    private String monitorStateName;
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
new file mode 100644
index 0000000..8edbe2d
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SyncUserDTO {
+
+    @ApiModelProperty("人员id")
+    private Long id;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("人员名称")
+    private String name;
+
+    @ApiModelProperty("电话")
+    private String phone;
+
+    @ApiModelProperty("账号")
+    private String account;
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
index 14dc9b8..aef0ae4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
@@ -5,11 +5,13 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -100,7 +102,10 @@
     private String pressureLevel;
 
     @TableField("updt_time")
-    private LocalDateTime updtTime;
+    private Date updtTime;
 
+    @ApiModelProperty("区域点集合")
+    @TableField(exist = false)
+    private String trajectory;
 
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
index 687fe02..e0547bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@
 @Mapper
 public interface CtUserMapper extends BaseMapper<CtUser> {
 
+    @Select("SELECT USER_ID FROM `ct_role_user` WHERE ROLE_ID='6a050c90c1e648ee8d2034baea6856df'")
+    List<String> getCtUserGroupIds();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 60f32a3..99ef10b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -156,9 +156,9 @@
             <if test="request.endTime != null and request.endTime !='' ">
                 and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
             </if>
-            AND (
+            <!--AND (
             ar.`STATUS` = 0
-            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))-->
         </where>
         ORDER BY ar.ALARM_TIME DESC
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
index 0f603c4..4788357 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
@@ -18,5 +18,23 @@
     <sql id="Base_Column_List">
         ID, GRID_CODE, DEPTID, PRINCIPAL, TELEPHONE, PRESS_TYPE, PIPE_LENGTH, TS
     </sql>
-
+    <select id="getSyncUserDTOList" resultType="com.casic.missiles.modular.device.dto.SyncUserDTO">
+        WITH user_temp AS (
+            SELECT
+                ID,
+                ACCOUNT,
+                NAME,
+                PHONE,
+                DEPT_ID
+            FROM
+                sys_user
+            WHERE
+                DEPT_ID IN ( SELECT id FROM `sys_dept` WHERE tips = 'grid' ))
+        SELECT
+            *
+        FROM
+            ( SELECT *, ROW_NUMBER() OVER ( PARTITION BY DEPT_ID ORDER BY ID DESC ) AS rn FROM user_temp ) t
+        WHERE
+            rn = 1
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
index a716a72..aa6c790 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
@@ -70,19 +70,15 @@
 
     <select id="pageGridList" resultType="com.casic.missiles.modular.device.entity.BusGrid">
         SELECT
-        bg.*,
-        sd.FULL_NAME as deptName
+        bg.*
         FROM
         bus_grid bg
-        LEFT JOIN sys_dept sd ON bg.DEPTID = sd.ID
         WHERE 1=1
 
         <if test="request.gridCode != null and request.gridCode !='' ">
             and bg.GRID_CODE like concat('%', #{request.gridCode}, '%')
         </if>
-        <if test="request.deptid != null and request.deptid !=''">
-            and bg.DEPTID = #{request.responsibleDept}
-        </if>
+
         <if test="request.locationState != null and request.locationState !=''">
             and bg.LOCATION_STATE = #{request.locationState}
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 7965bfc..5f8d90f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.device.dto;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -74,5 +75,11 @@
     @ApiModelProperty("左侧指示带长度")
     private String rightLength;
 
+    @ApiModelProperty("监控状态（1：正常，2：异常，3：离线，0：未监测）")
+    private String monitorState;
+
+    @ApiModelProperty("监控状态名称")
+    private String monitorStateName;
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
new file mode 100644
index 0000000..8edbe2d
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SyncUserDTO {
+
+    @ApiModelProperty("人员id")
+    private Long id;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("人员名称")
+    private String name;
+
+    @ApiModelProperty("电话")
+    private String phone;
+
+    @ApiModelProperty("账号")
+    private String account;
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
index 14dc9b8..aef0ae4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
@@ -5,11 +5,13 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -100,7 +102,10 @@
     private String pressureLevel;
 
     @TableField("updt_time")
-    private LocalDateTime updtTime;
+    private Date updtTime;
 
+    @ApiModelProperty("区域点集合")
+    @TableField(exist = false)
+    private String trajectory;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index 5d1f30b..5659491 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -36,6 +36,10 @@
     @TableField("GRID_CODE")
     private String gridCode;
 
+    @ApiModelProperty("网格名称")
+    @TableField("GRID_Name")
+    private String gridName;
+
     @ApiModelProperty("管理单位")
     @TableField("DEPTID")
     private Long deptid;
@@ -68,6 +72,18 @@
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("同步id")
+    @TableField("SYNC_ID")
+    private String syncId;
+
+    @ApiModelProperty("地图坐标集合")
+    @TableField("TRAJECTORY")
+    private String trajectory;
+
+    @ApiModelProperty("是否同步1，是0，否")
+    @TableField("IS_SYNC")
+    private int isSync;
+
     @ApiModelProperty("部门名称")
     @TableField(exist = false)
     private String deptName;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
index 687fe02..e0547bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@
 @Mapper
 public interface CtUserMapper extends BaseMapper<CtUser> {
 
+    @Select("SELECT USER_ID FROM `ct_role_user` WHERE ROLE_ID='6a050c90c1e648ee8d2034baea6856df'")
+    List<String> getCtUserGroupIds();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 60f32a3..99ef10b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -156,9 +156,9 @@
             <if test="request.endTime != null and request.endTime !='' ">
                 and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
             </if>
-            AND (
+            <!--AND (
             ar.`STATUS` = 0
-            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))-->
         </where>
         ORDER BY ar.ALARM_TIME DESC
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
index 0f603c4..4788357 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
@@ -18,5 +18,23 @@
     <sql id="Base_Column_List">
         ID, GRID_CODE, DEPTID, PRINCIPAL, TELEPHONE, PRESS_TYPE, PIPE_LENGTH, TS
     </sql>
-
+    <select id="getSyncUserDTOList" resultType="com.casic.missiles.modular.device.dto.SyncUserDTO">
+        WITH user_temp AS (
+            SELECT
+                ID,
+                ACCOUNT,
+                NAME,
+                PHONE,
+                DEPT_ID
+            FROM
+                sys_user
+            WHERE
+                DEPT_ID IN ( SELECT id FROM `sys_dept` WHERE tips = 'grid' ))
+        SELECT
+            *
+        FROM
+            ( SELECT *, ROW_NUMBER() OVER ( PARTITION BY DEPT_ID ORDER BY ID DESC ) AS rn FROM user_temp ) t
+        WHERE
+            rn = 1
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
index a716a72..aa6c790 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
@@ -70,19 +70,15 @@
 
     <select id="pageGridList" resultType="com.casic.missiles.modular.device.entity.BusGrid">
         SELECT
-        bg.*,
-        sd.FULL_NAME as deptName
+        bg.*
         FROM
         bus_grid bg
-        LEFT JOIN sys_dept sd ON bg.DEPTID = sd.ID
         WHERE 1=1
 
         <if test="request.gridCode != null and request.gridCode !='' ">
             and bg.GRID_CODE like concat('%', #{request.gridCode}, '%')
         </if>
-        <if test="request.deptid != null and request.deptid !=''">
-            and bg.DEPTID = #{request.responsibleDept}
-        </if>
+
         <if test="request.locationState != null and request.locationState !=''">
             and bg.LOCATION_STATE = #{request.locationState}
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 7965bfc..5f8d90f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.device.dto;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -74,5 +75,11 @@
     @ApiModelProperty("左侧指示带长度")
     private String rightLength;
 
+    @ApiModelProperty("监控状态（1：正常，2：异常，3：离线，0：未监测）")
+    private String monitorState;
+
+    @ApiModelProperty("监控状态名称")
+    private String monitorStateName;
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
new file mode 100644
index 0000000..8edbe2d
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SyncUserDTO {
+
+    @ApiModelProperty("人员id")
+    private Long id;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("人员名称")
+    private String name;
+
+    @ApiModelProperty("电话")
+    private String phone;
+
+    @ApiModelProperty("账号")
+    private String account;
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
index 14dc9b8..aef0ae4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
@@ -5,11 +5,13 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -100,7 +102,10 @@
     private String pressureLevel;
 
     @TableField("updt_time")
-    private LocalDateTime updtTime;
+    private Date updtTime;
 
+    @ApiModelProperty("区域点集合")
+    @TableField(exist = false)
+    private String trajectory;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index 5d1f30b..5659491 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -36,6 +36,10 @@
     @TableField("GRID_CODE")
     private String gridCode;
 
+    @ApiModelProperty("网格名称")
+    @TableField("GRID_Name")
+    private String gridName;
+
     @ApiModelProperty("管理单位")
     @TableField("DEPTID")
     private Long deptid;
@@ -68,6 +72,18 @@
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("同步id")
+    @TableField("SYNC_ID")
+    private String syncId;
+
+    @ApiModelProperty("地图坐标集合")
+    @TableField("TRAJECTORY")
+    private String trajectory;
+
+    @ApiModelProperty("是否同步1，是0，否")
+    @TableField("IS_SYNC")
+    private int isSync;
+
     @ApiModelProperty("部门名称")
     @TableField(exist = false)
     private String deptName;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
index 08a4bb6..eb4d377 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务类
@@ -13,4 +15,6 @@
  */
 public interface IBdcRegionAreaService extends IService<BdcRegionArea> {
 
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
index 687fe02..e0547bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@
 @Mapper
 public interface CtUserMapper extends BaseMapper<CtUser> {
 
+    @Select("SELECT USER_ID FROM `ct_role_user` WHERE ROLE_ID='6a050c90c1e648ee8d2034baea6856df'")
+    List<String> getCtUserGroupIds();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 60f32a3..99ef10b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -156,9 +156,9 @@
             <if test="request.endTime != null and request.endTime !='' ">
                 and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
             </if>
-            AND (
+            <!--AND (
             ar.`STATUS` = 0
-            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))-->
         </where>
         ORDER BY ar.ALARM_TIME DESC
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
index 0f603c4..4788357 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
@@ -18,5 +18,23 @@
     <sql id="Base_Column_List">
         ID, GRID_CODE, DEPTID, PRINCIPAL, TELEPHONE, PRESS_TYPE, PIPE_LENGTH, TS
     </sql>
-
+    <select id="getSyncUserDTOList" resultType="com.casic.missiles.modular.device.dto.SyncUserDTO">
+        WITH user_temp AS (
+            SELECT
+                ID,
+                ACCOUNT,
+                NAME,
+                PHONE,
+                DEPT_ID
+            FROM
+                sys_user
+            WHERE
+                DEPT_ID IN ( SELECT id FROM `sys_dept` WHERE tips = 'grid' ))
+        SELECT
+            *
+        FROM
+            ( SELECT *, ROW_NUMBER() OVER ( PARTITION BY DEPT_ID ORDER BY ID DESC ) AS rn FROM user_temp ) t
+        WHERE
+            rn = 1
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
index a716a72..aa6c790 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
@@ -70,19 +70,15 @@
 
     <select id="pageGridList" resultType="com.casic.missiles.modular.device.entity.BusGrid">
         SELECT
-        bg.*,
-        sd.FULL_NAME as deptName
+        bg.*
         FROM
         bus_grid bg
-        LEFT JOIN sys_dept sd ON bg.DEPTID = sd.ID
         WHERE 1=1
 
         <if test="request.gridCode != null and request.gridCode !='' ">
             and bg.GRID_CODE like concat('%', #{request.gridCode}, '%')
         </if>
-        <if test="request.deptid != null and request.deptid !=''">
-            and bg.DEPTID = #{request.responsibleDept}
-        </if>
+
         <if test="request.locationState != null and request.locationState !=''">
             and bg.LOCATION_STATE = #{request.locationState}
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 7965bfc..5f8d90f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.device.dto;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -74,5 +75,11 @@
     @ApiModelProperty("左侧指示带长度")
     private String rightLength;
 
+    @ApiModelProperty("监控状态（1：正常，2：异常，3：离线，0：未监测）")
+    private String monitorState;
+
+    @ApiModelProperty("监控状态名称")
+    private String monitorStateName;
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
new file mode 100644
index 0000000..8edbe2d
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SyncUserDTO {
+
+    @ApiModelProperty("人员id")
+    private Long id;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("人员名称")
+    private String name;
+
+    @ApiModelProperty("电话")
+    private String phone;
+
+    @ApiModelProperty("账号")
+    private String account;
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
index 14dc9b8..aef0ae4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
@@ -5,11 +5,13 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -100,7 +102,10 @@
     private String pressureLevel;
 
     @TableField("updt_time")
-    private LocalDateTime updtTime;
+    private Date updtTime;
 
+    @ApiModelProperty("区域点集合")
+    @TableField(exist = false)
+    private String trajectory;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index 5d1f30b..5659491 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -36,6 +36,10 @@
     @TableField("GRID_CODE")
     private String gridCode;
 
+    @ApiModelProperty("网格名称")
+    @TableField("GRID_Name")
+    private String gridName;
+
     @ApiModelProperty("管理单位")
     @TableField("DEPTID")
     private Long deptid;
@@ -68,6 +72,18 @@
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("同步id")
+    @TableField("SYNC_ID")
+    private String syncId;
+
+    @ApiModelProperty("地图坐标集合")
+    @TableField("TRAJECTORY")
+    private String trajectory;
+
+    @ApiModelProperty("是否同步1，是0，否")
+    @TableField("IS_SYNC")
+    private int isSync;
+
     @ApiModelProperty("部门名称")
     @TableField(exist = false)
     private String deptName;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
index 08a4bb6..eb4d377 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务类
@@ -13,4 +15,6 @@
  */
 public interface IBdcRegionAreaService extends IService<BdcRegionArea> {
 
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 4ea13f2..65fb3ab 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -48,4 +48,6 @@
 
     String getBfcf(String devcode);
 
+    List<String> getDeviceRule(String devcode);
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
index 687fe02..e0547bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@
 @Mapper
 public interface CtUserMapper extends BaseMapper<CtUser> {
 
+    @Select("SELECT USER_ID FROM `ct_role_user` WHERE ROLE_ID='6a050c90c1e648ee8d2034baea6856df'")
+    List<String> getCtUserGroupIds();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 60f32a3..99ef10b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -156,9 +156,9 @@
             <if test="request.endTime != null and request.endTime !='' ">
                 and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
             </if>
-            AND (
+            <!--AND (
             ar.`STATUS` = 0
-            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))-->
         </where>
         ORDER BY ar.ALARM_TIME DESC
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
index 0f603c4..4788357 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
@@ -18,5 +18,23 @@
     <sql id="Base_Column_List">
         ID, GRID_CODE, DEPTID, PRINCIPAL, TELEPHONE, PRESS_TYPE, PIPE_LENGTH, TS
     </sql>
-
+    <select id="getSyncUserDTOList" resultType="com.casic.missiles.modular.device.dto.SyncUserDTO">
+        WITH user_temp AS (
+            SELECT
+                ID,
+                ACCOUNT,
+                NAME,
+                PHONE,
+                DEPT_ID
+            FROM
+                sys_user
+            WHERE
+                DEPT_ID IN ( SELECT id FROM `sys_dept` WHERE tips = 'grid' ))
+        SELECT
+            *
+        FROM
+            ( SELECT *, ROW_NUMBER() OVER ( PARTITION BY DEPT_ID ORDER BY ID DESC ) AS rn FROM user_temp ) t
+        WHERE
+            rn = 1
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
index a716a72..aa6c790 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
@@ -70,19 +70,15 @@
 
     <select id="pageGridList" resultType="com.casic.missiles.modular.device.entity.BusGrid">
         SELECT
-        bg.*,
-        sd.FULL_NAME as deptName
+        bg.*
         FROM
         bus_grid bg
-        LEFT JOIN sys_dept sd ON bg.DEPTID = sd.ID
         WHERE 1=1
 
         <if test="request.gridCode != null and request.gridCode !='' ">
             and bg.GRID_CODE like concat('%', #{request.gridCode}, '%')
         </if>
-        <if test="request.deptid != null and request.deptid !=''">
-            and bg.DEPTID = #{request.responsibleDept}
-        </if>
+
         <if test="request.locationState != null and request.locationState !=''">
             and bg.LOCATION_STATE = #{request.locationState}
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 7965bfc..5f8d90f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.device.dto;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -74,5 +75,11 @@
     @ApiModelProperty("左侧指示带长度")
     private String rightLength;
 
+    @ApiModelProperty("监控状态（1：正常，2：异常，3：离线，0：未监测）")
+    private String monitorState;
+
+    @ApiModelProperty("监控状态名称")
+    private String monitorStateName;
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
new file mode 100644
index 0000000..8edbe2d
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SyncUserDTO {
+
+    @ApiModelProperty("人员id")
+    private Long id;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("人员名称")
+    private String name;
+
+    @ApiModelProperty("电话")
+    private String phone;
+
+    @ApiModelProperty("账号")
+    private String account;
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
index 14dc9b8..aef0ae4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
@@ -5,11 +5,13 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -100,7 +102,10 @@
     private String pressureLevel;
 
     @TableField("updt_time")
-    private LocalDateTime updtTime;
+    private Date updtTime;
 
+    @ApiModelProperty("区域点集合")
+    @TableField(exist = false)
+    private String trajectory;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index 5d1f30b..5659491 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -36,6 +36,10 @@
     @TableField("GRID_CODE")
     private String gridCode;
 
+    @ApiModelProperty("网格名称")
+    @TableField("GRID_Name")
+    private String gridName;
+
     @ApiModelProperty("管理单位")
     @TableField("DEPTID")
     private Long deptid;
@@ -68,6 +72,18 @@
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("同步id")
+    @TableField("SYNC_ID")
+    private String syncId;
+
+    @ApiModelProperty("地图坐标集合")
+    @TableField("TRAJECTORY")
+    private String trajectory;
+
+    @ApiModelProperty("是否同步1，是0，否")
+    @TableField("IS_SYNC")
+    private int isSync;
+
     @ApiModelProperty("部门名称")
     @TableField(exist = false)
     private String deptName;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
index 08a4bb6..eb4d377 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务类
@@ -13,4 +15,6 @@
  */
 public interface IBdcRegionAreaService extends IService<BdcRegionArea> {
 
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 4ea13f2..65fb3ab 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -48,4 +48,6 @@
 
     String getBfcf(String devcode);
 
+    List<String> getDeviceRule(String devcode);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
index 1d16e8d..a65debb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
@@ -12,5 +12,5 @@
  * @since 2024-07-16
  */
 public interface IBusGridService extends IService<BusGrid> {
-
+    boolean synAllGrids();
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
index 687fe02..e0547bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@
 @Mapper
 public interface CtUserMapper extends BaseMapper<CtUser> {
 
+    @Select("SELECT USER_ID FROM `ct_role_user` WHERE ROLE_ID='6a050c90c1e648ee8d2034baea6856df'")
+    List<String> getCtUserGroupIds();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 60f32a3..99ef10b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -156,9 +156,9 @@
             <if test="request.endTime != null and request.endTime !='' ">
                 and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
             </if>
-            AND (
+            <!--AND (
             ar.`STATUS` = 0
-            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))-->
         </where>
         ORDER BY ar.ALARM_TIME DESC
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
index 0f603c4..4788357 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
@@ -18,5 +18,23 @@
     <sql id="Base_Column_List">
         ID, GRID_CODE, DEPTID, PRINCIPAL, TELEPHONE, PRESS_TYPE, PIPE_LENGTH, TS
     </sql>
-
+    <select id="getSyncUserDTOList" resultType="com.casic.missiles.modular.device.dto.SyncUserDTO">
+        WITH user_temp AS (
+            SELECT
+                ID,
+                ACCOUNT,
+                NAME,
+                PHONE,
+                DEPT_ID
+            FROM
+                sys_user
+            WHERE
+                DEPT_ID IN ( SELECT id FROM `sys_dept` WHERE tips = 'grid' ))
+        SELECT
+            *
+        FROM
+            ( SELECT *, ROW_NUMBER() OVER ( PARTITION BY DEPT_ID ORDER BY ID DESC ) AS rn FROM user_temp ) t
+        WHERE
+            rn = 1
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
index a716a72..aa6c790 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
@@ -70,19 +70,15 @@
 
     <select id="pageGridList" resultType="com.casic.missiles.modular.device.entity.BusGrid">
         SELECT
-        bg.*,
-        sd.FULL_NAME as deptName
+        bg.*
         FROM
         bus_grid bg
-        LEFT JOIN sys_dept sd ON bg.DEPTID = sd.ID
         WHERE 1=1
 
         <if test="request.gridCode != null and request.gridCode !='' ">
             and bg.GRID_CODE like concat('%', #{request.gridCode}, '%')
         </if>
-        <if test="request.deptid != null and request.deptid !=''">
-            and bg.DEPTID = #{request.responsibleDept}
-        </if>
+
         <if test="request.locationState != null and request.locationState !=''">
             and bg.LOCATION_STATE = #{request.locationState}
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 7965bfc..5f8d90f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.device.dto;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -74,5 +75,11 @@
     @ApiModelProperty("左侧指示带长度")
     private String rightLength;
 
+    @ApiModelProperty("监控状态（1：正常，2：异常，3：离线，0：未监测）")
+    private String monitorState;
+
+    @ApiModelProperty("监控状态名称")
+    private String monitorStateName;
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
new file mode 100644
index 0000000..8edbe2d
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SyncUserDTO {
+
+    @ApiModelProperty("人员id")
+    private Long id;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("人员名称")
+    private String name;
+
+    @ApiModelProperty("电话")
+    private String phone;
+
+    @ApiModelProperty("账号")
+    private String account;
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
index 14dc9b8..aef0ae4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
@@ -5,11 +5,13 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -100,7 +102,10 @@
     private String pressureLevel;
 
     @TableField("updt_time")
-    private LocalDateTime updtTime;
+    private Date updtTime;
 
+    @ApiModelProperty("区域点集合")
+    @TableField(exist = false)
+    private String trajectory;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index 5d1f30b..5659491 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -36,6 +36,10 @@
     @TableField("GRID_CODE")
     private String gridCode;
 
+    @ApiModelProperty("网格名称")
+    @TableField("GRID_Name")
+    private String gridName;
+
     @ApiModelProperty("管理单位")
     @TableField("DEPTID")
     private Long deptid;
@@ -68,6 +72,18 @@
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("同步id")
+    @TableField("SYNC_ID")
+    private String syncId;
+
+    @ApiModelProperty("地图坐标集合")
+    @TableField("TRAJECTORY")
+    private String trajectory;
+
+    @ApiModelProperty("是否同步1，是0，否")
+    @TableField("IS_SYNC")
+    private int isSync;
+
     @ApiModelProperty("部门名称")
     @TableField(exist = false)
     private String deptName;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
index 08a4bb6..eb4d377 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务类
@@ -13,4 +15,6 @@
  */
 public interface IBdcRegionAreaService extends IService<BdcRegionArea> {
 
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 4ea13f2..65fb3ab 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -48,4 +48,6 @@
 
     String getBfcf(String devcode);
 
+    List<String> getDeviceRule(String devcode);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
index 1d16e8d..a65debb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
@@ -12,5 +12,5 @@
  * @since 2024-07-16
  */
 public interface IBusGridService extends IService<BusGrid> {
-
+    boolean synAllGrids();
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
index ec973f5..d6f42b2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
@@ -40,4 +40,6 @@
     boolean synAllDept();
 
     boolean synAllLedger();
+
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
index 687fe02..e0547bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@
 @Mapper
 public interface CtUserMapper extends BaseMapper<CtUser> {
 
+    @Select("SELECT USER_ID FROM `ct_role_user` WHERE ROLE_ID='6a050c90c1e648ee8d2034baea6856df'")
+    List<String> getCtUserGroupIds();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 60f32a3..99ef10b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -156,9 +156,9 @@
             <if test="request.endTime != null and request.endTime !='' ">
                 and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
             </if>
-            AND (
+            <!--AND (
             ar.`STATUS` = 0
-            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))-->
         </where>
         ORDER BY ar.ALARM_TIME DESC
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
index 0f603c4..4788357 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
@@ -18,5 +18,23 @@
     <sql id="Base_Column_List">
         ID, GRID_CODE, DEPTID, PRINCIPAL, TELEPHONE, PRESS_TYPE, PIPE_LENGTH, TS
     </sql>
-
+    <select id="getSyncUserDTOList" resultType="com.casic.missiles.modular.device.dto.SyncUserDTO">
+        WITH user_temp AS (
+            SELECT
+                ID,
+                ACCOUNT,
+                NAME,
+                PHONE,
+                DEPT_ID
+            FROM
+                sys_user
+            WHERE
+                DEPT_ID IN ( SELECT id FROM `sys_dept` WHERE tips = 'grid' ))
+        SELECT
+            *
+        FROM
+            ( SELECT *, ROW_NUMBER() OVER ( PARTITION BY DEPT_ID ORDER BY ID DESC ) AS rn FROM user_temp ) t
+        WHERE
+            rn = 1
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
index a716a72..aa6c790 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
@@ -70,19 +70,15 @@
 
     <select id="pageGridList" resultType="com.casic.missiles.modular.device.entity.BusGrid">
         SELECT
-        bg.*,
-        sd.FULL_NAME as deptName
+        bg.*
         FROM
         bus_grid bg
-        LEFT JOIN sys_dept sd ON bg.DEPTID = sd.ID
         WHERE 1=1
 
         <if test="request.gridCode != null and request.gridCode !='' ">
             and bg.GRID_CODE like concat('%', #{request.gridCode}, '%')
         </if>
-        <if test="request.deptid != null and request.deptid !=''">
-            and bg.DEPTID = #{request.responsibleDept}
-        </if>
+
         <if test="request.locationState != null and request.locationState !=''">
             and bg.LOCATION_STATE = #{request.locationState}
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 7965bfc..5f8d90f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.device.dto;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -74,5 +75,11 @@
     @ApiModelProperty("左侧指示带长度")
     private String rightLength;
 
+    @ApiModelProperty("监控状态（1：正常，2：异常，3：离线，0：未监测）")
+    private String monitorState;
+
+    @ApiModelProperty("监控状态名称")
+    private String monitorStateName;
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
new file mode 100644
index 0000000..8edbe2d
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SyncUserDTO {
+
+    @ApiModelProperty("人员id")
+    private Long id;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("人员名称")
+    private String name;
+
+    @ApiModelProperty("电话")
+    private String phone;
+
+    @ApiModelProperty("账号")
+    private String account;
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
index 14dc9b8..aef0ae4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
@@ -5,11 +5,13 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -100,7 +102,10 @@
     private String pressureLevel;
 
     @TableField("updt_time")
-    private LocalDateTime updtTime;
+    private Date updtTime;
 
+    @ApiModelProperty("区域点集合")
+    @TableField(exist = false)
+    private String trajectory;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index 5d1f30b..5659491 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -36,6 +36,10 @@
     @TableField("GRID_CODE")
     private String gridCode;
 
+    @ApiModelProperty("网格名称")
+    @TableField("GRID_Name")
+    private String gridName;
+
     @ApiModelProperty("管理单位")
     @TableField("DEPTID")
     private Long deptid;
@@ -68,6 +72,18 @@
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("同步id")
+    @TableField("SYNC_ID")
+    private String syncId;
+
+    @ApiModelProperty("地图坐标集合")
+    @TableField("TRAJECTORY")
+    private String trajectory;
+
+    @ApiModelProperty("是否同步1，是0，否")
+    @TableField("IS_SYNC")
+    private int isSync;
+
     @ApiModelProperty("部门名称")
     @TableField(exist = false)
     private String deptName;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
index 08a4bb6..eb4d377 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务类
@@ -13,4 +15,6 @@
  */
 public interface IBdcRegionAreaService extends IService<BdcRegionArea> {
 
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 4ea13f2..65fb3ab 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -48,4 +48,6 @@
 
     String getBfcf(String devcode);
 
+    List<String> getDeviceRule(String devcode);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
index 1d16e8d..a65debb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
@@ -12,5 +12,5 @@
  * @since 2024-07-16
  */
 public interface IBusGridService extends IService<BusGrid> {
-
+    boolean synAllGrids();
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
index ec973f5..d6f42b2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
@@ -40,4 +40,6 @@
     boolean synAllDept();
 
     boolean synAllLedger();
+
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
index f681c35..acd3cb4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
@@ -13,4 +13,6 @@
  */
 public interface ICtUserService extends IService<CtUser> {
 
+    boolean synAllUsers();
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
index 687fe02..e0547bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@
 @Mapper
 public interface CtUserMapper extends BaseMapper<CtUser> {
 
+    @Select("SELECT USER_ID FROM `ct_role_user` WHERE ROLE_ID='6a050c90c1e648ee8d2034baea6856df'")
+    List<String> getCtUserGroupIds();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 60f32a3..99ef10b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -156,9 +156,9 @@
             <if test="request.endTime != null and request.endTime !='' ">
                 and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
             </if>
-            AND (
+            <!--AND (
             ar.`STATUS` = 0
-            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))-->
         </where>
         ORDER BY ar.ALARM_TIME DESC
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
index 0f603c4..4788357 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
@@ -18,5 +18,23 @@
     <sql id="Base_Column_List">
         ID, GRID_CODE, DEPTID, PRINCIPAL, TELEPHONE, PRESS_TYPE, PIPE_LENGTH, TS
     </sql>
-
+    <select id="getSyncUserDTOList" resultType="com.casic.missiles.modular.device.dto.SyncUserDTO">
+        WITH user_temp AS (
+            SELECT
+                ID,
+                ACCOUNT,
+                NAME,
+                PHONE,
+                DEPT_ID
+            FROM
+                sys_user
+            WHERE
+                DEPT_ID IN ( SELECT id FROM `sys_dept` WHERE tips = 'grid' ))
+        SELECT
+            *
+        FROM
+            ( SELECT *, ROW_NUMBER() OVER ( PARTITION BY DEPT_ID ORDER BY ID DESC ) AS rn FROM user_temp ) t
+        WHERE
+            rn = 1
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
index a716a72..aa6c790 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
@@ -70,19 +70,15 @@
 
     <select id="pageGridList" resultType="com.casic.missiles.modular.device.entity.BusGrid">
         SELECT
-        bg.*,
-        sd.FULL_NAME as deptName
+        bg.*
         FROM
         bus_grid bg
-        LEFT JOIN sys_dept sd ON bg.DEPTID = sd.ID
         WHERE 1=1
 
         <if test="request.gridCode != null and request.gridCode !='' ">
             and bg.GRID_CODE like concat('%', #{request.gridCode}, '%')
         </if>
-        <if test="request.deptid != null and request.deptid !=''">
-            and bg.DEPTID = #{request.responsibleDept}
-        </if>
+
         <if test="request.locationState != null and request.locationState !=''">
             and bg.LOCATION_STATE = #{request.locationState}
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 7965bfc..5f8d90f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.device.dto;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -74,5 +75,11 @@
     @ApiModelProperty("左侧指示带长度")
     private String rightLength;
 
+    @ApiModelProperty("监控状态（1：正常，2：异常，3：离线，0：未监测）")
+    private String monitorState;
+
+    @ApiModelProperty("监控状态名称")
+    private String monitorStateName;
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
new file mode 100644
index 0000000..8edbe2d
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SyncUserDTO {
+
+    @ApiModelProperty("人员id")
+    private Long id;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("人员名称")
+    private String name;
+
+    @ApiModelProperty("电话")
+    private String phone;
+
+    @ApiModelProperty("账号")
+    private String account;
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
index 14dc9b8..aef0ae4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
@@ -5,11 +5,13 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -100,7 +102,10 @@
     private String pressureLevel;
 
     @TableField("updt_time")
-    private LocalDateTime updtTime;
+    private Date updtTime;
 
+    @ApiModelProperty("区域点集合")
+    @TableField(exist = false)
+    private String trajectory;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index 5d1f30b..5659491 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -36,6 +36,10 @@
     @TableField("GRID_CODE")
     private String gridCode;
 
+    @ApiModelProperty("网格名称")
+    @TableField("GRID_Name")
+    private String gridName;
+
     @ApiModelProperty("管理单位")
     @TableField("DEPTID")
     private Long deptid;
@@ -68,6 +72,18 @@
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("同步id")
+    @TableField("SYNC_ID")
+    private String syncId;
+
+    @ApiModelProperty("地图坐标集合")
+    @TableField("TRAJECTORY")
+    private String trajectory;
+
+    @ApiModelProperty("是否同步1，是0，否")
+    @TableField("IS_SYNC")
+    private int isSync;
+
     @ApiModelProperty("部门名称")
     @TableField(exist = false)
     private String deptName;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
index 08a4bb6..eb4d377 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务类
@@ -13,4 +15,6 @@
  */
 public interface IBdcRegionAreaService extends IService<BdcRegionArea> {
 
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 4ea13f2..65fb3ab 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -48,4 +48,6 @@
 
     String getBfcf(String devcode);
 
+    List<String> getDeviceRule(String devcode);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
index 1d16e8d..a65debb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
@@ -12,5 +12,5 @@
  * @since 2024-07-16
  */
 public interface IBusGridService extends IService<BusGrid> {
-
+    boolean synAllGrids();
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
index ec973f5..d6f42b2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
@@ -40,4 +40,6 @@
     boolean synAllDept();
 
     boolean synAllLedger();
+
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
index f681c35..acd3cb4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
@@ -13,4 +13,6 @@
  */
 public interface ICtUserService extends IService<CtUser> {
 
+    boolean synAllUsers();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
index fa513fb..0815a30 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
@@ -1,11 +1,14 @@
 package com.casic.missiles.modular.device.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.device.dao.BdcRegionAreaMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import com.casic.missiles.modular.device.service.IBdcRegionAreaService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务实现类
@@ -17,4 +20,8 @@
 @Service
 public class BdcRegionAreaServiceImpl extends ServiceImpl<BdcRegionAreaMapper, BdcRegionArea> implements IBdcRegionAreaService {
 
+    @Override
+    public List<BdcRegionArea> getBdcRegionAreaList() {
+        return this.baseMapper.getBdcRegionAreaList();
+    }
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
index 687fe02..e0547bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@
 @Mapper
 public interface CtUserMapper extends BaseMapper<CtUser> {
 
+    @Select("SELECT USER_ID FROM `ct_role_user` WHERE ROLE_ID='6a050c90c1e648ee8d2034baea6856df'")
+    List<String> getCtUserGroupIds();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 60f32a3..99ef10b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -156,9 +156,9 @@
             <if test="request.endTime != null and request.endTime !='' ">
                 and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
             </if>
-            AND (
+            <!--AND (
             ar.`STATUS` = 0
-            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))-->
         </where>
         ORDER BY ar.ALARM_TIME DESC
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
index 0f603c4..4788357 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
@@ -18,5 +18,23 @@
     <sql id="Base_Column_List">
         ID, GRID_CODE, DEPTID, PRINCIPAL, TELEPHONE, PRESS_TYPE, PIPE_LENGTH, TS
     </sql>
-
+    <select id="getSyncUserDTOList" resultType="com.casic.missiles.modular.device.dto.SyncUserDTO">
+        WITH user_temp AS (
+            SELECT
+                ID,
+                ACCOUNT,
+                NAME,
+                PHONE,
+                DEPT_ID
+            FROM
+                sys_user
+            WHERE
+                DEPT_ID IN ( SELECT id FROM `sys_dept` WHERE tips = 'grid' ))
+        SELECT
+            *
+        FROM
+            ( SELECT *, ROW_NUMBER() OVER ( PARTITION BY DEPT_ID ORDER BY ID DESC ) AS rn FROM user_temp ) t
+        WHERE
+            rn = 1
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
index a716a72..aa6c790 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
@@ -70,19 +70,15 @@
 
     <select id="pageGridList" resultType="com.casic.missiles.modular.device.entity.BusGrid">
         SELECT
-        bg.*,
-        sd.FULL_NAME as deptName
+        bg.*
         FROM
         bus_grid bg
-        LEFT JOIN sys_dept sd ON bg.DEPTID = sd.ID
         WHERE 1=1
 
         <if test="request.gridCode != null and request.gridCode !='' ">
             and bg.GRID_CODE like concat('%', #{request.gridCode}, '%')
         </if>
-        <if test="request.deptid != null and request.deptid !=''">
-            and bg.DEPTID = #{request.responsibleDept}
-        </if>
+
         <if test="request.locationState != null and request.locationState !=''">
             and bg.LOCATION_STATE = #{request.locationState}
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 7965bfc..5f8d90f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.device.dto;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -74,5 +75,11 @@
     @ApiModelProperty("左侧指示带长度")
     private String rightLength;
 
+    @ApiModelProperty("监控状态（1：正常，2：异常，3：离线，0：未监测）")
+    private String monitorState;
+
+    @ApiModelProperty("监控状态名称")
+    private String monitorStateName;
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
new file mode 100644
index 0000000..8edbe2d
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SyncUserDTO {
+
+    @ApiModelProperty("人员id")
+    private Long id;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("人员名称")
+    private String name;
+
+    @ApiModelProperty("电话")
+    private String phone;
+
+    @ApiModelProperty("账号")
+    private String account;
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
index 14dc9b8..aef0ae4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
@@ -5,11 +5,13 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -100,7 +102,10 @@
     private String pressureLevel;
 
     @TableField("updt_time")
-    private LocalDateTime updtTime;
+    private Date updtTime;
 
+    @ApiModelProperty("区域点集合")
+    @TableField(exist = false)
+    private String trajectory;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index 5d1f30b..5659491 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -36,6 +36,10 @@
     @TableField("GRID_CODE")
     private String gridCode;
 
+    @ApiModelProperty("网格名称")
+    @TableField("GRID_Name")
+    private String gridName;
+
     @ApiModelProperty("管理单位")
     @TableField("DEPTID")
     private Long deptid;
@@ -68,6 +72,18 @@
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("同步id")
+    @TableField("SYNC_ID")
+    private String syncId;
+
+    @ApiModelProperty("地图坐标集合")
+    @TableField("TRAJECTORY")
+    private String trajectory;
+
+    @ApiModelProperty("是否同步1，是0，否")
+    @TableField("IS_SYNC")
+    private int isSync;
+
     @ApiModelProperty("部门名称")
     @TableField(exist = false)
     private String deptName;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
index 08a4bb6..eb4d377 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务类
@@ -13,4 +15,6 @@
  */
 public interface IBdcRegionAreaService extends IService<BdcRegionArea> {
 
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 4ea13f2..65fb3ab 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -48,4 +48,6 @@
 
     String getBfcf(String devcode);
 
+    List<String> getDeviceRule(String devcode);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
index 1d16e8d..a65debb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
@@ -12,5 +12,5 @@
  * @since 2024-07-16
  */
 public interface IBusGridService extends IService<BusGrid> {
-
+    boolean synAllGrids();
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
index ec973f5..d6f42b2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
@@ -40,4 +40,6 @@
     boolean synAllDept();
 
     boolean synAllLedger();
+
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
index f681c35..acd3cb4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
@@ -13,4 +13,6 @@
  */
 public interface ICtUserService extends IService<CtUser> {
 
+    boolean synAllUsers();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
index fa513fb..0815a30 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
@@ -1,11 +1,14 @@
 package com.casic.missiles.modular.device.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.device.dao.BdcRegionAreaMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import com.casic.missiles.modular.device.service.IBdcRegionAreaService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务实现类
@@ -17,4 +20,8 @@
 @Service
 public class BdcRegionAreaServiceImpl extends ServiceImpl<BdcRegionAreaMapper, BdcRegionArea> implements IBdcRegionAreaService {
 
+    @Override
+    public List<BdcRegionArea> getBdcRegionAreaList() {
+        return this.baseMapper.getBdcRegionAreaList();
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index a2e45de..610fdf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -489,4 +489,15 @@
         }
         return true;
     }
+
+
+    @Cacheable(value = "alarmRuleCache", key = "#devcode")
+    @Override
+    public List<String> getDeviceRule(String devcode) {
+        List<String> alarmRuleValueList = this.baseMapper.getSpecialDeviceRule(devcode);
+        if(alarmRuleValueList==null||alarmRuleValueList.size()<1){
+            alarmRuleValueList=this.baseMapper.getDeviceTypeRule(devcode);
+        }
+        return alarmRuleValueList;
+    }
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
index 687fe02..e0547bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@
 @Mapper
 public interface CtUserMapper extends BaseMapper<CtUser> {
 
+    @Select("SELECT USER_ID FROM `ct_role_user` WHERE ROLE_ID='6a050c90c1e648ee8d2034baea6856df'")
+    List<String> getCtUserGroupIds();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 60f32a3..99ef10b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -156,9 +156,9 @@
             <if test="request.endTime != null and request.endTime !='' ">
                 and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
             </if>
-            AND (
+            <!--AND (
             ar.`STATUS` = 0
-            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))-->
         </where>
         ORDER BY ar.ALARM_TIME DESC
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
index 0f603c4..4788357 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
@@ -18,5 +18,23 @@
     <sql id="Base_Column_List">
         ID, GRID_CODE, DEPTID, PRINCIPAL, TELEPHONE, PRESS_TYPE, PIPE_LENGTH, TS
     </sql>
-
+    <select id="getSyncUserDTOList" resultType="com.casic.missiles.modular.device.dto.SyncUserDTO">
+        WITH user_temp AS (
+            SELECT
+                ID,
+                ACCOUNT,
+                NAME,
+                PHONE,
+                DEPT_ID
+            FROM
+                sys_user
+            WHERE
+                DEPT_ID IN ( SELECT id FROM `sys_dept` WHERE tips = 'grid' ))
+        SELECT
+            *
+        FROM
+            ( SELECT *, ROW_NUMBER() OVER ( PARTITION BY DEPT_ID ORDER BY ID DESC ) AS rn FROM user_temp ) t
+        WHERE
+            rn = 1
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
index a716a72..aa6c790 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
@@ -70,19 +70,15 @@
 
     <select id="pageGridList" resultType="com.casic.missiles.modular.device.entity.BusGrid">
         SELECT
-        bg.*,
-        sd.FULL_NAME as deptName
+        bg.*
         FROM
         bus_grid bg
-        LEFT JOIN sys_dept sd ON bg.DEPTID = sd.ID
         WHERE 1=1
 
         <if test="request.gridCode != null and request.gridCode !='' ">
             and bg.GRID_CODE like concat('%', #{request.gridCode}, '%')
         </if>
-        <if test="request.deptid != null and request.deptid !=''">
-            and bg.DEPTID = #{request.responsibleDept}
-        </if>
+
         <if test="request.locationState != null and request.locationState !=''">
             and bg.LOCATION_STATE = #{request.locationState}
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 7965bfc..5f8d90f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.device.dto;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -74,5 +75,11 @@
     @ApiModelProperty("左侧指示带长度")
     private String rightLength;
 
+    @ApiModelProperty("监控状态（1：正常，2：异常，3：离线，0：未监测）")
+    private String monitorState;
+
+    @ApiModelProperty("监控状态名称")
+    private String monitorStateName;
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
new file mode 100644
index 0000000..8edbe2d
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SyncUserDTO {
+
+    @ApiModelProperty("人员id")
+    private Long id;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("人员名称")
+    private String name;
+
+    @ApiModelProperty("电话")
+    private String phone;
+
+    @ApiModelProperty("账号")
+    private String account;
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
index 14dc9b8..aef0ae4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
@@ -5,11 +5,13 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -100,7 +102,10 @@
     private String pressureLevel;
 
     @TableField("updt_time")
-    private LocalDateTime updtTime;
+    private Date updtTime;
 
+    @ApiModelProperty("区域点集合")
+    @TableField(exist = false)
+    private String trajectory;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index 5d1f30b..5659491 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -36,6 +36,10 @@
     @TableField("GRID_CODE")
     private String gridCode;
 
+    @ApiModelProperty("网格名称")
+    @TableField("GRID_Name")
+    private String gridName;
+
     @ApiModelProperty("管理单位")
     @TableField("DEPTID")
     private Long deptid;
@@ -68,6 +72,18 @@
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("同步id")
+    @TableField("SYNC_ID")
+    private String syncId;
+
+    @ApiModelProperty("地图坐标集合")
+    @TableField("TRAJECTORY")
+    private String trajectory;
+
+    @ApiModelProperty("是否同步1，是0，否")
+    @TableField("IS_SYNC")
+    private int isSync;
+
     @ApiModelProperty("部门名称")
     @TableField(exist = false)
     private String deptName;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
index 08a4bb6..eb4d377 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务类
@@ -13,4 +15,6 @@
  */
 public interface IBdcRegionAreaService extends IService<BdcRegionArea> {
 
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 4ea13f2..65fb3ab 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -48,4 +48,6 @@
 
     String getBfcf(String devcode);
 
+    List<String> getDeviceRule(String devcode);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
index 1d16e8d..a65debb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
@@ -12,5 +12,5 @@
  * @since 2024-07-16
  */
 public interface IBusGridService extends IService<BusGrid> {
-
+    boolean synAllGrids();
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
index ec973f5..d6f42b2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
@@ -40,4 +40,6 @@
     boolean synAllDept();
 
     boolean synAllLedger();
+
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
index f681c35..acd3cb4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
@@ -13,4 +13,6 @@
  */
 public interface ICtUserService extends IService<CtUser> {
 
+    boolean synAllUsers();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
index fa513fb..0815a30 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
@@ -1,11 +1,14 @@
 package com.casic.missiles.modular.device.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.device.dao.BdcRegionAreaMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import com.casic.missiles.modular.device.service.IBdcRegionAreaService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务实现类
@@ -17,4 +20,8 @@
 @Service
 public class BdcRegionAreaServiceImpl extends ServiceImpl<BdcRegionAreaMapper, BdcRegionArea> implements IBdcRegionAreaService {
 
+    @Override
+    public List<BdcRegionArea> getBdcRegionAreaList() {
+        return this.baseMapper.getBdcRegionAreaList();
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index a2e45de..610fdf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -489,4 +489,15 @@
         }
         return true;
     }
+
+
+    @Cacheable(value = "alarmRuleCache", key = "#devcode")
+    @Override
+    public List<String> getDeviceRule(String devcode) {
+        List<String> alarmRuleValueList = this.baseMapper.getSpecialDeviceRule(devcode);
+        if(alarmRuleValueList==null||alarmRuleValueList.size()<1){
+            alarmRuleValueList=this.baseMapper.getDeviceTypeRule(devcode);
+        }
+        return alarmRuleValueList;
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java
index 7ca3100..b230a73 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java
@@ -1,11 +1,24 @@
 package com.casic.missiles.modular.device.service.impl;
 
-import com.casic.missiles.modular.device.dao.BusGridMapper;
-import com.casic.missiles.modular.device.service.IBusGridService;
-import com.casic.missiles.modular.device.entity.BusGrid;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDeptService;
+import com.casic.missiles.modular.device.dao.BusGridMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
+import com.casic.missiles.modular.device.entity.BdcRegionArea;
+import com.casic.missiles.modular.device.entity.BusGrid;
+import com.casic.missiles.modular.device.service.IBdcRegionAreaService;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.modular.system.model.Dept;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * <p>
  * 网格管理	 服务实现类
@@ -14,7 +27,60 @@
  * @author zt
  * @since 2024-07-16
  */
+@RequiredArgsConstructor
 @Service
 public class BusGridServiceImpl extends ServiceImpl<BusGridMapper, BusGrid> implements IBusGridService {
 
+    private final IBdcRegionAreaService iBdcRegionAreaService;
+    private final AbstractDeptService abstractDeptService;
+
+    @Override
+    public boolean synAllGrids() {
+        List<BdcRegionArea> bdcRegionAreaList = iBdcRegionAreaService.getBdcRegionAreaList();
+        List<Dept> deptList = abstractDeptService.getListByTips("");
+        List<SyncUserDTO> syncUserDTOList = this.baseMapper.getSyncUserDTOList();
+        List<BusGrid> busGrids = this.list();
+        List<BusGrid> busGridList = new ArrayList<>();
+        for (BdcRegionArea bdcRegionArea : bdcRegionAreaList) {
+            BusGrid busGrid = new BusGrid();
+
+            Optional<BusGrid> firstBusGrid = busGrids.stream().filter(busGrid1 -> Objects.equals(busGrid1.getSyncId(), bdcRegionArea.getRegionAreaId())).findFirst();
+            BusGrid busGridOld = null;
+            if (firstBusGrid.isPresent()) {
+                busGridOld = firstBusGrid.get();
+                busGrid.setId(busGridOld.getId());
+            }
+            busGrid.setGridCode(bdcRegionArea.getRegionCode());
+            busGrid.setPressType(bdcRegionArea.getPressureLevel());
+            busGrid.setIsSync(1);
+            busGrid.setSyncId(bdcRegionArea.getRegionAreaId());
+            busGrid.setGridName(bdcRegionArea.getRegionName());
+            busGrid.setPipeLength(bdcRegionArea.getPipelineLength());
+            busGrid.setTrajectory(bdcRegionArea.getTrajectory());
+            if (ObjectUtil.isNotEmpty(bdcRegionArea.getRegionCode())) {
+                for (Dept dept : deptList) {
+                    if (ObjectUtil.equals(bdcRegionArea.getRegionCode(), dept.getTenantId())) {
+                        busGrid.setDeptid(dept.getId());
+                        Optional<SyncUserDTO> syncUserDTO = syncUserDTOList.stream().filter(syncUserDTO1 -> Objects.equals(syncUserDTO1.getDeptId(), dept.getId())).findFirst();
+                        if (syncUserDTO.isPresent()) {
+                            busGrid.setPrincipal(syncUserDTO.get().getName());
+                            busGrid.setTelephone(syncUserDTO.get().getPhone());
+                        }
+                        break;
+                    }
+                }
+            }
+            if (ObjectUtil.isNotEmpty(bdcRegionArea.getTrajectory()))
+                busGrid.setLocationState("1");
+
+            if (busGridOld != null
+                    && StrUtil.equals(busGridOld.getGridCode(), busGrid.getGridCode()) && StrUtil.equals(busGridOld.getGridName(), busGrid.getGridName())
+                    && StrUtil.equals(busGridOld.getPressType(), busGrid.getPressType()) && StrUtil.equals(busGridOld.getPipeLength(), busGrid.getPipeLength())
+                    && StrUtil.equals(busGridOld.getPrincipal(), busGrid.getPrincipal()) && StrUtil.equals(busGridOld.getTelephone(), busGrid.getTelephone())
+                    && StrUtil.equals(busGridOld.getTrajectory(), busGrid.getTrajectory()) && ObjectUtil.equals(busGridOld.getDeptid(), busGrid.getDeptid()))
+                continue;
+            busGridList.add(busGrid);
+        }
+        return this.saveOrUpdateBatch(busGridList);
+    }
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
index 687fe02..e0547bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@
 @Mapper
 public interface CtUserMapper extends BaseMapper<CtUser> {
 
+    @Select("SELECT USER_ID FROM `ct_role_user` WHERE ROLE_ID='6a050c90c1e648ee8d2034baea6856df'")
+    List<String> getCtUserGroupIds();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 60f32a3..99ef10b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -156,9 +156,9 @@
             <if test="request.endTime != null and request.endTime !='' ">
                 and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
             </if>
-            AND (
+            <!--AND (
             ar.`STATUS` = 0
-            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))-->
         </where>
         ORDER BY ar.ALARM_TIME DESC
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
index 0f603c4..4788357 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
@@ -18,5 +18,23 @@
     <sql id="Base_Column_List">
         ID, GRID_CODE, DEPTID, PRINCIPAL, TELEPHONE, PRESS_TYPE, PIPE_LENGTH, TS
     </sql>
-
+    <select id="getSyncUserDTOList" resultType="com.casic.missiles.modular.device.dto.SyncUserDTO">
+        WITH user_temp AS (
+            SELECT
+                ID,
+                ACCOUNT,
+                NAME,
+                PHONE,
+                DEPT_ID
+            FROM
+                sys_user
+            WHERE
+                DEPT_ID IN ( SELECT id FROM `sys_dept` WHERE tips = 'grid' ))
+        SELECT
+            *
+        FROM
+            ( SELECT *, ROW_NUMBER() OVER ( PARTITION BY DEPT_ID ORDER BY ID DESC ) AS rn FROM user_temp ) t
+        WHERE
+            rn = 1
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
index a716a72..aa6c790 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
@@ -70,19 +70,15 @@
 
     <select id="pageGridList" resultType="com.casic.missiles.modular.device.entity.BusGrid">
         SELECT
-        bg.*,
-        sd.FULL_NAME as deptName
+        bg.*
         FROM
         bus_grid bg
-        LEFT JOIN sys_dept sd ON bg.DEPTID = sd.ID
         WHERE 1=1
 
         <if test="request.gridCode != null and request.gridCode !='' ">
             and bg.GRID_CODE like concat('%', #{request.gridCode}, '%')
         </if>
-        <if test="request.deptid != null and request.deptid !=''">
-            and bg.DEPTID = #{request.responsibleDept}
-        </if>
+
         <if test="request.locationState != null and request.locationState !=''">
             and bg.LOCATION_STATE = #{request.locationState}
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 7965bfc..5f8d90f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.device.dto;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -74,5 +75,11 @@
     @ApiModelProperty("左侧指示带长度")
     private String rightLength;
 
+    @ApiModelProperty("监控状态（1：正常，2：异常，3：离线，0：未监测）")
+    private String monitorState;
+
+    @ApiModelProperty("监控状态名称")
+    private String monitorStateName;
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
new file mode 100644
index 0000000..8edbe2d
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SyncUserDTO {
+
+    @ApiModelProperty("人员id")
+    private Long id;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("人员名称")
+    private String name;
+
+    @ApiModelProperty("电话")
+    private String phone;
+
+    @ApiModelProperty("账号")
+    private String account;
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
index 14dc9b8..aef0ae4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
@@ -5,11 +5,13 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -100,7 +102,10 @@
     private String pressureLevel;
 
     @TableField("updt_time")
-    private LocalDateTime updtTime;
+    private Date updtTime;
 
+    @ApiModelProperty("区域点集合")
+    @TableField(exist = false)
+    private String trajectory;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index 5d1f30b..5659491 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -36,6 +36,10 @@
     @TableField("GRID_CODE")
     private String gridCode;
 
+    @ApiModelProperty("网格名称")
+    @TableField("GRID_Name")
+    private String gridName;
+
     @ApiModelProperty("管理单位")
     @TableField("DEPTID")
     private Long deptid;
@@ -68,6 +72,18 @@
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("同步id")
+    @TableField("SYNC_ID")
+    private String syncId;
+
+    @ApiModelProperty("地图坐标集合")
+    @TableField("TRAJECTORY")
+    private String trajectory;
+
+    @ApiModelProperty("是否同步1，是0，否")
+    @TableField("IS_SYNC")
+    private int isSync;
+
     @ApiModelProperty("部门名称")
     @TableField(exist = false)
     private String deptName;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
index 08a4bb6..eb4d377 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务类
@@ -13,4 +15,6 @@
  */
 public interface IBdcRegionAreaService extends IService<BdcRegionArea> {
 
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 4ea13f2..65fb3ab 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -48,4 +48,6 @@
 
     String getBfcf(String devcode);
 
+    List<String> getDeviceRule(String devcode);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
index 1d16e8d..a65debb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
@@ -12,5 +12,5 @@
  * @since 2024-07-16
  */
 public interface IBusGridService extends IService<BusGrid> {
-
+    boolean synAllGrids();
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
index ec973f5..d6f42b2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
@@ -40,4 +40,6 @@
     boolean synAllDept();
 
     boolean synAllLedger();
+
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
index f681c35..acd3cb4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
@@ -13,4 +13,6 @@
  */
 public interface ICtUserService extends IService<CtUser> {
 
+    boolean synAllUsers();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
index fa513fb..0815a30 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
@@ -1,11 +1,14 @@
 package com.casic.missiles.modular.device.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.device.dao.BdcRegionAreaMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import com.casic.missiles.modular.device.service.IBdcRegionAreaService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务实现类
@@ -17,4 +20,8 @@
 @Service
 public class BdcRegionAreaServiceImpl extends ServiceImpl<BdcRegionAreaMapper, BdcRegionArea> implements IBdcRegionAreaService {
 
+    @Override
+    public List<BdcRegionArea> getBdcRegionAreaList() {
+        return this.baseMapper.getBdcRegionAreaList();
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index a2e45de..610fdf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -489,4 +489,15 @@
         }
         return true;
     }
+
+
+    @Cacheable(value = "alarmRuleCache", key = "#devcode")
+    @Override
+    public List<String> getDeviceRule(String devcode) {
+        List<String> alarmRuleValueList = this.baseMapper.getSpecialDeviceRule(devcode);
+        if(alarmRuleValueList==null||alarmRuleValueList.size()<1){
+            alarmRuleValueList=this.baseMapper.getDeviceTypeRule(devcode);
+        }
+        return alarmRuleValueList;
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java
index 7ca3100..b230a73 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java
@@ -1,11 +1,24 @@
 package com.casic.missiles.modular.device.service.impl;
 
-import com.casic.missiles.modular.device.dao.BusGridMapper;
-import com.casic.missiles.modular.device.service.IBusGridService;
-import com.casic.missiles.modular.device.entity.BusGrid;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDeptService;
+import com.casic.missiles.modular.device.dao.BusGridMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
+import com.casic.missiles.modular.device.entity.BdcRegionArea;
+import com.casic.missiles.modular.device.entity.BusGrid;
+import com.casic.missiles.modular.device.service.IBdcRegionAreaService;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.modular.system.model.Dept;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * <p>
  * 网格管理	 服务实现类
@@ -14,7 +27,60 @@
  * @author zt
  * @since 2024-07-16
  */
+@RequiredArgsConstructor
 @Service
 public class BusGridServiceImpl extends ServiceImpl<BusGridMapper, BusGrid> implements IBusGridService {
 
+    private final IBdcRegionAreaService iBdcRegionAreaService;
+    private final AbstractDeptService abstractDeptService;
+
+    @Override
+    public boolean synAllGrids() {
+        List<BdcRegionArea> bdcRegionAreaList = iBdcRegionAreaService.getBdcRegionAreaList();
+        List<Dept> deptList = abstractDeptService.getListByTips("");
+        List<SyncUserDTO> syncUserDTOList = this.baseMapper.getSyncUserDTOList();
+        List<BusGrid> busGrids = this.list();
+        List<BusGrid> busGridList = new ArrayList<>();
+        for (BdcRegionArea bdcRegionArea : bdcRegionAreaList) {
+            BusGrid busGrid = new BusGrid();
+
+            Optional<BusGrid> firstBusGrid = busGrids.stream().filter(busGrid1 -> Objects.equals(busGrid1.getSyncId(), bdcRegionArea.getRegionAreaId())).findFirst();
+            BusGrid busGridOld = null;
+            if (firstBusGrid.isPresent()) {
+                busGridOld = firstBusGrid.get();
+                busGrid.setId(busGridOld.getId());
+            }
+            busGrid.setGridCode(bdcRegionArea.getRegionCode());
+            busGrid.setPressType(bdcRegionArea.getPressureLevel());
+            busGrid.setIsSync(1);
+            busGrid.setSyncId(bdcRegionArea.getRegionAreaId());
+            busGrid.setGridName(bdcRegionArea.getRegionName());
+            busGrid.setPipeLength(bdcRegionArea.getPipelineLength());
+            busGrid.setTrajectory(bdcRegionArea.getTrajectory());
+            if (ObjectUtil.isNotEmpty(bdcRegionArea.getRegionCode())) {
+                for (Dept dept : deptList) {
+                    if (ObjectUtil.equals(bdcRegionArea.getRegionCode(), dept.getTenantId())) {
+                        busGrid.setDeptid(dept.getId());
+                        Optional<SyncUserDTO> syncUserDTO = syncUserDTOList.stream().filter(syncUserDTO1 -> Objects.equals(syncUserDTO1.getDeptId(), dept.getId())).findFirst();
+                        if (syncUserDTO.isPresent()) {
+                            busGrid.setPrincipal(syncUserDTO.get().getName());
+                            busGrid.setTelephone(syncUserDTO.get().getPhone());
+                        }
+                        break;
+                    }
+                }
+            }
+            if (ObjectUtil.isNotEmpty(bdcRegionArea.getTrajectory()))
+                busGrid.setLocationState("1");
+
+            if (busGridOld != null
+                    && StrUtil.equals(busGridOld.getGridCode(), busGrid.getGridCode()) && StrUtil.equals(busGridOld.getGridName(), busGrid.getGridName())
+                    && StrUtil.equals(busGridOld.getPressType(), busGrid.getPressType()) && StrUtil.equals(busGridOld.getPipeLength(), busGrid.getPipeLength())
+                    && StrUtil.equals(busGridOld.getPrincipal(), busGrid.getPrincipal()) && StrUtil.equals(busGridOld.getTelephone(), busGrid.getTelephone())
+                    && StrUtil.equals(busGridOld.getTrajectory(), busGrid.getTrajectory()) && ObjectUtil.equals(busGridOld.getDeptid(), busGrid.getDeptid()))
+                continue;
+            busGridList.add(busGrid);
+        }
+        return this.saveOrUpdateBatch(busGridList);
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
index f0ba160..6c7173b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
@@ -1,14 +1,11 @@
 package com.casic.missiles.modular.device.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.datascope.ScopeEnums;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.enums.DeviceDataEnum;
@@ -19,15 +16,18 @@
 import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
 import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
 import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusDeviceService;
 import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
 import com.casic.missiles.server.CommonServer;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -45,6 +45,9 @@
     private final AbstractDictService abstractDictService;
     private final BusDeviceMapper busDeviceMapper;
     private final CommonServer commonServer;
+    @Lazy
+    @Autowired
+    private  IBusDeviceService iBusDeviceService;
 
     @Override
     public Page<BusLedgerPipe> listPage(Page<BusLedgerPipe> page, BusLedgerPipeRequestDTO request) {
@@ -74,7 +77,7 @@
         Page<BusLedgerPipe> pageList = this.baseMapper.monitorPipePageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<BusLedgerPipe> busLedgerList = pageList.getRecords();
         busLedgerList.forEach(busLedger -> {
-            busLedger.setOnState(abstractDictService.getDictNameByCode("onState", busLedger.getOnState())); // 使用状态字典值
+            busLedger.setOnState("1".equals(busLedger.getOnState())?"在用":"备用"); // 在用状态字典值
             busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); // 管理单位名称
             busLedger.setPressType(abstractDictService.getDictNameByCode("wellType", busLedger.getPressType())); // 位置状态字典值
             busLedger.setMonitorState(abstractDictService.getDictNameByCode("monitorState", busLedger.getMonitorState())); // 监控状态字典值
@@ -91,6 +94,7 @@
             busLedgerPipeResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(busLedgerPipeResponseDTO.getDeptid())); // 管理单位名称
             busLedgerPipeResponseDTO.setPressType(abstractDictService.getDictNameByCode("wellType", busLedgerPipeResponseDTO.getPressType())); // 位置状态字典值
             busLedgerPipeResponseDTO.setManageType(abstractDictService.getDictNameByCode("manageType", busLedgerPipeResponseDTO.getManageType())); // 位置状态字典值
+            busLedgerPipeResponseDTO.setMonitorStateName(abstractDictService.getDictNameByCode("monitorState", busLedgerPipeResponseDTO.getMonitorState())); // 监控状态字典值
         }
         return busLedgerPipeResponseDTO;
     }
@@ -109,6 +113,11 @@
                     queryColumns[2],
                     deviceDataEnum.getOrderColumn(),
                     request);
+
+            //加入阈值，用于判断设备状态
+            Map<String, Object> objectMap = new HashMap<>();
+            objectMap.put("alarmRuleValue", iBusDeviceService.getDeviceRule(request.getDevcode()));
+            resultMap.add(objectMap);
         }
         return resultMap;
     }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
index 687fe02..e0547bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@
 @Mapper
 public interface CtUserMapper extends BaseMapper<CtUser> {
 
+    @Select("SELECT USER_ID FROM `ct_role_user` WHERE ROLE_ID='6a050c90c1e648ee8d2034baea6856df'")
+    List<String> getCtUserGroupIds();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 60f32a3..99ef10b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -156,9 +156,9 @@
             <if test="request.endTime != null and request.endTime !='' ">
                 and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
             </if>
-            AND (
+            <!--AND (
             ar.`STATUS` = 0
-            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))-->
         </where>
         ORDER BY ar.ALARM_TIME DESC
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
index 0f603c4..4788357 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
@@ -18,5 +18,23 @@
     <sql id="Base_Column_List">
         ID, GRID_CODE, DEPTID, PRINCIPAL, TELEPHONE, PRESS_TYPE, PIPE_LENGTH, TS
     </sql>
-
+    <select id="getSyncUserDTOList" resultType="com.casic.missiles.modular.device.dto.SyncUserDTO">
+        WITH user_temp AS (
+            SELECT
+                ID,
+                ACCOUNT,
+                NAME,
+                PHONE,
+                DEPT_ID
+            FROM
+                sys_user
+            WHERE
+                DEPT_ID IN ( SELECT id FROM `sys_dept` WHERE tips = 'grid' ))
+        SELECT
+            *
+        FROM
+            ( SELECT *, ROW_NUMBER() OVER ( PARTITION BY DEPT_ID ORDER BY ID DESC ) AS rn FROM user_temp ) t
+        WHERE
+            rn = 1
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
index a716a72..aa6c790 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
@@ -70,19 +70,15 @@
 
     <select id="pageGridList" resultType="com.casic.missiles.modular.device.entity.BusGrid">
         SELECT
-        bg.*,
-        sd.FULL_NAME as deptName
+        bg.*
         FROM
         bus_grid bg
-        LEFT JOIN sys_dept sd ON bg.DEPTID = sd.ID
         WHERE 1=1
 
         <if test="request.gridCode != null and request.gridCode !='' ">
             and bg.GRID_CODE like concat('%', #{request.gridCode}, '%')
         </if>
-        <if test="request.deptid != null and request.deptid !=''">
-            and bg.DEPTID = #{request.responsibleDept}
-        </if>
+
         <if test="request.locationState != null and request.locationState !=''">
             and bg.LOCATION_STATE = #{request.locationState}
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 7965bfc..5f8d90f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.device.dto;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -74,5 +75,11 @@
     @ApiModelProperty("左侧指示带长度")
     private String rightLength;
 
+    @ApiModelProperty("监控状态（1：正常，2：异常，3：离线，0：未监测）")
+    private String monitorState;
+
+    @ApiModelProperty("监控状态名称")
+    private String monitorStateName;
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
new file mode 100644
index 0000000..8edbe2d
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SyncUserDTO {
+
+    @ApiModelProperty("人员id")
+    private Long id;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("人员名称")
+    private String name;
+
+    @ApiModelProperty("电话")
+    private String phone;
+
+    @ApiModelProperty("账号")
+    private String account;
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
index 14dc9b8..aef0ae4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
@@ -5,11 +5,13 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -100,7 +102,10 @@
     private String pressureLevel;
 
     @TableField("updt_time")
-    private LocalDateTime updtTime;
+    private Date updtTime;
 
+    @ApiModelProperty("区域点集合")
+    @TableField(exist = false)
+    private String trajectory;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index 5d1f30b..5659491 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -36,6 +36,10 @@
     @TableField("GRID_CODE")
     private String gridCode;
 
+    @ApiModelProperty("网格名称")
+    @TableField("GRID_Name")
+    private String gridName;
+
     @ApiModelProperty("管理单位")
     @TableField("DEPTID")
     private Long deptid;
@@ -68,6 +72,18 @@
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("同步id")
+    @TableField("SYNC_ID")
+    private String syncId;
+
+    @ApiModelProperty("地图坐标集合")
+    @TableField("TRAJECTORY")
+    private String trajectory;
+
+    @ApiModelProperty("是否同步1，是0，否")
+    @TableField("IS_SYNC")
+    private int isSync;
+
     @ApiModelProperty("部门名称")
     @TableField(exist = false)
     private String deptName;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
index 08a4bb6..eb4d377 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务类
@@ -13,4 +15,6 @@
  */
 public interface IBdcRegionAreaService extends IService<BdcRegionArea> {
 
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 4ea13f2..65fb3ab 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -48,4 +48,6 @@
 
     String getBfcf(String devcode);
 
+    List<String> getDeviceRule(String devcode);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
index 1d16e8d..a65debb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
@@ -12,5 +12,5 @@
  * @since 2024-07-16
  */
 public interface IBusGridService extends IService<BusGrid> {
-
+    boolean synAllGrids();
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
index ec973f5..d6f42b2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
@@ -40,4 +40,6 @@
     boolean synAllDept();
 
     boolean synAllLedger();
+
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
index f681c35..acd3cb4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
@@ -13,4 +13,6 @@
  */
 public interface ICtUserService extends IService<CtUser> {
 
+    boolean synAllUsers();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
index fa513fb..0815a30 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
@@ -1,11 +1,14 @@
 package com.casic.missiles.modular.device.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.device.dao.BdcRegionAreaMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import com.casic.missiles.modular.device.service.IBdcRegionAreaService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务实现类
@@ -17,4 +20,8 @@
 @Service
 public class BdcRegionAreaServiceImpl extends ServiceImpl<BdcRegionAreaMapper, BdcRegionArea> implements IBdcRegionAreaService {
 
+    @Override
+    public List<BdcRegionArea> getBdcRegionAreaList() {
+        return this.baseMapper.getBdcRegionAreaList();
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index a2e45de..610fdf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -489,4 +489,15 @@
         }
         return true;
     }
+
+
+    @Cacheable(value = "alarmRuleCache", key = "#devcode")
+    @Override
+    public List<String> getDeviceRule(String devcode) {
+        List<String> alarmRuleValueList = this.baseMapper.getSpecialDeviceRule(devcode);
+        if(alarmRuleValueList==null||alarmRuleValueList.size()<1){
+            alarmRuleValueList=this.baseMapper.getDeviceTypeRule(devcode);
+        }
+        return alarmRuleValueList;
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java
index 7ca3100..b230a73 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java
@@ -1,11 +1,24 @@
 package com.casic.missiles.modular.device.service.impl;
 
-import com.casic.missiles.modular.device.dao.BusGridMapper;
-import com.casic.missiles.modular.device.service.IBusGridService;
-import com.casic.missiles.modular.device.entity.BusGrid;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDeptService;
+import com.casic.missiles.modular.device.dao.BusGridMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
+import com.casic.missiles.modular.device.entity.BdcRegionArea;
+import com.casic.missiles.modular.device.entity.BusGrid;
+import com.casic.missiles.modular.device.service.IBdcRegionAreaService;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.modular.system.model.Dept;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * <p>
  * 网格管理	 服务实现类
@@ -14,7 +27,60 @@
  * @author zt
  * @since 2024-07-16
  */
+@RequiredArgsConstructor
 @Service
 public class BusGridServiceImpl extends ServiceImpl<BusGridMapper, BusGrid> implements IBusGridService {
 
+    private final IBdcRegionAreaService iBdcRegionAreaService;
+    private final AbstractDeptService abstractDeptService;
+
+    @Override
+    public boolean synAllGrids() {
+        List<BdcRegionArea> bdcRegionAreaList = iBdcRegionAreaService.getBdcRegionAreaList();
+        List<Dept> deptList = abstractDeptService.getListByTips("");
+        List<SyncUserDTO> syncUserDTOList = this.baseMapper.getSyncUserDTOList();
+        List<BusGrid> busGrids = this.list();
+        List<BusGrid> busGridList = new ArrayList<>();
+        for (BdcRegionArea bdcRegionArea : bdcRegionAreaList) {
+            BusGrid busGrid = new BusGrid();
+
+            Optional<BusGrid> firstBusGrid = busGrids.stream().filter(busGrid1 -> Objects.equals(busGrid1.getSyncId(), bdcRegionArea.getRegionAreaId())).findFirst();
+            BusGrid busGridOld = null;
+            if (firstBusGrid.isPresent()) {
+                busGridOld = firstBusGrid.get();
+                busGrid.setId(busGridOld.getId());
+            }
+            busGrid.setGridCode(bdcRegionArea.getRegionCode());
+            busGrid.setPressType(bdcRegionArea.getPressureLevel());
+            busGrid.setIsSync(1);
+            busGrid.setSyncId(bdcRegionArea.getRegionAreaId());
+            busGrid.setGridName(bdcRegionArea.getRegionName());
+            busGrid.setPipeLength(bdcRegionArea.getPipelineLength());
+            busGrid.setTrajectory(bdcRegionArea.getTrajectory());
+            if (ObjectUtil.isNotEmpty(bdcRegionArea.getRegionCode())) {
+                for (Dept dept : deptList) {
+                    if (ObjectUtil.equals(bdcRegionArea.getRegionCode(), dept.getTenantId())) {
+                        busGrid.setDeptid(dept.getId());
+                        Optional<SyncUserDTO> syncUserDTO = syncUserDTOList.stream().filter(syncUserDTO1 -> Objects.equals(syncUserDTO1.getDeptId(), dept.getId())).findFirst();
+                        if (syncUserDTO.isPresent()) {
+                            busGrid.setPrincipal(syncUserDTO.get().getName());
+                            busGrid.setTelephone(syncUserDTO.get().getPhone());
+                        }
+                        break;
+                    }
+                }
+            }
+            if (ObjectUtil.isNotEmpty(bdcRegionArea.getTrajectory()))
+                busGrid.setLocationState("1");
+
+            if (busGridOld != null
+                    && StrUtil.equals(busGridOld.getGridCode(), busGrid.getGridCode()) && StrUtil.equals(busGridOld.getGridName(), busGrid.getGridName())
+                    && StrUtil.equals(busGridOld.getPressType(), busGrid.getPressType()) && StrUtil.equals(busGridOld.getPipeLength(), busGrid.getPipeLength())
+                    && StrUtil.equals(busGridOld.getPrincipal(), busGrid.getPrincipal()) && StrUtil.equals(busGridOld.getTelephone(), busGrid.getTelephone())
+                    && StrUtil.equals(busGridOld.getTrajectory(), busGrid.getTrajectory()) && ObjectUtil.equals(busGridOld.getDeptid(), busGrid.getDeptid()))
+                continue;
+            busGridList.add(busGrid);
+        }
+        return this.saveOrUpdateBatch(busGridList);
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
index f0ba160..6c7173b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
@@ -1,14 +1,11 @@
 package com.casic.missiles.modular.device.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.datascope.ScopeEnums;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.enums.DeviceDataEnum;
@@ -19,15 +16,18 @@
 import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
 import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
 import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusDeviceService;
 import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
 import com.casic.missiles.server.CommonServer;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -45,6 +45,9 @@
     private final AbstractDictService abstractDictService;
     private final BusDeviceMapper busDeviceMapper;
     private final CommonServer commonServer;
+    @Lazy
+    @Autowired
+    private  IBusDeviceService iBusDeviceService;
 
     @Override
     public Page<BusLedgerPipe> listPage(Page<BusLedgerPipe> page, BusLedgerPipeRequestDTO request) {
@@ -74,7 +77,7 @@
         Page<BusLedgerPipe> pageList = this.baseMapper.monitorPipePageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<BusLedgerPipe> busLedgerList = pageList.getRecords();
         busLedgerList.forEach(busLedger -> {
-            busLedger.setOnState(abstractDictService.getDictNameByCode("onState", busLedger.getOnState())); // 使用状态字典值
+            busLedger.setOnState("1".equals(busLedger.getOnState())?"在用":"备用"); // 在用状态字典值
             busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); // 管理单位名称
             busLedger.setPressType(abstractDictService.getDictNameByCode("wellType", busLedger.getPressType())); // 位置状态字典值
             busLedger.setMonitorState(abstractDictService.getDictNameByCode("monitorState", busLedger.getMonitorState())); // 监控状态字典值
@@ -91,6 +94,7 @@
             busLedgerPipeResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(busLedgerPipeResponseDTO.getDeptid())); // 管理单位名称
             busLedgerPipeResponseDTO.setPressType(abstractDictService.getDictNameByCode("wellType", busLedgerPipeResponseDTO.getPressType())); // 位置状态字典值
             busLedgerPipeResponseDTO.setManageType(abstractDictService.getDictNameByCode("manageType", busLedgerPipeResponseDTO.getManageType())); // 位置状态字典值
+            busLedgerPipeResponseDTO.setMonitorStateName(abstractDictService.getDictNameByCode("monitorState", busLedgerPipeResponseDTO.getMonitorState())); // 监控状态字典值
         }
         return busLedgerPipeResponseDTO;
     }
@@ -109,6 +113,11 @@
                     queryColumns[2],
                     deviceDataEnum.getOrderColumn(),
                     request);
+
+            //加入阈值，用于判断设备状态
+            Map<String, Object> objectMap = new HashMap<>();
+            objectMap.put("alarmRuleValue", iBusDeviceService.getDeviceRule(request.getDevcode()));
+            resultMap.add(objectMap);
         }
         return resultMap;
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java
index d3a9dbf..c98ec10 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java
@@ -1,12 +1,12 @@
 package com.casic.missiles.modular.device.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.modular.device.dao.BusLedgerMapper;
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
@@ -20,14 +20,12 @@
 import com.casic.missiles.modular.device.service.IEqEquipRqService;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.server.CommonServer;
+import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -48,6 +46,7 @@
     private final ICtOrganizationService iCtOrganizationService;
     private final IEqEquipRqService iEqEquipRqService;
 
+
     public Page<BusLedger> pageList(Page<BusLedger> page, BusLedgerDTO request) {
         Page<BusLedger> pageList = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptid()));
         List<BusLedger> busLedgerList = pageList.getRecords();
@@ -61,11 +60,27 @@
         return pageList;
     }
 
+    //压力级制 0低压 1中压A 2中压B 3次高压A 4次高压B 5高压A 6高压B
+    public static String[] pressureLevelArr={"低压","中压A","中压B","次高压A","次高压B","高压A","高压B"};
     public Page<BusGrid> pageGridList(Page<BusGrid> page, BusLedgerDTO request) {
         Page<BusGrid> pageGridList = this.baseMapper.pageGridList(page, request, commonServer.getDeptScopeIds(request.getDeptid()));
         List<BusGrid> busGridList = pageGridList.getRecords();
         busGridList.forEach(busGrid -> {
             busGrid.setLocationStateName(abstractDictService.getDictNameByCode("locationState", busGrid.getLocationState()));
+            busGrid.setDeptName(ObjectUtil.isNotEmpty(busGrid.getDeptid())?commonServer.getDeptNamesByDeptId(busGrid.getDeptid()):"");
+            String pressType = busGrid.getPressType();
+            if(ObjectUtil.isNotEmpty(pressType)){
+                String[] pressTypeArr= pressType.split(",");
+                String pressTypes="";
+                for(String str:pressTypeArr){
+                    if(CommonUtil.isNumber(str)&&Integer.valueOf(str)<7){
+                        pressTypes+=pressureLevelArr[Integer.valueOf(str)]+",";
+                    }else {
+                        pressTypes+=str+",";
+                    }
+                }
+                busGrid.setPressType(ObjectUtil.isNotEmpty(pressTypes)?pressTypes.substring(0,pressTypes.length()-1):"");
+            }
         });
         return pageGridList;
     }
@@ -147,34 +162,35 @@
         List<CtOrganization> ctOrganizationList = iCtOrganizationService.getCtOrganizationList();
         //获取闸井系统已存在的部门
         List<Dept> deptList = abstractDeptService.getListByTips("");
-        deptList = deptList.stream().filter(object -> ObjectUtil.isNotEmpty(object.getSyncId())).collect(Collectors.toList());
-        List<String> synIds = deptList.stream().map(Dept::getSyncId).collect(Collectors.toList());
-
         for (CtOrganization ctOrganization : ctOrganizationList) {
-            if (!synIds.contains(ctOrganization.getOrgId())) {
-                Dept dept1 = new Dept();
-                dept1.setDelFlag("0");
-                dept1.setPid(getPid(ctOrganization, deptList));
-                dept1.setNum(99);
-                dept1.setSimpleName(ctOrganization.getOrgName());
-                dept1.setFullName(ctOrganization.getOrgName());
-                dept1.setTips(getTips(ctOrganization.getOrgType() + ""));
-                dept1.setSyncId(ctOrganization.getOrgId());
-                dept1.setSyncPid(ctOrganization.getParentId());
-                dept1.setTenantId(ctOrganization.getOrgCode());
-                dept1.setIsSync(1);
-                dept1.setIsParent(DictEnum.SYNC_GRID.equals(ctOrganization.getOrgType() + "") ? "1" : "0");
-                dept1.setDeptType(DictEnum.SYNC_COMPANY.equals(ctOrganization.getOrgType() + "") ? "03" : "04");
-                dept1.setPids(getPids(ctOrganization, deptList));
-                dept1.setCreateTime(new Date());
-                abstractDeptService.saveOrUpdate(dept1);
-                deptList.add(dept1);
-                deptList = deptList.stream().filter(object -> ObjectUtil.isNotEmpty(object.getSyncId())).collect(Collectors.toList());
-                synIds = deptList.stream().map(Dept::getSyncId).collect(Collectors.toList());
+            Dept dept1 = new Dept();
+            Optional<Dept> firstDept = deptList.stream().filter(dept -> Objects.equals(dept.getSyncId(), ctOrganization.getOrgId())).findFirst();
+            Dept deptOld = null;
+            if (firstDept.isPresent()) {
+                deptOld = firstDept.get();
+                dept1.setId(deptOld.getId());
             }
-
+            dept1.setDelFlag("0");
+            dept1.setPid(getPid(ctOrganization, deptList));
+            dept1.setNum(99);
+            dept1.setSimpleName(ctOrganization.getOrgName());
+            dept1.setFullName(ctOrganization.getOrgName());
+            dept1.setTips(getTips(ctOrganization.getOrgType() + ""));
+            dept1.setSyncId(ctOrganization.getOrgId());
+            dept1.setSyncPid(ctOrganization.getParentId());
+            dept1.setTenantId(ctOrganization.getOrgCode());
+            dept1.setIsSync(1);
+            dept1.setIsParent(DictEnum.SYNC_GRID.equals(ctOrganization.getOrgType() + "") ? "1" : "0");
+            dept1.setDeptType(DictEnum.SYNC_COMPANY.equals(ctOrganization.getOrgType() + "") ? "03" : "04");
+            dept1.setPids(getPids(ctOrganization, deptList));
+            dept1.setCreateTime(new Date());
+            if (deptOld != null && StrUtil.equals(deptOld.getFullName(), dept1.getFullName()) && ObjectUtil.equals(deptOld.getPid(), dept1.getPid())
+                    && StrUtil.equals(deptOld.getSyncId(), dept1.getSyncId()) && StrUtil.equals(deptOld.getSyncPid(), dept1.getSyncPid())
+                    && StrUtil.equals(deptOld.getPids(), dept1.getPids()) && StrUtil.equals(deptOld.getDeptType(), dept1.getDeptType()))
+                continue;
+            abstractDeptService.saveOrUpdate(dept1);
+            deptList.add(dept1);
         }
-
         return true;
     }
 
@@ -184,7 +200,7 @@
             return "[0],[24]";
         } else {
             for (Dept dept : deptList) {
-                if (dept.getSyncId().equals(ctOrganization.getParentId())) {
+                if (dept.getSyncId() != null && dept.getSyncId().equals(ctOrganization.getParentId())) {
                     return dept.getPids().concat(",[").concat(dept.getId() + "").concat("]");
                 }
             }
@@ -220,7 +236,7 @@
             return 24L;
         }
         for (Dept dept : deptList) {
-            if (dept.getSyncId().equals(ctOrganization.getParentId())) {
+            if (dept.getSyncId() != null && dept.getSyncId().equals(ctOrganization.getParentId())) {
                 return dept.getId();
             }
         }
@@ -228,49 +244,63 @@
     }
 
 
-    public List<String> manageTypeList = Arrays.asList("1","201","202");
+    public List<String> manageTypeList = Arrays.asList("1", "201", "202");
+
     @Transactional
     @Override
     public boolean synAllLedger() {
         QueryWrapper<BusLedger> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("valid", "1");
         List<BusLedger> busLedgerList = this.baseMapper.selectList(queryWrapper);
-        List<String> ledgerCodeList = busLedgerList.stream().map(BusLedger::getLedgerCode).collect(Collectors.toList());
         List<SyncTagDTO> wellList = iEqEquipRqService.getWellList();
+        wellList = wellList.stream().filter(CommonUtil.distinctByProperty(SyncTagDTO::getLedgerCode)).collect(Collectors.toList());
         List<Dept> deptList = abstractDeptService.getListByTips("");
         List<BusLedger> busLedgers = new ArrayList<>();
         for (SyncTagDTO syncTagDTO : wellList) {
-            if (!ledgerCodeList.contains(syncTagDTO.getLedgerCode())) {
-                BusLedger busLedger = new BusLedger();
-                busLedger.setLedgerCode(syncTagDTO.getLedgerCode());
-                busLedger.setLedgerName(syncTagDTO.getLedgerName());
-                busLedger.setTagNumber(syncTagDTO.getTagNumber());
-                busLedger.setLatGaode(syncTagDTO.getLatGaode());
-                busLedger.setLngGaode(syncTagDTO.getLngGaode());
-                busLedger.setPosition(syncTagDTO.getPosition());
-                if (ObjectUtil.isNotEmpty(syncTagDTO.getOrgCode())) {
-                    for (Dept dept : deptList) {
-                        if (syncTagDTO.getOrgCode().equals(dept.getTenantId())) {
-                            busLedger.setDeptid(dept.getId());
-                            break;
-                        }
+            BusLedger busLedger = new BusLedger();
+            Optional<BusLedger> firstBusLedger = busLedgerList.stream().filter(busLedger1 -> Objects.equals(busLedger1.getLedgerCode(), syncTagDTO.getLedgerCode())).findFirst();
+            BusLedger busLedgerOld = null;
+            if (firstBusLedger.isPresent()) {
+                busLedgerOld = firstBusLedger.get();
+                busLedger.setId(busLedgerOld.getId());
+            }
+//            if (!ledgerCodeList.contains(syncTagDTO.getLedgerCode())) {
+            busLedger.setLedgerCode(syncTagDTO.getLedgerCode());
+            busLedger.setLedgerName(syncTagDTO.getLedgerName());
+            busLedger.setTagNumber(syncTagDTO.getTagNumber());
+            busLedger.setLatGaode(syncTagDTO.getLatGaode());
+            busLedger.setLngGaode(syncTagDTO.getLngGaode());
+            busLedger.setPosition(syncTagDTO.getPosition());
+            if (ObjectUtil.isNotEmpty(syncTagDTO.getOrgCode())) {
+                for (Dept dept : deptList) {
+                    if (syncTagDTO.getOrgCode().equals(dept.getTenantId())) {
+                        busLedger.setDeptid(dept.getId());
+                        break;
                     }
                 }
-                busLedger.setManageType(manageTypeList.contains(syncTagDTO.getManageType())?"1":"0");
-                busLedger.setOnState(DictEnum.IS_USED.equals(syncTagDTO.getOnState()) ? DictEnum.IS_USED : "0");
-                busLedger.setLocationState("1");
-                busLedger.setWellType("3");
-                busLedger.setTargetId(syncTagDTO.getTargetId());
-                busLedger.setTargetCode(syncTagDTO.getOrgCode());
-                busLedger.setPropertyOwner(syncTagDTO.getPropertyOwner());
-                busLedger.setPropertyPerson(syncTagDTO.getPropertyPerson());
-                busLedger.setPropertyPhone(syncTagDTO.getPropertyPhone());
-                busLedger.setOpenDate(syncTagDTO.getOpenDate());
-                busLedger.setArea(syncTagDTO.getArea());
-                busLedger.setType("1");
-                busLedgers.add(busLedger);
             }
+            busLedger.setManageType(manageTypeList.contains(syncTagDTO.getManageType()) ? "1" : "0");
+            busLedger.setOnState(DictEnum.IS_USED.equals(syncTagDTO.getOnState()) ? DictEnum.IS_USED : "0");
+            busLedger.setLocationState("1");
+            busLedger.setWellType("3");
+            busLedger.setTargetId(syncTagDTO.getTargetId());
+            busLedger.setTargetCode(syncTagDTO.getOrgCode());
+            busLedger.setPropertyOwner(syncTagDTO.getPropertyOwner());
+            busLedger.setPropertyPerson(syncTagDTO.getPropertyPerson());
+            busLedger.setPropertyPhone(syncTagDTO.getPropertyPhone());
+            busLedger.setOpenDate(syncTagDTO.getOpenDate());
+            busLedger.setArea(syncTagDTO.getArea());
+            busLedger.setType("1");
+            if (busLedgerOld != null && StrUtil.equals(busLedgerOld.getLedgerCode(), busLedger.getLedgerCode()) && StrUtil.equals(busLedgerOld.getLedgerName(), busLedger.getLedgerName())
+                    && StrUtil.equals(busLedgerOld.getTagNumber(), busLedger.getTagNumber()) && StrUtil.equals(busLedgerOld.getLatGaode(), busLedger.getLatGaode())
+                    && StrUtil.equals(busLedgerOld.getLngGaode(), busLedger.getLngGaode()) && StrUtil.equals(busLedgerOld.getPosition(), busLedger.getPosition())
+                    && StrUtil.equals(busLedgerOld.getTargetId(), busLedger.getTargetId()) && StrUtil.equals(busLedgerOld.getTargetCode(), busLedger.getTargetCode()))
+                continue;
+            busLedgers.add(busLedger);
         }
-        return this.saveBatch(busLedgers);
+//        }
+        return this.saveOrUpdateBatch(busLedgers);
     }
+
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
index 687fe02..e0547bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@
 @Mapper
 public interface CtUserMapper extends BaseMapper<CtUser> {
 
+    @Select("SELECT USER_ID FROM `ct_role_user` WHERE ROLE_ID='6a050c90c1e648ee8d2034baea6856df'")
+    List<String> getCtUserGroupIds();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 60f32a3..99ef10b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -156,9 +156,9 @@
             <if test="request.endTime != null and request.endTime !='' ">
                 and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
             </if>
-            AND (
+            <!--AND (
             ar.`STATUS` = 0
-            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))-->
         </where>
         ORDER BY ar.ALARM_TIME DESC
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
index 0f603c4..4788357 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
@@ -18,5 +18,23 @@
     <sql id="Base_Column_List">
         ID, GRID_CODE, DEPTID, PRINCIPAL, TELEPHONE, PRESS_TYPE, PIPE_LENGTH, TS
     </sql>
-
+    <select id="getSyncUserDTOList" resultType="com.casic.missiles.modular.device.dto.SyncUserDTO">
+        WITH user_temp AS (
+            SELECT
+                ID,
+                ACCOUNT,
+                NAME,
+                PHONE,
+                DEPT_ID
+            FROM
+                sys_user
+            WHERE
+                DEPT_ID IN ( SELECT id FROM `sys_dept` WHERE tips = 'grid' ))
+        SELECT
+            *
+        FROM
+            ( SELECT *, ROW_NUMBER() OVER ( PARTITION BY DEPT_ID ORDER BY ID DESC ) AS rn FROM user_temp ) t
+        WHERE
+            rn = 1
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
index a716a72..aa6c790 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
@@ -70,19 +70,15 @@
 
     <select id="pageGridList" resultType="com.casic.missiles.modular.device.entity.BusGrid">
         SELECT
-        bg.*,
-        sd.FULL_NAME as deptName
+        bg.*
         FROM
         bus_grid bg
-        LEFT JOIN sys_dept sd ON bg.DEPTID = sd.ID
         WHERE 1=1
 
         <if test="request.gridCode != null and request.gridCode !='' ">
             and bg.GRID_CODE like concat('%', #{request.gridCode}, '%')
         </if>
-        <if test="request.deptid != null and request.deptid !=''">
-            and bg.DEPTID = #{request.responsibleDept}
-        </if>
+
         <if test="request.locationState != null and request.locationState !=''">
             and bg.LOCATION_STATE = #{request.locationState}
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 7965bfc..5f8d90f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.device.dto;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -74,5 +75,11 @@
     @ApiModelProperty("左侧指示带长度")
     private String rightLength;
 
+    @ApiModelProperty("监控状态（1：正常，2：异常，3：离线，0：未监测）")
+    private String monitorState;
+
+    @ApiModelProperty("监控状态名称")
+    private String monitorStateName;
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
new file mode 100644
index 0000000..8edbe2d
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SyncUserDTO {
+
+    @ApiModelProperty("人员id")
+    private Long id;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("人员名称")
+    private String name;
+
+    @ApiModelProperty("电话")
+    private String phone;
+
+    @ApiModelProperty("账号")
+    private String account;
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
index 14dc9b8..aef0ae4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
@@ -5,11 +5,13 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -100,7 +102,10 @@
     private String pressureLevel;
 
     @TableField("updt_time")
-    private LocalDateTime updtTime;
+    private Date updtTime;
 
+    @ApiModelProperty("区域点集合")
+    @TableField(exist = false)
+    private String trajectory;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index 5d1f30b..5659491 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -36,6 +36,10 @@
     @TableField("GRID_CODE")
     private String gridCode;
 
+    @ApiModelProperty("网格名称")
+    @TableField("GRID_Name")
+    private String gridName;
+
     @ApiModelProperty("管理单位")
     @TableField("DEPTID")
     private Long deptid;
@@ -68,6 +72,18 @@
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("同步id")
+    @TableField("SYNC_ID")
+    private String syncId;
+
+    @ApiModelProperty("地图坐标集合")
+    @TableField("TRAJECTORY")
+    private String trajectory;
+
+    @ApiModelProperty("是否同步1，是0，否")
+    @TableField("IS_SYNC")
+    private int isSync;
+
     @ApiModelProperty("部门名称")
     @TableField(exist = false)
     private String deptName;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
index 08a4bb6..eb4d377 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务类
@@ -13,4 +15,6 @@
  */
 public interface IBdcRegionAreaService extends IService<BdcRegionArea> {
 
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 4ea13f2..65fb3ab 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -48,4 +48,6 @@
 
     String getBfcf(String devcode);
 
+    List<String> getDeviceRule(String devcode);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
index 1d16e8d..a65debb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
@@ -12,5 +12,5 @@
  * @since 2024-07-16
  */
 public interface IBusGridService extends IService<BusGrid> {
-
+    boolean synAllGrids();
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
index ec973f5..d6f42b2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
@@ -40,4 +40,6 @@
     boolean synAllDept();
 
     boolean synAllLedger();
+
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
index f681c35..acd3cb4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
@@ -13,4 +13,6 @@
  */
 public interface ICtUserService extends IService<CtUser> {
 
+    boolean synAllUsers();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
index fa513fb..0815a30 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
@@ -1,11 +1,14 @@
 package com.casic.missiles.modular.device.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.device.dao.BdcRegionAreaMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import com.casic.missiles.modular.device.service.IBdcRegionAreaService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务实现类
@@ -17,4 +20,8 @@
 @Service
 public class BdcRegionAreaServiceImpl extends ServiceImpl<BdcRegionAreaMapper, BdcRegionArea> implements IBdcRegionAreaService {
 
+    @Override
+    public List<BdcRegionArea> getBdcRegionAreaList() {
+        return this.baseMapper.getBdcRegionAreaList();
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index a2e45de..610fdf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -489,4 +489,15 @@
         }
         return true;
     }
+
+
+    @Cacheable(value = "alarmRuleCache", key = "#devcode")
+    @Override
+    public List<String> getDeviceRule(String devcode) {
+        List<String> alarmRuleValueList = this.baseMapper.getSpecialDeviceRule(devcode);
+        if(alarmRuleValueList==null||alarmRuleValueList.size()<1){
+            alarmRuleValueList=this.baseMapper.getDeviceTypeRule(devcode);
+        }
+        return alarmRuleValueList;
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java
index 7ca3100..b230a73 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java
@@ -1,11 +1,24 @@
 package com.casic.missiles.modular.device.service.impl;
 
-import com.casic.missiles.modular.device.dao.BusGridMapper;
-import com.casic.missiles.modular.device.service.IBusGridService;
-import com.casic.missiles.modular.device.entity.BusGrid;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDeptService;
+import com.casic.missiles.modular.device.dao.BusGridMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
+import com.casic.missiles.modular.device.entity.BdcRegionArea;
+import com.casic.missiles.modular.device.entity.BusGrid;
+import com.casic.missiles.modular.device.service.IBdcRegionAreaService;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.modular.system.model.Dept;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * <p>
  * 网格管理	 服务实现类
@@ -14,7 +27,60 @@
  * @author zt
  * @since 2024-07-16
  */
+@RequiredArgsConstructor
 @Service
 public class BusGridServiceImpl extends ServiceImpl<BusGridMapper, BusGrid> implements IBusGridService {
 
+    private final IBdcRegionAreaService iBdcRegionAreaService;
+    private final AbstractDeptService abstractDeptService;
+
+    @Override
+    public boolean synAllGrids() {
+        List<BdcRegionArea> bdcRegionAreaList = iBdcRegionAreaService.getBdcRegionAreaList();
+        List<Dept> deptList = abstractDeptService.getListByTips("");
+        List<SyncUserDTO> syncUserDTOList = this.baseMapper.getSyncUserDTOList();
+        List<BusGrid> busGrids = this.list();
+        List<BusGrid> busGridList = new ArrayList<>();
+        for (BdcRegionArea bdcRegionArea : bdcRegionAreaList) {
+            BusGrid busGrid = new BusGrid();
+
+            Optional<BusGrid> firstBusGrid = busGrids.stream().filter(busGrid1 -> Objects.equals(busGrid1.getSyncId(), bdcRegionArea.getRegionAreaId())).findFirst();
+            BusGrid busGridOld = null;
+            if (firstBusGrid.isPresent()) {
+                busGridOld = firstBusGrid.get();
+                busGrid.setId(busGridOld.getId());
+            }
+            busGrid.setGridCode(bdcRegionArea.getRegionCode());
+            busGrid.setPressType(bdcRegionArea.getPressureLevel());
+            busGrid.setIsSync(1);
+            busGrid.setSyncId(bdcRegionArea.getRegionAreaId());
+            busGrid.setGridName(bdcRegionArea.getRegionName());
+            busGrid.setPipeLength(bdcRegionArea.getPipelineLength());
+            busGrid.setTrajectory(bdcRegionArea.getTrajectory());
+            if (ObjectUtil.isNotEmpty(bdcRegionArea.getRegionCode())) {
+                for (Dept dept : deptList) {
+                    if (ObjectUtil.equals(bdcRegionArea.getRegionCode(), dept.getTenantId())) {
+                        busGrid.setDeptid(dept.getId());
+                        Optional<SyncUserDTO> syncUserDTO = syncUserDTOList.stream().filter(syncUserDTO1 -> Objects.equals(syncUserDTO1.getDeptId(), dept.getId())).findFirst();
+                        if (syncUserDTO.isPresent()) {
+                            busGrid.setPrincipal(syncUserDTO.get().getName());
+                            busGrid.setTelephone(syncUserDTO.get().getPhone());
+                        }
+                        break;
+                    }
+                }
+            }
+            if (ObjectUtil.isNotEmpty(bdcRegionArea.getTrajectory()))
+                busGrid.setLocationState("1");
+
+            if (busGridOld != null
+                    && StrUtil.equals(busGridOld.getGridCode(), busGrid.getGridCode()) && StrUtil.equals(busGridOld.getGridName(), busGrid.getGridName())
+                    && StrUtil.equals(busGridOld.getPressType(), busGrid.getPressType()) && StrUtil.equals(busGridOld.getPipeLength(), busGrid.getPipeLength())
+                    && StrUtil.equals(busGridOld.getPrincipal(), busGrid.getPrincipal()) && StrUtil.equals(busGridOld.getTelephone(), busGrid.getTelephone())
+                    && StrUtil.equals(busGridOld.getTrajectory(), busGrid.getTrajectory()) && ObjectUtil.equals(busGridOld.getDeptid(), busGrid.getDeptid()))
+                continue;
+            busGridList.add(busGrid);
+        }
+        return this.saveOrUpdateBatch(busGridList);
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
index f0ba160..6c7173b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
@@ -1,14 +1,11 @@
 package com.casic.missiles.modular.device.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.datascope.ScopeEnums;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.enums.DeviceDataEnum;
@@ -19,15 +16,18 @@
 import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
 import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
 import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusDeviceService;
 import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
 import com.casic.missiles.server.CommonServer;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -45,6 +45,9 @@
     private final AbstractDictService abstractDictService;
     private final BusDeviceMapper busDeviceMapper;
     private final CommonServer commonServer;
+    @Lazy
+    @Autowired
+    private  IBusDeviceService iBusDeviceService;
 
     @Override
     public Page<BusLedgerPipe> listPage(Page<BusLedgerPipe> page, BusLedgerPipeRequestDTO request) {
@@ -74,7 +77,7 @@
         Page<BusLedgerPipe> pageList = this.baseMapper.monitorPipePageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<BusLedgerPipe> busLedgerList = pageList.getRecords();
         busLedgerList.forEach(busLedger -> {
-            busLedger.setOnState(abstractDictService.getDictNameByCode("onState", busLedger.getOnState())); // 使用状态字典值
+            busLedger.setOnState("1".equals(busLedger.getOnState())?"在用":"备用"); // 在用状态字典值
             busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); // 管理单位名称
             busLedger.setPressType(abstractDictService.getDictNameByCode("wellType", busLedger.getPressType())); // 位置状态字典值
             busLedger.setMonitorState(abstractDictService.getDictNameByCode("monitorState", busLedger.getMonitorState())); // 监控状态字典值
@@ -91,6 +94,7 @@
             busLedgerPipeResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(busLedgerPipeResponseDTO.getDeptid())); // 管理单位名称
             busLedgerPipeResponseDTO.setPressType(abstractDictService.getDictNameByCode("wellType", busLedgerPipeResponseDTO.getPressType())); // 位置状态字典值
             busLedgerPipeResponseDTO.setManageType(abstractDictService.getDictNameByCode("manageType", busLedgerPipeResponseDTO.getManageType())); // 位置状态字典值
+            busLedgerPipeResponseDTO.setMonitorStateName(abstractDictService.getDictNameByCode("monitorState", busLedgerPipeResponseDTO.getMonitorState())); // 监控状态字典值
         }
         return busLedgerPipeResponseDTO;
     }
@@ -109,6 +113,11 @@
                     queryColumns[2],
                     deviceDataEnum.getOrderColumn(),
                     request);
+
+            //加入阈值，用于判断设备状态
+            Map<String, Object> objectMap = new HashMap<>();
+            objectMap.put("alarmRuleValue", iBusDeviceService.getDeviceRule(request.getDevcode()));
+            resultMap.add(objectMap);
         }
         return resultMap;
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java
index d3a9dbf..c98ec10 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java
@@ -1,12 +1,12 @@
 package com.casic.missiles.modular.device.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.modular.device.dao.BusLedgerMapper;
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
@@ -20,14 +20,12 @@
 import com.casic.missiles.modular.device.service.IEqEquipRqService;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.server.CommonServer;
+import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -48,6 +46,7 @@
     private final ICtOrganizationService iCtOrganizationService;
     private final IEqEquipRqService iEqEquipRqService;
 
+
     public Page<BusLedger> pageList(Page<BusLedger> page, BusLedgerDTO request) {
         Page<BusLedger> pageList = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptid()));
         List<BusLedger> busLedgerList = pageList.getRecords();
@@ -61,11 +60,27 @@
         return pageList;
     }
 
+    //压力级制 0低压 1中压A 2中压B 3次高压A 4次高压B 5高压A 6高压B
+    public static String[] pressureLevelArr={"低压","中压A","中压B","次高压A","次高压B","高压A","高压B"};
     public Page<BusGrid> pageGridList(Page<BusGrid> page, BusLedgerDTO request) {
         Page<BusGrid> pageGridList = this.baseMapper.pageGridList(page, request, commonServer.getDeptScopeIds(request.getDeptid()));
         List<BusGrid> busGridList = pageGridList.getRecords();
         busGridList.forEach(busGrid -> {
             busGrid.setLocationStateName(abstractDictService.getDictNameByCode("locationState", busGrid.getLocationState()));
+            busGrid.setDeptName(ObjectUtil.isNotEmpty(busGrid.getDeptid())?commonServer.getDeptNamesByDeptId(busGrid.getDeptid()):"");
+            String pressType = busGrid.getPressType();
+            if(ObjectUtil.isNotEmpty(pressType)){
+                String[] pressTypeArr= pressType.split(",");
+                String pressTypes="";
+                for(String str:pressTypeArr){
+                    if(CommonUtil.isNumber(str)&&Integer.valueOf(str)<7){
+                        pressTypes+=pressureLevelArr[Integer.valueOf(str)]+",";
+                    }else {
+                        pressTypes+=str+",";
+                    }
+                }
+                busGrid.setPressType(ObjectUtil.isNotEmpty(pressTypes)?pressTypes.substring(0,pressTypes.length()-1):"");
+            }
         });
         return pageGridList;
     }
@@ -147,34 +162,35 @@
         List<CtOrganization> ctOrganizationList = iCtOrganizationService.getCtOrganizationList();
         //获取闸井系统已存在的部门
         List<Dept> deptList = abstractDeptService.getListByTips("");
-        deptList = deptList.stream().filter(object -> ObjectUtil.isNotEmpty(object.getSyncId())).collect(Collectors.toList());
-        List<String> synIds = deptList.stream().map(Dept::getSyncId).collect(Collectors.toList());
-
         for (CtOrganization ctOrganization : ctOrganizationList) {
-            if (!synIds.contains(ctOrganization.getOrgId())) {
-                Dept dept1 = new Dept();
-                dept1.setDelFlag("0");
-                dept1.setPid(getPid(ctOrganization, deptList));
-                dept1.setNum(99);
-                dept1.setSimpleName(ctOrganization.getOrgName());
-                dept1.setFullName(ctOrganization.getOrgName());
-                dept1.setTips(getTips(ctOrganization.getOrgType() + ""));
-                dept1.setSyncId(ctOrganization.getOrgId());
-                dept1.setSyncPid(ctOrganization.getParentId());
-                dept1.setTenantId(ctOrganization.getOrgCode());
-                dept1.setIsSync(1);
-                dept1.setIsParent(DictEnum.SYNC_GRID.equals(ctOrganization.getOrgType() + "") ? "1" : "0");
-                dept1.setDeptType(DictEnum.SYNC_COMPANY.equals(ctOrganization.getOrgType() + "") ? "03" : "04");
-                dept1.setPids(getPids(ctOrganization, deptList));
-                dept1.setCreateTime(new Date());
-                abstractDeptService.saveOrUpdate(dept1);
-                deptList.add(dept1);
-                deptList = deptList.stream().filter(object -> ObjectUtil.isNotEmpty(object.getSyncId())).collect(Collectors.toList());
-                synIds = deptList.stream().map(Dept::getSyncId).collect(Collectors.toList());
+            Dept dept1 = new Dept();
+            Optional<Dept> firstDept = deptList.stream().filter(dept -> Objects.equals(dept.getSyncId(), ctOrganization.getOrgId())).findFirst();
+            Dept deptOld = null;
+            if (firstDept.isPresent()) {
+                deptOld = firstDept.get();
+                dept1.setId(deptOld.getId());
             }
-
+            dept1.setDelFlag("0");
+            dept1.setPid(getPid(ctOrganization, deptList));
+            dept1.setNum(99);
+            dept1.setSimpleName(ctOrganization.getOrgName());
+            dept1.setFullName(ctOrganization.getOrgName());
+            dept1.setTips(getTips(ctOrganization.getOrgType() + ""));
+            dept1.setSyncId(ctOrganization.getOrgId());
+            dept1.setSyncPid(ctOrganization.getParentId());
+            dept1.setTenantId(ctOrganization.getOrgCode());
+            dept1.setIsSync(1);
+            dept1.setIsParent(DictEnum.SYNC_GRID.equals(ctOrganization.getOrgType() + "") ? "1" : "0");
+            dept1.setDeptType(DictEnum.SYNC_COMPANY.equals(ctOrganization.getOrgType() + "") ? "03" : "04");
+            dept1.setPids(getPids(ctOrganization, deptList));
+            dept1.setCreateTime(new Date());
+            if (deptOld != null && StrUtil.equals(deptOld.getFullName(), dept1.getFullName()) && ObjectUtil.equals(deptOld.getPid(), dept1.getPid())
+                    && StrUtil.equals(deptOld.getSyncId(), dept1.getSyncId()) && StrUtil.equals(deptOld.getSyncPid(), dept1.getSyncPid())
+                    && StrUtil.equals(deptOld.getPids(), dept1.getPids()) && StrUtil.equals(deptOld.getDeptType(), dept1.getDeptType()))
+                continue;
+            abstractDeptService.saveOrUpdate(dept1);
+            deptList.add(dept1);
         }
-
         return true;
     }
 
@@ -184,7 +200,7 @@
             return "[0],[24]";
         } else {
             for (Dept dept : deptList) {
-                if (dept.getSyncId().equals(ctOrganization.getParentId())) {
+                if (dept.getSyncId() != null && dept.getSyncId().equals(ctOrganization.getParentId())) {
                     return dept.getPids().concat(",[").concat(dept.getId() + "").concat("]");
                 }
             }
@@ -220,7 +236,7 @@
             return 24L;
         }
         for (Dept dept : deptList) {
-            if (dept.getSyncId().equals(ctOrganization.getParentId())) {
+            if (dept.getSyncId() != null && dept.getSyncId().equals(ctOrganization.getParentId())) {
                 return dept.getId();
             }
         }
@@ -228,49 +244,63 @@
     }
 
 
-    public List<String> manageTypeList = Arrays.asList("1","201","202");
+    public List<String> manageTypeList = Arrays.asList("1", "201", "202");
+
     @Transactional
     @Override
     public boolean synAllLedger() {
         QueryWrapper<BusLedger> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("valid", "1");
         List<BusLedger> busLedgerList = this.baseMapper.selectList(queryWrapper);
-        List<String> ledgerCodeList = busLedgerList.stream().map(BusLedger::getLedgerCode).collect(Collectors.toList());
         List<SyncTagDTO> wellList = iEqEquipRqService.getWellList();
+        wellList = wellList.stream().filter(CommonUtil.distinctByProperty(SyncTagDTO::getLedgerCode)).collect(Collectors.toList());
         List<Dept> deptList = abstractDeptService.getListByTips("");
         List<BusLedger> busLedgers = new ArrayList<>();
         for (SyncTagDTO syncTagDTO : wellList) {
-            if (!ledgerCodeList.contains(syncTagDTO.getLedgerCode())) {
-                BusLedger busLedger = new BusLedger();
-                busLedger.setLedgerCode(syncTagDTO.getLedgerCode());
-                busLedger.setLedgerName(syncTagDTO.getLedgerName());
-                busLedger.setTagNumber(syncTagDTO.getTagNumber());
-                busLedger.setLatGaode(syncTagDTO.getLatGaode());
-                busLedger.setLngGaode(syncTagDTO.getLngGaode());
-                busLedger.setPosition(syncTagDTO.getPosition());
-                if (ObjectUtil.isNotEmpty(syncTagDTO.getOrgCode())) {
-                    for (Dept dept : deptList) {
-                        if (syncTagDTO.getOrgCode().equals(dept.getTenantId())) {
-                            busLedger.setDeptid(dept.getId());
-                            break;
-                        }
+            BusLedger busLedger = new BusLedger();
+            Optional<BusLedger> firstBusLedger = busLedgerList.stream().filter(busLedger1 -> Objects.equals(busLedger1.getLedgerCode(), syncTagDTO.getLedgerCode())).findFirst();
+            BusLedger busLedgerOld = null;
+            if (firstBusLedger.isPresent()) {
+                busLedgerOld = firstBusLedger.get();
+                busLedger.setId(busLedgerOld.getId());
+            }
+//            if (!ledgerCodeList.contains(syncTagDTO.getLedgerCode())) {
+            busLedger.setLedgerCode(syncTagDTO.getLedgerCode());
+            busLedger.setLedgerName(syncTagDTO.getLedgerName());
+            busLedger.setTagNumber(syncTagDTO.getTagNumber());
+            busLedger.setLatGaode(syncTagDTO.getLatGaode());
+            busLedger.setLngGaode(syncTagDTO.getLngGaode());
+            busLedger.setPosition(syncTagDTO.getPosition());
+            if (ObjectUtil.isNotEmpty(syncTagDTO.getOrgCode())) {
+                for (Dept dept : deptList) {
+                    if (syncTagDTO.getOrgCode().equals(dept.getTenantId())) {
+                        busLedger.setDeptid(dept.getId());
+                        break;
                     }
                 }
-                busLedger.setManageType(manageTypeList.contains(syncTagDTO.getManageType())?"1":"0");
-                busLedger.setOnState(DictEnum.IS_USED.equals(syncTagDTO.getOnState()) ? DictEnum.IS_USED : "0");
-                busLedger.setLocationState("1");
-                busLedger.setWellType("3");
-                busLedger.setTargetId(syncTagDTO.getTargetId());
-                busLedger.setTargetCode(syncTagDTO.getOrgCode());
-                busLedger.setPropertyOwner(syncTagDTO.getPropertyOwner());
-                busLedger.setPropertyPerson(syncTagDTO.getPropertyPerson());
-                busLedger.setPropertyPhone(syncTagDTO.getPropertyPhone());
-                busLedger.setOpenDate(syncTagDTO.getOpenDate());
-                busLedger.setArea(syncTagDTO.getArea());
-                busLedger.setType("1");
-                busLedgers.add(busLedger);
             }
+            busLedger.setManageType(manageTypeList.contains(syncTagDTO.getManageType()) ? "1" : "0");
+            busLedger.setOnState(DictEnum.IS_USED.equals(syncTagDTO.getOnState()) ? DictEnum.IS_USED : "0");
+            busLedger.setLocationState("1");
+            busLedger.setWellType("3");
+            busLedger.setTargetId(syncTagDTO.getTargetId());
+            busLedger.setTargetCode(syncTagDTO.getOrgCode());
+            busLedger.setPropertyOwner(syncTagDTO.getPropertyOwner());
+            busLedger.setPropertyPerson(syncTagDTO.getPropertyPerson());
+            busLedger.setPropertyPhone(syncTagDTO.getPropertyPhone());
+            busLedger.setOpenDate(syncTagDTO.getOpenDate());
+            busLedger.setArea(syncTagDTO.getArea());
+            busLedger.setType("1");
+            if (busLedgerOld != null && StrUtil.equals(busLedgerOld.getLedgerCode(), busLedger.getLedgerCode()) && StrUtil.equals(busLedgerOld.getLedgerName(), busLedger.getLedgerName())
+                    && StrUtil.equals(busLedgerOld.getTagNumber(), busLedger.getTagNumber()) && StrUtil.equals(busLedgerOld.getLatGaode(), busLedger.getLatGaode())
+                    && StrUtil.equals(busLedgerOld.getLngGaode(), busLedger.getLngGaode()) && StrUtil.equals(busLedgerOld.getPosition(), busLedger.getPosition())
+                    && StrUtil.equals(busLedgerOld.getTargetId(), busLedger.getTargetId()) && StrUtil.equals(busLedgerOld.getTargetCode(), busLedger.getTargetCode()))
+                continue;
+            busLedgers.add(busLedger);
         }
-        return this.saveBatch(busLedgers);
+//        }
+        return this.saveOrUpdateBatch(busLedgers);
     }
+
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/CtUserServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/CtUserServiceImpl.java
index 394011d..b54e8dd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/CtUserServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/CtUserServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.modular.device.service.impl;
 
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDeptService;
+import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.modular.device.dao.CtUserMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.modular.system.model.Role;
+import com.casic.missiles.modular.system.model.User;
+import com.casic.missiles.modular.system.service.IRoleService;
+import com.casic.missiles.modular.system.service.IUserService;
+import com.casic.missiles.server.CommonServer;
+import com.casic.missiles.util.CommonUtil;
+import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -14,7 +37,122 @@
  * @author zt
  * @since 2024-11-25
  */
+@RequiredArgsConstructor
 @Service
 public class CtUserServiceImpl extends ServiceImpl<CtUserMapper, CtUser> implements ICtUserService {
 
+
+    private final AbstractDeptService abstractDeptService;
+    private final IRoleService iRoleService;
+    private final IUserService userService;
+    private final CommonServer commonServer;
+    private static final Logger logger = LoggerFactory.getLogger(CtUserServiceImpl.class);
+
+    @Transactional
+    @Override
+    public boolean synAllUsers() {
+
+        QueryWrapper<CtUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("STATE", 1);
+        queryWrapper.eq("DEL_FLAG", 0);
+        queryWrapper.isNotNull("ORG_ID");
+        List<CtUser> ctUserList = this.baseMapper.selectList(queryWrapper);
+        ctUserList = ctUserList.stream().filter(CommonUtil.distinctByProperty(CtUser::getUserCode)).collect(Collectors.toList());
+        List<Dept> deptList = abstractDeptService.getListByTips("");
+        QueryWrapper<User> userQueryWrapper = new QueryWrapper<>();
+        List<User> userSynList = userService.list(userQueryWrapper);
+        //找出班组长人员
+        List<String> ctUserIds = this.baseMapper.getCtUserGroupIds();
+        List<User> userList = new ArrayList<>();
+        Map<Long, Long> roleIdCache = new HashMap();
+        for (CtUser ctUser : ctUserList) {
+            User user = new User();
+            Optional<User> firstUser = userSynList.stream().filter(user1 -> Objects.equals(user1.getAccount(), ctUser.getUserCode())).findFirst();
+            User userOld = null;
+            if (firstUser.isPresent()) {
+                userOld = firstUser.get();
+                user.setId(userOld.getId());
+            }
+            user.setAccount(ctUser.getUserCode());
+            user.setName(ctUser.getUserName());
+            user.setSex(1);
+            user.setEmail(ctUser.getEmail());
+            user.setPhone(ctUser.getPhone());
+            user.setSyncDeptid(ctUser.getOrgId());
+            Optional<Dept> firstDept = deptList.stream().filter(dept -> Objects.equals(dept.getSyncId(), ctUser.getOrgId())).findFirst();
+            String deptName = "";
+            Long roleDeptId = null;
+            if (firstDept.isPresent()) {
+                user.setDeptId(firstDept.get().getId());
+                roleDeptId = firstDept.get().getId();
+                if ("group".equals(firstDept.get().getTips())) {
+                    roleDeptId = firstDept.get().getPid();
+                } else if ("grid".equals(firstDept.get().getTips())) {
+                    String pids = firstDept.get().getPids();
+                    String[] pidsArr = pids.split(",");
+                    if (pidsArr.length > 4) {
+                        roleDeptId = Long.valueOf(pidsArr[3].substring(1, pidsArr[3].length() - 1));
+                    }
+                }
+            }
+            if (ObjectUtil.isEmpty(roleDeptId)) {
+                logger.error("同步用户，组织机构未找到,用户为：" + user.getName() + ",组织机构为：" + ctUser.getOrgId());
+                continue;
+            }
+            deptName = commonServer.getDeptNamesByDeptId(roleDeptId);
+            if (!roleIdCache.containsKey(roleDeptId)) {
+                Role role = this.getDeptRole(roleDeptId, deptName, true, true);
+                roleIdCache.put(roleDeptId, role.getId());
+            }
+
+            if (ctUserIds.contains(ctUser.getUserId())) {
+                user.setAttr1("monitor");
+            }
+            user.setRoleId(String.valueOf(roleIdCache.get(roleDeptId)));
+            user.setStatus("1");
+            user.setSyncId(ctUser.getUserId());
+            user.setSyncName(ctUser.getUserName());
+            user.setSyncPwd(ctUser.getUserPass());
+            user.setSyncDeptid(ctUser.getOrgId());
+            user.setIsSync(1);
+            user.setCreateUser(1L);
+            user.setDelFlag("0");
+            user.setSalt(ShiroKit.getRandomSalt(5));
+            user.setPassword(ShiroKit.md5("111111", user.getSalt()));
+            if (userOld != null && ObjectUtil.equals(userOld.getId(), user.getId()) && ObjectUtil.equals(userOld.getDeptId(), user.getDeptId()) &&
+                    StrUtil.equals(userOld.getName(), user.getName()) && userOld.getAccount().equals(user.getAccount()) &&
+                    StrUtil.equals(userOld.getSyncId(), user.getSyncId()) && StrUtil.equals(userOld.getSyncDeptid(), user.getSyncDeptid()))
+                continue;
+            userList.add(user);
+        }
+        return userService.saveOrUpdateBatch(userList);
+    }
+
+
+    public Role getDeptRole(Long deptId, String deptName, boolean isDefault, boolean defaultCreate) {
+        QueryWrapper<Role> entityWrapper = new QueryWrapper();
+        entityWrapper.eq("dept_id", deptId);
+        if (ObjectUtil.isEmpty(isDefault)) {
+            entityWrapper.eq("IS_DEFAULT", 1);
+        }
+
+        List<Role> roles = iRoleService.list(entityWrapper);
+        if (ObjectUtil.isEmpty(roles)) {
+            Role role = new Role();
+            role.setId(IdUtil.getSnowflake(1, 1).nextId());
+            role.setNum(99);
+            role.setPid(1L);
+            role.setName(deptName.concat("普通角色"));
+            role.setDeptId(deptId);
+            role.setDataScope(String.valueOf(deptId));
+            role.setDataScopeType("2");
+            role.setTips("member");
+            role.setIsDefault(1);
+//            role.setCreateTime(new Date());
+            iRoleService.saveOrUpdate(role);
+            return role;
+        } else {
+            return roles.get(0);
+        }
+    }
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
index 687fe02..e0547bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@
 @Mapper
 public interface CtUserMapper extends BaseMapper<CtUser> {
 
+    @Select("SELECT USER_ID FROM `ct_role_user` WHERE ROLE_ID='6a050c90c1e648ee8d2034baea6856df'")
+    List<String> getCtUserGroupIds();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 60f32a3..99ef10b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -156,9 +156,9 @@
             <if test="request.endTime != null and request.endTime !='' ">
                 and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
             </if>
-            AND (
+            <!--AND (
             ar.`STATUS` = 0
-            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))-->
         </where>
         ORDER BY ar.ALARM_TIME DESC
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
index 0f603c4..4788357 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
@@ -18,5 +18,23 @@
     <sql id="Base_Column_List">
         ID, GRID_CODE, DEPTID, PRINCIPAL, TELEPHONE, PRESS_TYPE, PIPE_LENGTH, TS
     </sql>
-
+    <select id="getSyncUserDTOList" resultType="com.casic.missiles.modular.device.dto.SyncUserDTO">
+        WITH user_temp AS (
+            SELECT
+                ID,
+                ACCOUNT,
+                NAME,
+                PHONE,
+                DEPT_ID
+            FROM
+                sys_user
+            WHERE
+                DEPT_ID IN ( SELECT id FROM `sys_dept` WHERE tips = 'grid' ))
+        SELECT
+            *
+        FROM
+            ( SELECT *, ROW_NUMBER() OVER ( PARTITION BY DEPT_ID ORDER BY ID DESC ) AS rn FROM user_temp ) t
+        WHERE
+            rn = 1
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
index a716a72..aa6c790 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
@@ -70,19 +70,15 @@
 
     <select id="pageGridList" resultType="com.casic.missiles.modular.device.entity.BusGrid">
         SELECT
-        bg.*,
-        sd.FULL_NAME as deptName
+        bg.*
         FROM
         bus_grid bg
-        LEFT JOIN sys_dept sd ON bg.DEPTID = sd.ID
         WHERE 1=1
 
         <if test="request.gridCode != null and request.gridCode !='' ">
             and bg.GRID_CODE like concat('%', #{request.gridCode}, '%')
         </if>
-        <if test="request.deptid != null and request.deptid !=''">
-            and bg.DEPTID = #{request.responsibleDept}
-        </if>
+
         <if test="request.locationState != null and request.locationState !=''">
             and bg.LOCATION_STATE = #{request.locationState}
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 7965bfc..5f8d90f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.device.dto;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -74,5 +75,11 @@
     @ApiModelProperty("左侧指示带长度")
     private String rightLength;
 
+    @ApiModelProperty("监控状态（1：正常，2：异常，3：离线，0：未监测）")
+    private String monitorState;
+
+    @ApiModelProperty("监控状态名称")
+    private String monitorStateName;
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
new file mode 100644
index 0000000..8edbe2d
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SyncUserDTO {
+
+    @ApiModelProperty("人员id")
+    private Long id;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("人员名称")
+    private String name;
+
+    @ApiModelProperty("电话")
+    private String phone;
+
+    @ApiModelProperty("账号")
+    private String account;
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
index 14dc9b8..aef0ae4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
@@ -5,11 +5,13 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -100,7 +102,10 @@
     private String pressureLevel;
 
     @TableField("updt_time")
-    private LocalDateTime updtTime;
+    private Date updtTime;
 
+    @ApiModelProperty("区域点集合")
+    @TableField(exist = false)
+    private String trajectory;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index 5d1f30b..5659491 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -36,6 +36,10 @@
     @TableField("GRID_CODE")
     private String gridCode;
 
+    @ApiModelProperty("网格名称")
+    @TableField("GRID_Name")
+    private String gridName;
+
     @ApiModelProperty("管理单位")
     @TableField("DEPTID")
     private Long deptid;
@@ -68,6 +72,18 @@
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("同步id")
+    @TableField("SYNC_ID")
+    private String syncId;
+
+    @ApiModelProperty("地图坐标集合")
+    @TableField("TRAJECTORY")
+    private String trajectory;
+
+    @ApiModelProperty("是否同步1，是0，否")
+    @TableField("IS_SYNC")
+    private int isSync;
+
     @ApiModelProperty("部门名称")
     @TableField(exist = false)
     private String deptName;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
index 08a4bb6..eb4d377 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务类
@@ -13,4 +15,6 @@
  */
 public interface IBdcRegionAreaService extends IService<BdcRegionArea> {
 
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 4ea13f2..65fb3ab 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -48,4 +48,6 @@
 
     String getBfcf(String devcode);
 
+    List<String> getDeviceRule(String devcode);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
index 1d16e8d..a65debb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
@@ -12,5 +12,5 @@
  * @since 2024-07-16
  */
 public interface IBusGridService extends IService<BusGrid> {
-
+    boolean synAllGrids();
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
index ec973f5..d6f42b2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
@@ -40,4 +40,6 @@
     boolean synAllDept();
 
     boolean synAllLedger();
+
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
index f681c35..acd3cb4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
@@ -13,4 +13,6 @@
  */
 public interface ICtUserService extends IService<CtUser> {
 
+    boolean synAllUsers();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
index fa513fb..0815a30 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
@@ -1,11 +1,14 @@
 package com.casic.missiles.modular.device.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.device.dao.BdcRegionAreaMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import com.casic.missiles.modular.device.service.IBdcRegionAreaService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务实现类
@@ -17,4 +20,8 @@
 @Service
 public class BdcRegionAreaServiceImpl extends ServiceImpl<BdcRegionAreaMapper, BdcRegionArea> implements IBdcRegionAreaService {
 
+    @Override
+    public List<BdcRegionArea> getBdcRegionAreaList() {
+        return this.baseMapper.getBdcRegionAreaList();
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index a2e45de..610fdf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -489,4 +489,15 @@
         }
         return true;
     }
+
+
+    @Cacheable(value = "alarmRuleCache", key = "#devcode")
+    @Override
+    public List<String> getDeviceRule(String devcode) {
+        List<String> alarmRuleValueList = this.baseMapper.getSpecialDeviceRule(devcode);
+        if(alarmRuleValueList==null||alarmRuleValueList.size()<1){
+            alarmRuleValueList=this.baseMapper.getDeviceTypeRule(devcode);
+        }
+        return alarmRuleValueList;
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java
index 7ca3100..b230a73 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java
@@ -1,11 +1,24 @@
 package com.casic.missiles.modular.device.service.impl;
 
-import com.casic.missiles.modular.device.dao.BusGridMapper;
-import com.casic.missiles.modular.device.service.IBusGridService;
-import com.casic.missiles.modular.device.entity.BusGrid;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDeptService;
+import com.casic.missiles.modular.device.dao.BusGridMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
+import com.casic.missiles.modular.device.entity.BdcRegionArea;
+import com.casic.missiles.modular.device.entity.BusGrid;
+import com.casic.missiles.modular.device.service.IBdcRegionAreaService;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.modular.system.model.Dept;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * <p>
  * 网格管理	 服务实现类
@@ -14,7 +27,60 @@
  * @author zt
  * @since 2024-07-16
  */
+@RequiredArgsConstructor
 @Service
 public class BusGridServiceImpl extends ServiceImpl<BusGridMapper, BusGrid> implements IBusGridService {
 
+    private final IBdcRegionAreaService iBdcRegionAreaService;
+    private final AbstractDeptService abstractDeptService;
+
+    @Override
+    public boolean synAllGrids() {
+        List<BdcRegionArea> bdcRegionAreaList = iBdcRegionAreaService.getBdcRegionAreaList();
+        List<Dept> deptList = abstractDeptService.getListByTips("");
+        List<SyncUserDTO> syncUserDTOList = this.baseMapper.getSyncUserDTOList();
+        List<BusGrid> busGrids = this.list();
+        List<BusGrid> busGridList = new ArrayList<>();
+        for (BdcRegionArea bdcRegionArea : bdcRegionAreaList) {
+            BusGrid busGrid = new BusGrid();
+
+            Optional<BusGrid> firstBusGrid = busGrids.stream().filter(busGrid1 -> Objects.equals(busGrid1.getSyncId(), bdcRegionArea.getRegionAreaId())).findFirst();
+            BusGrid busGridOld = null;
+            if (firstBusGrid.isPresent()) {
+                busGridOld = firstBusGrid.get();
+                busGrid.setId(busGridOld.getId());
+            }
+            busGrid.setGridCode(bdcRegionArea.getRegionCode());
+            busGrid.setPressType(bdcRegionArea.getPressureLevel());
+            busGrid.setIsSync(1);
+            busGrid.setSyncId(bdcRegionArea.getRegionAreaId());
+            busGrid.setGridName(bdcRegionArea.getRegionName());
+            busGrid.setPipeLength(bdcRegionArea.getPipelineLength());
+            busGrid.setTrajectory(bdcRegionArea.getTrajectory());
+            if (ObjectUtil.isNotEmpty(bdcRegionArea.getRegionCode())) {
+                for (Dept dept : deptList) {
+                    if (ObjectUtil.equals(bdcRegionArea.getRegionCode(), dept.getTenantId())) {
+                        busGrid.setDeptid(dept.getId());
+                        Optional<SyncUserDTO> syncUserDTO = syncUserDTOList.stream().filter(syncUserDTO1 -> Objects.equals(syncUserDTO1.getDeptId(), dept.getId())).findFirst();
+                        if (syncUserDTO.isPresent()) {
+                            busGrid.setPrincipal(syncUserDTO.get().getName());
+                            busGrid.setTelephone(syncUserDTO.get().getPhone());
+                        }
+                        break;
+                    }
+                }
+            }
+            if (ObjectUtil.isNotEmpty(bdcRegionArea.getTrajectory()))
+                busGrid.setLocationState("1");
+
+            if (busGridOld != null
+                    && StrUtil.equals(busGridOld.getGridCode(), busGrid.getGridCode()) && StrUtil.equals(busGridOld.getGridName(), busGrid.getGridName())
+                    && StrUtil.equals(busGridOld.getPressType(), busGrid.getPressType()) && StrUtil.equals(busGridOld.getPipeLength(), busGrid.getPipeLength())
+                    && StrUtil.equals(busGridOld.getPrincipal(), busGrid.getPrincipal()) && StrUtil.equals(busGridOld.getTelephone(), busGrid.getTelephone())
+                    && StrUtil.equals(busGridOld.getTrajectory(), busGrid.getTrajectory()) && ObjectUtil.equals(busGridOld.getDeptid(), busGrid.getDeptid()))
+                continue;
+            busGridList.add(busGrid);
+        }
+        return this.saveOrUpdateBatch(busGridList);
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
index f0ba160..6c7173b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
@@ -1,14 +1,11 @@
 package com.casic.missiles.modular.device.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.datascope.ScopeEnums;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.enums.DeviceDataEnum;
@@ -19,15 +16,18 @@
 import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
 import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
 import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusDeviceService;
 import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
 import com.casic.missiles.server.CommonServer;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -45,6 +45,9 @@
     private final AbstractDictService abstractDictService;
     private final BusDeviceMapper busDeviceMapper;
     private final CommonServer commonServer;
+    @Lazy
+    @Autowired
+    private  IBusDeviceService iBusDeviceService;
 
     @Override
     public Page<BusLedgerPipe> listPage(Page<BusLedgerPipe> page, BusLedgerPipeRequestDTO request) {
@@ -74,7 +77,7 @@
         Page<BusLedgerPipe> pageList = this.baseMapper.monitorPipePageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<BusLedgerPipe> busLedgerList = pageList.getRecords();
         busLedgerList.forEach(busLedger -> {
-            busLedger.setOnState(abstractDictService.getDictNameByCode("onState", busLedger.getOnState())); // 使用状态字典值
+            busLedger.setOnState("1".equals(busLedger.getOnState())?"在用":"备用"); // 在用状态字典值
             busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); // 管理单位名称
             busLedger.setPressType(abstractDictService.getDictNameByCode("wellType", busLedger.getPressType())); // 位置状态字典值
             busLedger.setMonitorState(abstractDictService.getDictNameByCode("monitorState", busLedger.getMonitorState())); // 监控状态字典值
@@ -91,6 +94,7 @@
             busLedgerPipeResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(busLedgerPipeResponseDTO.getDeptid())); // 管理单位名称
             busLedgerPipeResponseDTO.setPressType(abstractDictService.getDictNameByCode("wellType", busLedgerPipeResponseDTO.getPressType())); // 位置状态字典值
             busLedgerPipeResponseDTO.setManageType(abstractDictService.getDictNameByCode("manageType", busLedgerPipeResponseDTO.getManageType())); // 位置状态字典值
+            busLedgerPipeResponseDTO.setMonitorStateName(abstractDictService.getDictNameByCode("monitorState", busLedgerPipeResponseDTO.getMonitorState())); // 监控状态字典值
         }
         return busLedgerPipeResponseDTO;
     }
@@ -109,6 +113,11 @@
                     queryColumns[2],
                     deviceDataEnum.getOrderColumn(),
                     request);
+
+            //加入阈值，用于判断设备状态
+            Map<String, Object> objectMap = new HashMap<>();
+            objectMap.put("alarmRuleValue", iBusDeviceService.getDeviceRule(request.getDevcode()));
+            resultMap.add(objectMap);
         }
         return resultMap;
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java
index d3a9dbf..c98ec10 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java
@@ -1,12 +1,12 @@
 package com.casic.missiles.modular.device.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.modular.device.dao.BusLedgerMapper;
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
@@ -20,14 +20,12 @@
 import com.casic.missiles.modular.device.service.IEqEquipRqService;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.server.CommonServer;
+import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -48,6 +46,7 @@
     private final ICtOrganizationService iCtOrganizationService;
     private final IEqEquipRqService iEqEquipRqService;
 
+
     public Page<BusLedger> pageList(Page<BusLedger> page, BusLedgerDTO request) {
         Page<BusLedger> pageList = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptid()));
         List<BusLedger> busLedgerList = pageList.getRecords();
@@ -61,11 +60,27 @@
         return pageList;
     }
 
+    //压力级制 0低压 1中压A 2中压B 3次高压A 4次高压B 5高压A 6高压B
+    public static String[] pressureLevelArr={"低压","中压A","中压B","次高压A","次高压B","高压A","高压B"};
     public Page<BusGrid> pageGridList(Page<BusGrid> page, BusLedgerDTO request) {
         Page<BusGrid> pageGridList = this.baseMapper.pageGridList(page, request, commonServer.getDeptScopeIds(request.getDeptid()));
         List<BusGrid> busGridList = pageGridList.getRecords();
         busGridList.forEach(busGrid -> {
             busGrid.setLocationStateName(abstractDictService.getDictNameByCode("locationState", busGrid.getLocationState()));
+            busGrid.setDeptName(ObjectUtil.isNotEmpty(busGrid.getDeptid())?commonServer.getDeptNamesByDeptId(busGrid.getDeptid()):"");
+            String pressType = busGrid.getPressType();
+            if(ObjectUtil.isNotEmpty(pressType)){
+                String[] pressTypeArr= pressType.split(",");
+                String pressTypes="";
+                for(String str:pressTypeArr){
+                    if(CommonUtil.isNumber(str)&&Integer.valueOf(str)<7){
+                        pressTypes+=pressureLevelArr[Integer.valueOf(str)]+",";
+                    }else {
+                        pressTypes+=str+",";
+                    }
+                }
+                busGrid.setPressType(ObjectUtil.isNotEmpty(pressTypes)?pressTypes.substring(0,pressTypes.length()-1):"");
+            }
         });
         return pageGridList;
     }
@@ -147,34 +162,35 @@
         List<CtOrganization> ctOrganizationList = iCtOrganizationService.getCtOrganizationList();
         //获取闸井系统已存在的部门
         List<Dept> deptList = abstractDeptService.getListByTips("");
-        deptList = deptList.stream().filter(object -> ObjectUtil.isNotEmpty(object.getSyncId())).collect(Collectors.toList());
-        List<String> synIds = deptList.stream().map(Dept::getSyncId).collect(Collectors.toList());
-
         for (CtOrganization ctOrganization : ctOrganizationList) {
-            if (!synIds.contains(ctOrganization.getOrgId())) {
-                Dept dept1 = new Dept();
-                dept1.setDelFlag("0");
-                dept1.setPid(getPid(ctOrganization, deptList));
-                dept1.setNum(99);
-                dept1.setSimpleName(ctOrganization.getOrgName());
-                dept1.setFullName(ctOrganization.getOrgName());
-                dept1.setTips(getTips(ctOrganization.getOrgType() + ""));
-                dept1.setSyncId(ctOrganization.getOrgId());
-                dept1.setSyncPid(ctOrganization.getParentId());
-                dept1.setTenantId(ctOrganization.getOrgCode());
-                dept1.setIsSync(1);
-                dept1.setIsParent(DictEnum.SYNC_GRID.equals(ctOrganization.getOrgType() + "") ? "1" : "0");
-                dept1.setDeptType(DictEnum.SYNC_COMPANY.equals(ctOrganization.getOrgType() + "") ? "03" : "04");
-                dept1.setPids(getPids(ctOrganization, deptList));
-                dept1.setCreateTime(new Date());
-                abstractDeptService.saveOrUpdate(dept1);
-                deptList.add(dept1);
-                deptList = deptList.stream().filter(object -> ObjectUtil.isNotEmpty(object.getSyncId())).collect(Collectors.toList());
-                synIds = deptList.stream().map(Dept::getSyncId).collect(Collectors.toList());
+            Dept dept1 = new Dept();
+            Optional<Dept> firstDept = deptList.stream().filter(dept -> Objects.equals(dept.getSyncId(), ctOrganization.getOrgId())).findFirst();
+            Dept deptOld = null;
+            if (firstDept.isPresent()) {
+                deptOld = firstDept.get();
+                dept1.setId(deptOld.getId());
             }
-
+            dept1.setDelFlag("0");
+            dept1.setPid(getPid(ctOrganization, deptList));
+            dept1.setNum(99);
+            dept1.setSimpleName(ctOrganization.getOrgName());
+            dept1.setFullName(ctOrganization.getOrgName());
+            dept1.setTips(getTips(ctOrganization.getOrgType() + ""));
+            dept1.setSyncId(ctOrganization.getOrgId());
+            dept1.setSyncPid(ctOrganization.getParentId());
+            dept1.setTenantId(ctOrganization.getOrgCode());
+            dept1.setIsSync(1);
+            dept1.setIsParent(DictEnum.SYNC_GRID.equals(ctOrganization.getOrgType() + "") ? "1" : "0");
+            dept1.setDeptType(DictEnum.SYNC_COMPANY.equals(ctOrganization.getOrgType() + "") ? "03" : "04");
+            dept1.setPids(getPids(ctOrganization, deptList));
+            dept1.setCreateTime(new Date());
+            if (deptOld != null && StrUtil.equals(deptOld.getFullName(), dept1.getFullName()) && ObjectUtil.equals(deptOld.getPid(), dept1.getPid())
+                    && StrUtil.equals(deptOld.getSyncId(), dept1.getSyncId()) && StrUtil.equals(deptOld.getSyncPid(), dept1.getSyncPid())
+                    && StrUtil.equals(deptOld.getPids(), dept1.getPids()) && StrUtil.equals(deptOld.getDeptType(), dept1.getDeptType()))
+                continue;
+            abstractDeptService.saveOrUpdate(dept1);
+            deptList.add(dept1);
         }
-
         return true;
     }
 
@@ -184,7 +200,7 @@
             return "[0],[24]";
         } else {
             for (Dept dept : deptList) {
-                if (dept.getSyncId().equals(ctOrganization.getParentId())) {
+                if (dept.getSyncId() != null && dept.getSyncId().equals(ctOrganization.getParentId())) {
                     return dept.getPids().concat(",[").concat(dept.getId() + "").concat("]");
                 }
             }
@@ -220,7 +236,7 @@
             return 24L;
         }
         for (Dept dept : deptList) {
-            if (dept.getSyncId().equals(ctOrganization.getParentId())) {
+            if (dept.getSyncId() != null && dept.getSyncId().equals(ctOrganization.getParentId())) {
                 return dept.getId();
             }
         }
@@ -228,49 +244,63 @@
     }
 
 
-    public List<String> manageTypeList = Arrays.asList("1","201","202");
+    public List<String> manageTypeList = Arrays.asList("1", "201", "202");
+
     @Transactional
     @Override
     public boolean synAllLedger() {
         QueryWrapper<BusLedger> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("valid", "1");
         List<BusLedger> busLedgerList = this.baseMapper.selectList(queryWrapper);
-        List<String> ledgerCodeList = busLedgerList.stream().map(BusLedger::getLedgerCode).collect(Collectors.toList());
         List<SyncTagDTO> wellList = iEqEquipRqService.getWellList();
+        wellList = wellList.stream().filter(CommonUtil.distinctByProperty(SyncTagDTO::getLedgerCode)).collect(Collectors.toList());
         List<Dept> deptList = abstractDeptService.getListByTips("");
         List<BusLedger> busLedgers = new ArrayList<>();
         for (SyncTagDTO syncTagDTO : wellList) {
-            if (!ledgerCodeList.contains(syncTagDTO.getLedgerCode())) {
-                BusLedger busLedger = new BusLedger();
-                busLedger.setLedgerCode(syncTagDTO.getLedgerCode());
-                busLedger.setLedgerName(syncTagDTO.getLedgerName());
-                busLedger.setTagNumber(syncTagDTO.getTagNumber());
-                busLedger.setLatGaode(syncTagDTO.getLatGaode());
-                busLedger.setLngGaode(syncTagDTO.getLngGaode());
-                busLedger.setPosition(syncTagDTO.getPosition());
-                if (ObjectUtil.isNotEmpty(syncTagDTO.getOrgCode())) {
-                    for (Dept dept : deptList) {
-                        if (syncTagDTO.getOrgCode().equals(dept.getTenantId())) {
-                            busLedger.setDeptid(dept.getId());
-                            break;
-                        }
+            BusLedger busLedger = new BusLedger();
+            Optional<BusLedger> firstBusLedger = busLedgerList.stream().filter(busLedger1 -> Objects.equals(busLedger1.getLedgerCode(), syncTagDTO.getLedgerCode())).findFirst();
+            BusLedger busLedgerOld = null;
+            if (firstBusLedger.isPresent()) {
+                busLedgerOld = firstBusLedger.get();
+                busLedger.setId(busLedgerOld.getId());
+            }
+//            if (!ledgerCodeList.contains(syncTagDTO.getLedgerCode())) {
+            busLedger.setLedgerCode(syncTagDTO.getLedgerCode());
+            busLedger.setLedgerName(syncTagDTO.getLedgerName());
+            busLedger.setTagNumber(syncTagDTO.getTagNumber());
+            busLedger.setLatGaode(syncTagDTO.getLatGaode());
+            busLedger.setLngGaode(syncTagDTO.getLngGaode());
+            busLedger.setPosition(syncTagDTO.getPosition());
+            if (ObjectUtil.isNotEmpty(syncTagDTO.getOrgCode())) {
+                for (Dept dept : deptList) {
+                    if (syncTagDTO.getOrgCode().equals(dept.getTenantId())) {
+                        busLedger.setDeptid(dept.getId());
+                        break;
                     }
                 }
-                busLedger.setManageType(manageTypeList.contains(syncTagDTO.getManageType())?"1":"0");
-                busLedger.setOnState(DictEnum.IS_USED.equals(syncTagDTO.getOnState()) ? DictEnum.IS_USED : "0");
-                busLedger.setLocationState("1");
-                busLedger.setWellType("3");
-                busLedger.setTargetId(syncTagDTO.getTargetId());
-                busLedger.setTargetCode(syncTagDTO.getOrgCode());
-                busLedger.setPropertyOwner(syncTagDTO.getPropertyOwner());
-                busLedger.setPropertyPerson(syncTagDTO.getPropertyPerson());
-                busLedger.setPropertyPhone(syncTagDTO.getPropertyPhone());
-                busLedger.setOpenDate(syncTagDTO.getOpenDate());
-                busLedger.setArea(syncTagDTO.getArea());
-                busLedger.setType("1");
-                busLedgers.add(busLedger);
             }
+            busLedger.setManageType(manageTypeList.contains(syncTagDTO.getManageType()) ? "1" : "0");
+            busLedger.setOnState(DictEnum.IS_USED.equals(syncTagDTO.getOnState()) ? DictEnum.IS_USED : "0");
+            busLedger.setLocationState("1");
+            busLedger.setWellType("3");
+            busLedger.setTargetId(syncTagDTO.getTargetId());
+            busLedger.setTargetCode(syncTagDTO.getOrgCode());
+            busLedger.setPropertyOwner(syncTagDTO.getPropertyOwner());
+            busLedger.setPropertyPerson(syncTagDTO.getPropertyPerson());
+            busLedger.setPropertyPhone(syncTagDTO.getPropertyPhone());
+            busLedger.setOpenDate(syncTagDTO.getOpenDate());
+            busLedger.setArea(syncTagDTO.getArea());
+            busLedger.setType("1");
+            if (busLedgerOld != null && StrUtil.equals(busLedgerOld.getLedgerCode(), busLedger.getLedgerCode()) && StrUtil.equals(busLedgerOld.getLedgerName(), busLedger.getLedgerName())
+                    && StrUtil.equals(busLedgerOld.getTagNumber(), busLedger.getTagNumber()) && StrUtil.equals(busLedgerOld.getLatGaode(), busLedger.getLatGaode())
+                    && StrUtil.equals(busLedgerOld.getLngGaode(), busLedger.getLngGaode()) && StrUtil.equals(busLedgerOld.getPosition(), busLedger.getPosition())
+                    && StrUtil.equals(busLedgerOld.getTargetId(), busLedger.getTargetId()) && StrUtil.equals(busLedgerOld.getTargetCode(), busLedger.getTargetCode()))
+                continue;
+            busLedgers.add(busLedger);
         }
-        return this.saveBatch(busLedgers);
+//        }
+        return this.saveOrUpdateBatch(busLedgers);
     }
+
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/CtUserServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/CtUserServiceImpl.java
index 394011d..b54e8dd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/CtUserServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/CtUserServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.modular.device.service.impl;
 
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDeptService;
+import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.modular.device.dao.CtUserMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.modular.system.model.Role;
+import com.casic.missiles.modular.system.model.User;
+import com.casic.missiles.modular.system.service.IRoleService;
+import com.casic.missiles.modular.system.service.IUserService;
+import com.casic.missiles.server.CommonServer;
+import com.casic.missiles.util.CommonUtil;
+import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -14,7 +37,122 @@
  * @author zt
  * @since 2024-11-25
  */
+@RequiredArgsConstructor
 @Service
 public class CtUserServiceImpl extends ServiceImpl<CtUserMapper, CtUser> implements ICtUserService {
 
+
+    private final AbstractDeptService abstractDeptService;
+    private final IRoleService iRoleService;
+    private final IUserService userService;
+    private final CommonServer commonServer;
+    private static final Logger logger = LoggerFactory.getLogger(CtUserServiceImpl.class);
+
+    @Transactional
+    @Override
+    public boolean synAllUsers() {
+
+        QueryWrapper<CtUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("STATE", 1);
+        queryWrapper.eq("DEL_FLAG", 0);
+        queryWrapper.isNotNull("ORG_ID");
+        List<CtUser> ctUserList = this.baseMapper.selectList(queryWrapper);
+        ctUserList = ctUserList.stream().filter(CommonUtil.distinctByProperty(CtUser::getUserCode)).collect(Collectors.toList());
+        List<Dept> deptList = abstractDeptService.getListByTips("");
+        QueryWrapper<User> userQueryWrapper = new QueryWrapper<>();
+        List<User> userSynList = userService.list(userQueryWrapper);
+        //找出班组长人员
+        List<String> ctUserIds = this.baseMapper.getCtUserGroupIds();
+        List<User> userList = new ArrayList<>();
+        Map<Long, Long> roleIdCache = new HashMap();
+        for (CtUser ctUser : ctUserList) {
+            User user = new User();
+            Optional<User> firstUser = userSynList.stream().filter(user1 -> Objects.equals(user1.getAccount(), ctUser.getUserCode())).findFirst();
+            User userOld = null;
+            if (firstUser.isPresent()) {
+                userOld = firstUser.get();
+                user.setId(userOld.getId());
+            }
+            user.setAccount(ctUser.getUserCode());
+            user.setName(ctUser.getUserName());
+            user.setSex(1);
+            user.setEmail(ctUser.getEmail());
+            user.setPhone(ctUser.getPhone());
+            user.setSyncDeptid(ctUser.getOrgId());
+            Optional<Dept> firstDept = deptList.stream().filter(dept -> Objects.equals(dept.getSyncId(), ctUser.getOrgId())).findFirst();
+            String deptName = "";
+            Long roleDeptId = null;
+            if (firstDept.isPresent()) {
+                user.setDeptId(firstDept.get().getId());
+                roleDeptId = firstDept.get().getId();
+                if ("group".equals(firstDept.get().getTips())) {
+                    roleDeptId = firstDept.get().getPid();
+                } else if ("grid".equals(firstDept.get().getTips())) {
+                    String pids = firstDept.get().getPids();
+                    String[] pidsArr = pids.split(",");
+                    if (pidsArr.length > 4) {
+                        roleDeptId = Long.valueOf(pidsArr[3].substring(1, pidsArr[3].length() - 1));
+                    }
+                }
+            }
+            if (ObjectUtil.isEmpty(roleDeptId)) {
+                logger.error("同步用户，组织机构未找到,用户为：" + user.getName() + ",组织机构为：" + ctUser.getOrgId());
+                continue;
+            }
+            deptName = commonServer.getDeptNamesByDeptId(roleDeptId);
+            if (!roleIdCache.containsKey(roleDeptId)) {
+                Role role = this.getDeptRole(roleDeptId, deptName, true, true);
+                roleIdCache.put(roleDeptId, role.getId());
+            }
+
+            if (ctUserIds.contains(ctUser.getUserId())) {
+                user.setAttr1("monitor");
+            }
+            user.setRoleId(String.valueOf(roleIdCache.get(roleDeptId)));
+            user.setStatus("1");
+            user.setSyncId(ctUser.getUserId());
+            user.setSyncName(ctUser.getUserName());
+            user.setSyncPwd(ctUser.getUserPass());
+            user.setSyncDeptid(ctUser.getOrgId());
+            user.setIsSync(1);
+            user.setCreateUser(1L);
+            user.setDelFlag("0");
+            user.setSalt(ShiroKit.getRandomSalt(5));
+            user.setPassword(ShiroKit.md5("111111", user.getSalt()));
+            if (userOld != null && ObjectUtil.equals(userOld.getId(), user.getId()) && ObjectUtil.equals(userOld.getDeptId(), user.getDeptId()) &&
+                    StrUtil.equals(userOld.getName(), user.getName()) && userOld.getAccount().equals(user.getAccount()) &&
+                    StrUtil.equals(userOld.getSyncId(), user.getSyncId()) && StrUtil.equals(userOld.getSyncDeptid(), user.getSyncDeptid()))
+                continue;
+            userList.add(user);
+        }
+        return userService.saveOrUpdateBatch(userList);
+    }
+
+
+    public Role getDeptRole(Long deptId, String deptName, boolean isDefault, boolean defaultCreate) {
+        QueryWrapper<Role> entityWrapper = new QueryWrapper();
+        entityWrapper.eq("dept_id", deptId);
+        if (ObjectUtil.isEmpty(isDefault)) {
+            entityWrapper.eq("IS_DEFAULT", 1);
+        }
+
+        List<Role> roles = iRoleService.list(entityWrapper);
+        if (ObjectUtil.isEmpty(roles)) {
+            Role role = new Role();
+            role.setId(IdUtil.getSnowflake(1, 1).nextId());
+            role.setNum(99);
+            role.setPid(1L);
+            role.setName(deptName.concat("普通角色"));
+            role.setDeptId(deptId);
+            role.setDataScope(String.valueOf(deptId));
+            role.setDataScopeType("2");
+            role.setTips("member");
+            role.setIsDefault(1);
+//            role.setCreateTime(new Date());
+            iRoleService.saveOrUpdate(role);
+            return role;
+        } else {
+            return roles.get(0);
+        }
+    }
 }
diff --git a/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java b/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java
index 57f41c3..2a070c9 100644
--- a/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java
+++ b/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java
@@ -4,6 +4,9 @@
 
 import java.text.SimpleDateFormat;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.function.Predicate;
 
 public class CommonUtil {
     public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -28,4 +31,10 @@
         return ObjectUtil.isNotNull(objMap.get(name)) ? objMap.get(name).toString() : "";
 
     }
+
+    public static <T> Predicate<T> distinctByProperty(Function<? super T, Object> keyExtractor) {
+        Map<Object, Boolean> map = new ConcurrentHashMap<>();
+        return t -> map.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null;
+    }
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
index 687fe02..e0547bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@
 @Mapper
 public interface CtUserMapper extends BaseMapper<CtUser> {
 
+    @Select("SELECT USER_ID FROM `ct_role_user` WHERE ROLE_ID='6a050c90c1e648ee8d2034baea6856df'")
+    List<String> getCtUserGroupIds();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 60f32a3..99ef10b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -156,9 +156,9 @@
             <if test="request.endTime != null and request.endTime !='' ">
                 and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
             </if>
-            AND (
+            <!--AND (
             ar.`STATUS` = 0
-            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))-->
         </where>
         ORDER BY ar.ALARM_TIME DESC
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
index 0f603c4..4788357 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
@@ -18,5 +18,23 @@
     <sql id="Base_Column_List">
         ID, GRID_CODE, DEPTID, PRINCIPAL, TELEPHONE, PRESS_TYPE, PIPE_LENGTH, TS
     </sql>
-
+    <select id="getSyncUserDTOList" resultType="com.casic.missiles.modular.device.dto.SyncUserDTO">
+        WITH user_temp AS (
+            SELECT
+                ID,
+                ACCOUNT,
+                NAME,
+                PHONE,
+                DEPT_ID
+            FROM
+                sys_user
+            WHERE
+                DEPT_ID IN ( SELECT id FROM `sys_dept` WHERE tips = 'grid' ))
+        SELECT
+            *
+        FROM
+            ( SELECT *, ROW_NUMBER() OVER ( PARTITION BY DEPT_ID ORDER BY ID DESC ) AS rn FROM user_temp ) t
+        WHERE
+            rn = 1
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
index a716a72..aa6c790 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
@@ -70,19 +70,15 @@
 
     <select id="pageGridList" resultType="com.casic.missiles.modular.device.entity.BusGrid">
         SELECT
-        bg.*,
-        sd.FULL_NAME as deptName
+        bg.*
         FROM
         bus_grid bg
-        LEFT JOIN sys_dept sd ON bg.DEPTID = sd.ID
         WHERE 1=1
 
         <if test="request.gridCode != null and request.gridCode !='' ">
             and bg.GRID_CODE like concat('%', #{request.gridCode}, '%')
         </if>
-        <if test="request.deptid != null and request.deptid !=''">
-            and bg.DEPTID = #{request.responsibleDept}
-        </if>
+
         <if test="request.locationState != null and request.locationState !=''">
             and bg.LOCATION_STATE = #{request.locationState}
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 7965bfc..5f8d90f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.device.dto;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -74,5 +75,11 @@
     @ApiModelProperty("左侧指示带长度")
     private String rightLength;
 
+    @ApiModelProperty("监控状态（1：正常，2：异常，3：离线，0：未监测）")
+    private String monitorState;
+
+    @ApiModelProperty("监控状态名称")
+    private String monitorStateName;
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
new file mode 100644
index 0000000..8edbe2d
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SyncUserDTO {
+
+    @ApiModelProperty("人员id")
+    private Long id;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("人员名称")
+    private String name;
+
+    @ApiModelProperty("电话")
+    private String phone;
+
+    @ApiModelProperty("账号")
+    private String account;
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
index 14dc9b8..aef0ae4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
@@ -5,11 +5,13 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -100,7 +102,10 @@
     private String pressureLevel;
 
     @TableField("updt_time")
-    private LocalDateTime updtTime;
+    private Date updtTime;
 
+    @ApiModelProperty("区域点集合")
+    @TableField(exist = false)
+    private String trajectory;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index 5d1f30b..5659491 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -36,6 +36,10 @@
     @TableField("GRID_CODE")
     private String gridCode;
 
+    @ApiModelProperty("网格名称")
+    @TableField("GRID_Name")
+    private String gridName;
+
     @ApiModelProperty("管理单位")
     @TableField("DEPTID")
     private Long deptid;
@@ -68,6 +72,18 @@
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("同步id")
+    @TableField("SYNC_ID")
+    private String syncId;
+
+    @ApiModelProperty("地图坐标集合")
+    @TableField("TRAJECTORY")
+    private String trajectory;
+
+    @ApiModelProperty("是否同步1，是0，否")
+    @TableField("IS_SYNC")
+    private int isSync;
+
     @ApiModelProperty("部门名称")
     @TableField(exist = false)
     private String deptName;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
index 08a4bb6..eb4d377 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务类
@@ -13,4 +15,6 @@
  */
 public interface IBdcRegionAreaService extends IService<BdcRegionArea> {
 
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 4ea13f2..65fb3ab 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -48,4 +48,6 @@
 
     String getBfcf(String devcode);
 
+    List<String> getDeviceRule(String devcode);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
index 1d16e8d..a65debb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
@@ -12,5 +12,5 @@
  * @since 2024-07-16
  */
 public interface IBusGridService extends IService<BusGrid> {
-
+    boolean synAllGrids();
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
index ec973f5..d6f42b2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
@@ -40,4 +40,6 @@
     boolean synAllDept();
 
     boolean synAllLedger();
+
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
index f681c35..acd3cb4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
@@ -13,4 +13,6 @@
  */
 public interface ICtUserService extends IService<CtUser> {
 
+    boolean synAllUsers();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
index fa513fb..0815a30 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
@@ -1,11 +1,14 @@
 package com.casic.missiles.modular.device.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.device.dao.BdcRegionAreaMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import com.casic.missiles.modular.device.service.IBdcRegionAreaService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务实现类
@@ -17,4 +20,8 @@
 @Service
 public class BdcRegionAreaServiceImpl extends ServiceImpl<BdcRegionAreaMapper, BdcRegionArea> implements IBdcRegionAreaService {
 
+    @Override
+    public List<BdcRegionArea> getBdcRegionAreaList() {
+        return this.baseMapper.getBdcRegionAreaList();
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index a2e45de..610fdf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -489,4 +489,15 @@
         }
         return true;
     }
+
+
+    @Cacheable(value = "alarmRuleCache", key = "#devcode")
+    @Override
+    public List<String> getDeviceRule(String devcode) {
+        List<String> alarmRuleValueList = this.baseMapper.getSpecialDeviceRule(devcode);
+        if(alarmRuleValueList==null||alarmRuleValueList.size()<1){
+            alarmRuleValueList=this.baseMapper.getDeviceTypeRule(devcode);
+        }
+        return alarmRuleValueList;
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java
index 7ca3100..b230a73 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java
@@ -1,11 +1,24 @@
 package com.casic.missiles.modular.device.service.impl;
 
-import com.casic.missiles.modular.device.dao.BusGridMapper;
-import com.casic.missiles.modular.device.service.IBusGridService;
-import com.casic.missiles.modular.device.entity.BusGrid;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDeptService;
+import com.casic.missiles.modular.device.dao.BusGridMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
+import com.casic.missiles.modular.device.entity.BdcRegionArea;
+import com.casic.missiles.modular.device.entity.BusGrid;
+import com.casic.missiles.modular.device.service.IBdcRegionAreaService;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.modular.system.model.Dept;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * <p>
  * 网格管理	 服务实现类
@@ -14,7 +27,60 @@
  * @author zt
  * @since 2024-07-16
  */
+@RequiredArgsConstructor
 @Service
 public class BusGridServiceImpl extends ServiceImpl<BusGridMapper, BusGrid> implements IBusGridService {
 
+    private final IBdcRegionAreaService iBdcRegionAreaService;
+    private final AbstractDeptService abstractDeptService;
+
+    @Override
+    public boolean synAllGrids() {
+        List<BdcRegionArea> bdcRegionAreaList = iBdcRegionAreaService.getBdcRegionAreaList();
+        List<Dept> deptList = abstractDeptService.getListByTips("");
+        List<SyncUserDTO> syncUserDTOList = this.baseMapper.getSyncUserDTOList();
+        List<BusGrid> busGrids = this.list();
+        List<BusGrid> busGridList = new ArrayList<>();
+        for (BdcRegionArea bdcRegionArea : bdcRegionAreaList) {
+            BusGrid busGrid = new BusGrid();
+
+            Optional<BusGrid> firstBusGrid = busGrids.stream().filter(busGrid1 -> Objects.equals(busGrid1.getSyncId(), bdcRegionArea.getRegionAreaId())).findFirst();
+            BusGrid busGridOld = null;
+            if (firstBusGrid.isPresent()) {
+                busGridOld = firstBusGrid.get();
+                busGrid.setId(busGridOld.getId());
+            }
+            busGrid.setGridCode(bdcRegionArea.getRegionCode());
+            busGrid.setPressType(bdcRegionArea.getPressureLevel());
+            busGrid.setIsSync(1);
+            busGrid.setSyncId(bdcRegionArea.getRegionAreaId());
+            busGrid.setGridName(bdcRegionArea.getRegionName());
+            busGrid.setPipeLength(bdcRegionArea.getPipelineLength());
+            busGrid.setTrajectory(bdcRegionArea.getTrajectory());
+            if (ObjectUtil.isNotEmpty(bdcRegionArea.getRegionCode())) {
+                for (Dept dept : deptList) {
+                    if (ObjectUtil.equals(bdcRegionArea.getRegionCode(), dept.getTenantId())) {
+                        busGrid.setDeptid(dept.getId());
+                        Optional<SyncUserDTO> syncUserDTO = syncUserDTOList.stream().filter(syncUserDTO1 -> Objects.equals(syncUserDTO1.getDeptId(), dept.getId())).findFirst();
+                        if (syncUserDTO.isPresent()) {
+                            busGrid.setPrincipal(syncUserDTO.get().getName());
+                            busGrid.setTelephone(syncUserDTO.get().getPhone());
+                        }
+                        break;
+                    }
+                }
+            }
+            if (ObjectUtil.isNotEmpty(bdcRegionArea.getTrajectory()))
+                busGrid.setLocationState("1");
+
+            if (busGridOld != null
+                    && StrUtil.equals(busGridOld.getGridCode(), busGrid.getGridCode()) && StrUtil.equals(busGridOld.getGridName(), busGrid.getGridName())
+                    && StrUtil.equals(busGridOld.getPressType(), busGrid.getPressType()) && StrUtil.equals(busGridOld.getPipeLength(), busGrid.getPipeLength())
+                    && StrUtil.equals(busGridOld.getPrincipal(), busGrid.getPrincipal()) && StrUtil.equals(busGridOld.getTelephone(), busGrid.getTelephone())
+                    && StrUtil.equals(busGridOld.getTrajectory(), busGrid.getTrajectory()) && ObjectUtil.equals(busGridOld.getDeptid(), busGrid.getDeptid()))
+                continue;
+            busGridList.add(busGrid);
+        }
+        return this.saveOrUpdateBatch(busGridList);
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
index f0ba160..6c7173b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
@@ -1,14 +1,11 @@
 package com.casic.missiles.modular.device.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.datascope.ScopeEnums;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.enums.DeviceDataEnum;
@@ -19,15 +16,18 @@
 import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
 import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
 import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusDeviceService;
 import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
 import com.casic.missiles.server.CommonServer;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -45,6 +45,9 @@
     private final AbstractDictService abstractDictService;
     private final BusDeviceMapper busDeviceMapper;
     private final CommonServer commonServer;
+    @Lazy
+    @Autowired
+    private  IBusDeviceService iBusDeviceService;
 
     @Override
     public Page<BusLedgerPipe> listPage(Page<BusLedgerPipe> page, BusLedgerPipeRequestDTO request) {
@@ -74,7 +77,7 @@
         Page<BusLedgerPipe> pageList = this.baseMapper.monitorPipePageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<BusLedgerPipe> busLedgerList = pageList.getRecords();
         busLedgerList.forEach(busLedger -> {
-            busLedger.setOnState(abstractDictService.getDictNameByCode("onState", busLedger.getOnState())); // 使用状态字典值
+            busLedger.setOnState("1".equals(busLedger.getOnState())?"在用":"备用"); // 在用状态字典值
             busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); // 管理单位名称
             busLedger.setPressType(abstractDictService.getDictNameByCode("wellType", busLedger.getPressType())); // 位置状态字典值
             busLedger.setMonitorState(abstractDictService.getDictNameByCode("monitorState", busLedger.getMonitorState())); // 监控状态字典值
@@ -91,6 +94,7 @@
             busLedgerPipeResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(busLedgerPipeResponseDTO.getDeptid())); // 管理单位名称
             busLedgerPipeResponseDTO.setPressType(abstractDictService.getDictNameByCode("wellType", busLedgerPipeResponseDTO.getPressType())); // 位置状态字典值
             busLedgerPipeResponseDTO.setManageType(abstractDictService.getDictNameByCode("manageType", busLedgerPipeResponseDTO.getManageType())); // 位置状态字典值
+            busLedgerPipeResponseDTO.setMonitorStateName(abstractDictService.getDictNameByCode("monitorState", busLedgerPipeResponseDTO.getMonitorState())); // 监控状态字典值
         }
         return busLedgerPipeResponseDTO;
     }
@@ -109,6 +113,11 @@
                     queryColumns[2],
                     deviceDataEnum.getOrderColumn(),
                     request);
+
+            //加入阈值，用于判断设备状态
+            Map<String, Object> objectMap = new HashMap<>();
+            objectMap.put("alarmRuleValue", iBusDeviceService.getDeviceRule(request.getDevcode()));
+            resultMap.add(objectMap);
         }
         return resultMap;
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java
index d3a9dbf..c98ec10 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java
@@ -1,12 +1,12 @@
 package com.casic.missiles.modular.device.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.modular.device.dao.BusLedgerMapper;
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
@@ -20,14 +20,12 @@
 import com.casic.missiles.modular.device.service.IEqEquipRqService;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.server.CommonServer;
+import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -48,6 +46,7 @@
     private final ICtOrganizationService iCtOrganizationService;
     private final IEqEquipRqService iEqEquipRqService;
 
+
     public Page<BusLedger> pageList(Page<BusLedger> page, BusLedgerDTO request) {
         Page<BusLedger> pageList = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptid()));
         List<BusLedger> busLedgerList = pageList.getRecords();
@@ -61,11 +60,27 @@
         return pageList;
     }
 
+    //压力级制 0低压 1中压A 2中压B 3次高压A 4次高压B 5高压A 6高压B
+    public static String[] pressureLevelArr={"低压","中压A","中压B","次高压A","次高压B","高压A","高压B"};
     public Page<BusGrid> pageGridList(Page<BusGrid> page, BusLedgerDTO request) {
         Page<BusGrid> pageGridList = this.baseMapper.pageGridList(page, request, commonServer.getDeptScopeIds(request.getDeptid()));
         List<BusGrid> busGridList = pageGridList.getRecords();
         busGridList.forEach(busGrid -> {
             busGrid.setLocationStateName(abstractDictService.getDictNameByCode("locationState", busGrid.getLocationState()));
+            busGrid.setDeptName(ObjectUtil.isNotEmpty(busGrid.getDeptid())?commonServer.getDeptNamesByDeptId(busGrid.getDeptid()):"");
+            String pressType = busGrid.getPressType();
+            if(ObjectUtil.isNotEmpty(pressType)){
+                String[] pressTypeArr= pressType.split(",");
+                String pressTypes="";
+                for(String str:pressTypeArr){
+                    if(CommonUtil.isNumber(str)&&Integer.valueOf(str)<7){
+                        pressTypes+=pressureLevelArr[Integer.valueOf(str)]+",";
+                    }else {
+                        pressTypes+=str+",";
+                    }
+                }
+                busGrid.setPressType(ObjectUtil.isNotEmpty(pressTypes)?pressTypes.substring(0,pressTypes.length()-1):"");
+            }
         });
         return pageGridList;
     }
@@ -147,34 +162,35 @@
         List<CtOrganization> ctOrganizationList = iCtOrganizationService.getCtOrganizationList();
         //获取闸井系统已存在的部门
         List<Dept> deptList = abstractDeptService.getListByTips("");
-        deptList = deptList.stream().filter(object -> ObjectUtil.isNotEmpty(object.getSyncId())).collect(Collectors.toList());
-        List<String> synIds = deptList.stream().map(Dept::getSyncId).collect(Collectors.toList());
-
         for (CtOrganization ctOrganization : ctOrganizationList) {
-            if (!synIds.contains(ctOrganization.getOrgId())) {
-                Dept dept1 = new Dept();
-                dept1.setDelFlag("0");
-                dept1.setPid(getPid(ctOrganization, deptList));
-                dept1.setNum(99);
-                dept1.setSimpleName(ctOrganization.getOrgName());
-                dept1.setFullName(ctOrganization.getOrgName());
-                dept1.setTips(getTips(ctOrganization.getOrgType() + ""));
-                dept1.setSyncId(ctOrganization.getOrgId());
-                dept1.setSyncPid(ctOrganization.getParentId());
-                dept1.setTenantId(ctOrganization.getOrgCode());
-                dept1.setIsSync(1);
-                dept1.setIsParent(DictEnum.SYNC_GRID.equals(ctOrganization.getOrgType() + "") ? "1" : "0");
-                dept1.setDeptType(DictEnum.SYNC_COMPANY.equals(ctOrganization.getOrgType() + "") ? "03" : "04");
-                dept1.setPids(getPids(ctOrganization, deptList));
-                dept1.setCreateTime(new Date());
-                abstractDeptService.saveOrUpdate(dept1);
-                deptList.add(dept1);
-                deptList = deptList.stream().filter(object -> ObjectUtil.isNotEmpty(object.getSyncId())).collect(Collectors.toList());
-                synIds = deptList.stream().map(Dept::getSyncId).collect(Collectors.toList());
+            Dept dept1 = new Dept();
+            Optional<Dept> firstDept = deptList.stream().filter(dept -> Objects.equals(dept.getSyncId(), ctOrganization.getOrgId())).findFirst();
+            Dept deptOld = null;
+            if (firstDept.isPresent()) {
+                deptOld = firstDept.get();
+                dept1.setId(deptOld.getId());
             }
-
+            dept1.setDelFlag("0");
+            dept1.setPid(getPid(ctOrganization, deptList));
+            dept1.setNum(99);
+            dept1.setSimpleName(ctOrganization.getOrgName());
+            dept1.setFullName(ctOrganization.getOrgName());
+            dept1.setTips(getTips(ctOrganization.getOrgType() + ""));
+            dept1.setSyncId(ctOrganization.getOrgId());
+            dept1.setSyncPid(ctOrganization.getParentId());
+            dept1.setTenantId(ctOrganization.getOrgCode());
+            dept1.setIsSync(1);
+            dept1.setIsParent(DictEnum.SYNC_GRID.equals(ctOrganization.getOrgType() + "") ? "1" : "0");
+            dept1.setDeptType(DictEnum.SYNC_COMPANY.equals(ctOrganization.getOrgType() + "") ? "03" : "04");
+            dept1.setPids(getPids(ctOrganization, deptList));
+            dept1.setCreateTime(new Date());
+            if (deptOld != null && StrUtil.equals(deptOld.getFullName(), dept1.getFullName()) && ObjectUtil.equals(deptOld.getPid(), dept1.getPid())
+                    && StrUtil.equals(deptOld.getSyncId(), dept1.getSyncId()) && StrUtil.equals(deptOld.getSyncPid(), dept1.getSyncPid())
+                    && StrUtil.equals(deptOld.getPids(), dept1.getPids()) && StrUtil.equals(deptOld.getDeptType(), dept1.getDeptType()))
+                continue;
+            abstractDeptService.saveOrUpdate(dept1);
+            deptList.add(dept1);
         }
-
         return true;
     }
 
@@ -184,7 +200,7 @@
             return "[0],[24]";
         } else {
             for (Dept dept : deptList) {
-                if (dept.getSyncId().equals(ctOrganization.getParentId())) {
+                if (dept.getSyncId() != null && dept.getSyncId().equals(ctOrganization.getParentId())) {
                     return dept.getPids().concat(",[").concat(dept.getId() + "").concat("]");
                 }
             }
@@ -220,7 +236,7 @@
             return 24L;
         }
         for (Dept dept : deptList) {
-            if (dept.getSyncId().equals(ctOrganization.getParentId())) {
+            if (dept.getSyncId() != null && dept.getSyncId().equals(ctOrganization.getParentId())) {
                 return dept.getId();
             }
         }
@@ -228,49 +244,63 @@
     }
 
 
-    public List<String> manageTypeList = Arrays.asList("1","201","202");
+    public List<String> manageTypeList = Arrays.asList("1", "201", "202");
+
     @Transactional
     @Override
     public boolean synAllLedger() {
         QueryWrapper<BusLedger> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("valid", "1");
         List<BusLedger> busLedgerList = this.baseMapper.selectList(queryWrapper);
-        List<String> ledgerCodeList = busLedgerList.stream().map(BusLedger::getLedgerCode).collect(Collectors.toList());
         List<SyncTagDTO> wellList = iEqEquipRqService.getWellList();
+        wellList = wellList.stream().filter(CommonUtil.distinctByProperty(SyncTagDTO::getLedgerCode)).collect(Collectors.toList());
         List<Dept> deptList = abstractDeptService.getListByTips("");
         List<BusLedger> busLedgers = new ArrayList<>();
         for (SyncTagDTO syncTagDTO : wellList) {
-            if (!ledgerCodeList.contains(syncTagDTO.getLedgerCode())) {
-                BusLedger busLedger = new BusLedger();
-                busLedger.setLedgerCode(syncTagDTO.getLedgerCode());
-                busLedger.setLedgerName(syncTagDTO.getLedgerName());
-                busLedger.setTagNumber(syncTagDTO.getTagNumber());
-                busLedger.setLatGaode(syncTagDTO.getLatGaode());
-                busLedger.setLngGaode(syncTagDTO.getLngGaode());
-                busLedger.setPosition(syncTagDTO.getPosition());
-                if (ObjectUtil.isNotEmpty(syncTagDTO.getOrgCode())) {
-                    for (Dept dept : deptList) {
-                        if (syncTagDTO.getOrgCode().equals(dept.getTenantId())) {
-                            busLedger.setDeptid(dept.getId());
-                            break;
-                        }
+            BusLedger busLedger = new BusLedger();
+            Optional<BusLedger> firstBusLedger = busLedgerList.stream().filter(busLedger1 -> Objects.equals(busLedger1.getLedgerCode(), syncTagDTO.getLedgerCode())).findFirst();
+            BusLedger busLedgerOld = null;
+            if (firstBusLedger.isPresent()) {
+                busLedgerOld = firstBusLedger.get();
+                busLedger.setId(busLedgerOld.getId());
+            }
+//            if (!ledgerCodeList.contains(syncTagDTO.getLedgerCode())) {
+            busLedger.setLedgerCode(syncTagDTO.getLedgerCode());
+            busLedger.setLedgerName(syncTagDTO.getLedgerName());
+            busLedger.setTagNumber(syncTagDTO.getTagNumber());
+            busLedger.setLatGaode(syncTagDTO.getLatGaode());
+            busLedger.setLngGaode(syncTagDTO.getLngGaode());
+            busLedger.setPosition(syncTagDTO.getPosition());
+            if (ObjectUtil.isNotEmpty(syncTagDTO.getOrgCode())) {
+                for (Dept dept : deptList) {
+                    if (syncTagDTO.getOrgCode().equals(dept.getTenantId())) {
+                        busLedger.setDeptid(dept.getId());
+                        break;
                     }
                 }
-                busLedger.setManageType(manageTypeList.contains(syncTagDTO.getManageType())?"1":"0");
-                busLedger.setOnState(DictEnum.IS_USED.equals(syncTagDTO.getOnState()) ? DictEnum.IS_USED : "0");
-                busLedger.setLocationState("1");
-                busLedger.setWellType("3");
-                busLedger.setTargetId(syncTagDTO.getTargetId());
-                busLedger.setTargetCode(syncTagDTO.getOrgCode());
-                busLedger.setPropertyOwner(syncTagDTO.getPropertyOwner());
-                busLedger.setPropertyPerson(syncTagDTO.getPropertyPerson());
-                busLedger.setPropertyPhone(syncTagDTO.getPropertyPhone());
-                busLedger.setOpenDate(syncTagDTO.getOpenDate());
-                busLedger.setArea(syncTagDTO.getArea());
-                busLedger.setType("1");
-                busLedgers.add(busLedger);
             }
+            busLedger.setManageType(manageTypeList.contains(syncTagDTO.getManageType()) ? "1" : "0");
+            busLedger.setOnState(DictEnum.IS_USED.equals(syncTagDTO.getOnState()) ? DictEnum.IS_USED : "0");
+            busLedger.setLocationState("1");
+            busLedger.setWellType("3");
+            busLedger.setTargetId(syncTagDTO.getTargetId());
+            busLedger.setTargetCode(syncTagDTO.getOrgCode());
+            busLedger.setPropertyOwner(syncTagDTO.getPropertyOwner());
+            busLedger.setPropertyPerson(syncTagDTO.getPropertyPerson());
+            busLedger.setPropertyPhone(syncTagDTO.getPropertyPhone());
+            busLedger.setOpenDate(syncTagDTO.getOpenDate());
+            busLedger.setArea(syncTagDTO.getArea());
+            busLedger.setType("1");
+            if (busLedgerOld != null && StrUtil.equals(busLedgerOld.getLedgerCode(), busLedger.getLedgerCode()) && StrUtil.equals(busLedgerOld.getLedgerName(), busLedger.getLedgerName())
+                    && StrUtil.equals(busLedgerOld.getTagNumber(), busLedger.getTagNumber()) && StrUtil.equals(busLedgerOld.getLatGaode(), busLedger.getLatGaode())
+                    && StrUtil.equals(busLedgerOld.getLngGaode(), busLedger.getLngGaode()) && StrUtil.equals(busLedgerOld.getPosition(), busLedger.getPosition())
+                    && StrUtil.equals(busLedgerOld.getTargetId(), busLedger.getTargetId()) && StrUtil.equals(busLedgerOld.getTargetCode(), busLedger.getTargetCode()))
+                continue;
+            busLedgers.add(busLedger);
         }
-        return this.saveBatch(busLedgers);
+//        }
+        return this.saveOrUpdateBatch(busLedgers);
     }
+
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/CtUserServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/CtUserServiceImpl.java
index 394011d..b54e8dd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/CtUserServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/CtUserServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.modular.device.service.impl;
 
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDeptService;
+import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.modular.device.dao.CtUserMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.modular.system.model.Role;
+import com.casic.missiles.modular.system.model.User;
+import com.casic.missiles.modular.system.service.IRoleService;
+import com.casic.missiles.modular.system.service.IUserService;
+import com.casic.missiles.server.CommonServer;
+import com.casic.missiles.util.CommonUtil;
+import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -14,7 +37,122 @@
  * @author zt
  * @since 2024-11-25
  */
+@RequiredArgsConstructor
 @Service
 public class CtUserServiceImpl extends ServiceImpl<CtUserMapper, CtUser> implements ICtUserService {
 
+
+    private final AbstractDeptService abstractDeptService;
+    private final IRoleService iRoleService;
+    private final IUserService userService;
+    private final CommonServer commonServer;
+    private static final Logger logger = LoggerFactory.getLogger(CtUserServiceImpl.class);
+
+    @Transactional
+    @Override
+    public boolean synAllUsers() {
+
+        QueryWrapper<CtUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("STATE", 1);
+        queryWrapper.eq("DEL_FLAG", 0);
+        queryWrapper.isNotNull("ORG_ID");
+        List<CtUser> ctUserList = this.baseMapper.selectList(queryWrapper);
+        ctUserList = ctUserList.stream().filter(CommonUtil.distinctByProperty(CtUser::getUserCode)).collect(Collectors.toList());
+        List<Dept> deptList = abstractDeptService.getListByTips("");
+        QueryWrapper<User> userQueryWrapper = new QueryWrapper<>();
+        List<User> userSynList = userService.list(userQueryWrapper);
+        //找出班组长人员
+        List<String> ctUserIds = this.baseMapper.getCtUserGroupIds();
+        List<User> userList = new ArrayList<>();
+        Map<Long, Long> roleIdCache = new HashMap();
+        for (CtUser ctUser : ctUserList) {
+            User user = new User();
+            Optional<User> firstUser = userSynList.stream().filter(user1 -> Objects.equals(user1.getAccount(), ctUser.getUserCode())).findFirst();
+            User userOld = null;
+            if (firstUser.isPresent()) {
+                userOld = firstUser.get();
+                user.setId(userOld.getId());
+            }
+            user.setAccount(ctUser.getUserCode());
+            user.setName(ctUser.getUserName());
+            user.setSex(1);
+            user.setEmail(ctUser.getEmail());
+            user.setPhone(ctUser.getPhone());
+            user.setSyncDeptid(ctUser.getOrgId());
+            Optional<Dept> firstDept = deptList.stream().filter(dept -> Objects.equals(dept.getSyncId(), ctUser.getOrgId())).findFirst();
+            String deptName = "";
+            Long roleDeptId = null;
+            if (firstDept.isPresent()) {
+                user.setDeptId(firstDept.get().getId());
+                roleDeptId = firstDept.get().getId();
+                if ("group".equals(firstDept.get().getTips())) {
+                    roleDeptId = firstDept.get().getPid();
+                } else if ("grid".equals(firstDept.get().getTips())) {
+                    String pids = firstDept.get().getPids();
+                    String[] pidsArr = pids.split(",");
+                    if (pidsArr.length > 4) {
+                        roleDeptId = Long.valueOf(pidsArr[3].substring(1, pidsArr[3].length() - 1));
+                    }
+                }
+            }
+            if (ObjectUtil.isEmpty(roleDeptId)) {
+                logger.error("同步用户，组织机构未找到,用户为：" + user.getName() + ",组织机构为：" + ctUser.getOrgId());
+                continue;
+            }
+            deptName = commonServer.getDeptNamesByDeptId(roleDeptId);
+            if (!roleIdCache.containsKey(roleDeptId)) {
+                Role role = this.getDeptRole(roleDeptId, deptName, true, true);
+                roleIdCache.put(roleDeptId, role.getId());
+            }
+
+            if (ctUserIds.contains(ctUser.getUserId())) {
+                user.setAttr1("monitor");
+            }
+            user.setRoleId(String.valueOf(roleIdCache.get(roleDeptId)));
+            user.setStatus("1");
+            user.setSyncId(ctUser.getUserId());
+            user.setSyncName(ctUser.getUserName());
+            user.setSyncPwd(ctUser.getUserPass());
+            user.setSyncDeptid(ctUser.getOrgId());
+            user.setIsSync(1);
+            user.setCreateUser(1L);
+            user.setDelFlag("0");
+            user.setSalt(ShiroKit.getRandomSalt(5));
+            user.setPassword(ShiroKit.md5("111111", user.getSalt()));
+            if (userOld != null && ObjectUtil.equals(userOld.getId(), user.getId()) && ObjectUtil.equals(userOld.getDeptId(), user.getDeptId()) &&
+                    StrUtil.equals(userOld.getName(), user.getName()) && userOld.getAccount().equals(user.getAccount()) &&
+                    StrUtil.equals(userOld.getSyncId(), user.getSyncId()) && StrUtil.equals(userOld.getSyncDeptid(), user.getSyncDeptid()))
+                continue;
+            userList.add(user);
+        }
+        return userService.saveOrUpdateBatch(userList);
+    }
+
+
+    public Role getDeptRole(Long deptId, String deptName, boolean isDefault, boolean defaultCreate) {
+        QueryWrapper<Role> entityWrapper = new QueryWrapper();
+        entityWrapper.eq("dept_id", deptId);
+        if (ObjectUtil.isEmpty(isDefault)) {
+            entityWrapper.eq("IS_DEFAULT", 1);
+        }
+
+        List<Role> roles = iRoleService.list(entityWrapper);
+        if (ObjectUtil.isEmpty(roles)) {
+            Role role = new Role();
+            role.setId(IdUtil.getSnowflake(1, 1).nextId());
+            role.setNum(99);
+            role.setPid(1L);
+            role.setName(deptName.concat("普通角色"));
+            role.setDeptId(deptId);
+            role.setDataScope(String.valueOf(deptId));
+            role.setDataScopeType("2");
+            role.setTips("member");
+            role.setIsDefault(1);
+//            role.setCreateTime(new Date());
+            iRoleService.saveOrUpdate(role);
+            return role;
+        } else {
+            return roles.get(0);
+        }
+    }
 }
diff --git a/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java b/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java
index 57f41c3..2a070c9 100644
--- a/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java
+++ b/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java
@@ -4,6 +4,9 @@
 
 import java.text.SimpleDateFormat;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.function.Predicate;
 
 public class CommonUtil {
     public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -28,4 +31,10 @@
         return ObjectUtil.isNotNull(objMap.get(name)) ? objMap.get(name).toString() : "";
 
     }
+
+    public static <T> Predicate<T> distinctByProperty(Function<? super T, Object> keyExtractor) {
+        Map<Object, Boolean> map = new ConcurrentHashMap<>();
+        return t -> map.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null;
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CodeGenerator.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CodeGenerator.java
index 1abcd55..ce8992b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CodeGenerator.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CodeGenerator.java
@@ -65,7 +65,7 @@
 
                 //策略配置
                 .strategyConfig(builder -> {
-                    builder.addInclude("sys_operation_log") // 设置需要生成的表名
+                    builder.addInclude("sys_role") // 设置需要生成的表名
                             .addTablePrefix() // 设置过滤表前缀
                             .entityBuilder() //实体类配置
                             .enableLombok() //使用lombok

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
index 438c8fc..5152005 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java
@@ -80,5 +80,22 @@
         });
         return ReturnUtil.success(iAlarmRuleDeviceService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("同步特殊报警规则")
+    @PostMapping("/syncAlarmRule")
+    @ResponseBody
+    public ReturnDTO syncAlarmRule() {
+        return ReturnUtil.success(iAlarmRuleDeviceService.syncAlarmRule());
+    }
+
+    @ApiOperation("新增特殊报警规则自动加载报警规则列表")
+    @PostMapping("/getRuleList")
+    @ResponseBody
+    public ReturnDTO getRuleList(String devCode) {
+        Assert.isFalse(Objects.isNull(devCode), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRuleDeviceService.getRuleList(devCode));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 5c5aa0a..215cc71 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -48,6 +48,8 @@
 
     void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
 
+    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
     List<AlarmRecordExportDTO> allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
index 365ff07..07ae845 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleDeviceMapper.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报警规则(单个设备设置) Mapper 接口
@@ -19,4 +22,8 @@
 public interface AlarmRuleDeviceMapper extends BaseMapper<AlarmRuleDevice> {
 
     Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page,  @Param("request") AlarmRuleDeviceDTO request);
+
+    List<AlarmRuleSpecialDTO> syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(@Param("devcode") String devcode);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index ba20a30..a00ca6f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -353,6 +353,7 @@
         LEFT JOIN alarm_type ay ON ay.id = rd.ALARM_TYPE_ID
         LEFT JOIN alarm_level_control ac ON ac.id = rd.ALARM_LEVEL
         where rd.id=#{id}
+        limit 1
 
     </select>
 
@@ -394,6 +395,7 @@
                  LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
         where rd.STATUS = 0
           and rd.id = #{id}
+        limit 1
     </select>
 
     <select id="historyListPage" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
@@ -793,5 +795,11 @@
         where TAG_NUMBER = #{tagNumber}
           and valid > 0
     </update>
+    <update id="updatePipeStatus" flushCache="true">
+        update bus_ledger_pipe
+        set MONITOR_STATE = #{onLineStatus}
+        where TAG_NUMBER = #{tagNumber}
+          and valid > 0
+    </update>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index a91ade8..bbedb15 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -45,6 +45,42 @@
 
         ORDER BY rd.TS DESC
     </select>
+    <select id="syncAlarmRule" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        WITH all_rule as(SELECT
+             bd.DEVCODE ,
+             al.ALARM_LEVEL_ID as alarmLevelId,
+             al.ALARM_THRESHOLD as alarmThreshold,
+             ALARM_TYPE_ID as alarmTypeId
+         FROM
+             `bus_device` bd
+                 INNER JOIN  alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                                 AND al.ALARM_JUDGE_METHOD =1)
+        SELECT  *  from all_rule ar
+        where CONCAT(ar.DEVCODE,ar.alarmLevelId,ar.alarmTypeId)
+                  not in (
+                  SELECT CONCAT(ad.DEVCODE,ad.ALARM_LEVEL_ID,ad.ALARM_TYPE_ID)
+                  from alarm_rule_device ad )
+
+    </select>
+
+    <select id="getRuleList" resultType="com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO">
+        SELECT
+            bd.DEVCODE,
+            al.ALARM_LEVEL_ID AS alarmLevelId,
+            al.ALARM_THRESHOLD AS alarmThreshold,
+            ALARM_TYPE_ID AS alarmTypeId,
+            ay.ALARM_TYPE as alarmTypeName,
+            ac.ALARM_LEVEL as alarmLevelName
+        FROM
+            `bus_device` bd
+                INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID
+                AND al.ALARM_JUDGE_METHOD = 1
+                JOIN alarm_type ay ON ay.id = al.ALARM_TYPE_ID
+                JOIN alarm_level_control ac ON ac.id = al.ALARM_LEVEL_ID
+        WHERE
+            bd.DEVCODE =#{devcode}
+
+    </select>
 
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
new file mode 100644
index 0000000..31f18e2
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmRuleSpecialDTO {
+
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
+    @ApiModelProperty("报警等级id")
+    private Long alarmLevelId;
+
+    @ApiModelProperty("报警等级名称")
+    private String alarmLevelName;
+
+    @ApiModelProperty("报警类型id")
+    private Long alarmTypeId;
+
+    @ApiModelProperty("报警类型名称")
+    private String alarmTypeName;
+
+    @ApiModelProperty("报警阈值")
+    private String alarmThreshold;
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 038dc01..ab54bce 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -76,6 +76,8 @@
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
+    void updatePipeStatus(String tagNumber, String onLineStatus);
+
     boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
index 4010f80..51bc7b7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleDeviceService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRule;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 
@@ -23,4 +24,8 @@
 
     List<AlarmRuleDevice> listByCode(String devCode);
 
+    boolean syncAlarmRule();
+
+    List<AlarmRuleSpecialDTO> getRuleList(String devcode);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 2ac51dc..6c99ff9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,9 +9,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
@@ -58,7 +55,6 @@
     private final AbstractPermissionContext permissionContext;
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
-    private final AbstractDeptService abstractDeptService;
     private final AbstractDictService abstractDictService;
     private final IAlarmLevelControlService iAlarmLevelControlService;
     private final IMessageLogService iMessageLogService;
@@ -72,6 +68,7 @@
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request) {
 
+        page.setOptimizeCountSql(false);
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
         alarmRecordsList.forEach(alarmRecords -> {
@@ -79,6 +76,7 @@
             alarmRecords.setDeptName(ObjectUtil.isNotEmpty(alarmRecords.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid()) : "");
         });
         return alarmRecordsPage;
+//        return new PageResult<>(alarmRecordsPage.getRecords(), alarmRecordsPage.getTotal());
     }
 
     @Override
@@ -139,7 +137,7 @@
         AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id);
         detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否");
         detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration()));
-        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid())?commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()):"");
+        detailDTO.setDeptName(ObjectUtil.isNotEmpty(detailDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(detailDTO.getDeptid()) : "");
 //        detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber()));
         detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory()));
         return detailDTO;
@@ -429,9 +427,9 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
-                            concat(DictEnum.PROCESS_STATUS.equals(processStatus)?"现场处置完毕":"待处置"), alarmRecords.getLedgerNumber()));
+                            concat(DictEnum.PROCESS_STATUS.equals(processStatus) ? "现场处置完毕" : "待处置"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
             alarmRecords.setProcessStatus(ApprovalStatusEnum.CONFIRMED.getCode());
             alarmRecords.setProcessTime(new Date());
@@ -463,7 +461,7 @@
         List<AlarmRecordExportDTO> alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId()));
         alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> {
             alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus()));
-            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()):"");
+            alarmRecordExportDTO.setDeptName(ObjectUtil.isNotEmpty(alarmRecordExportDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid()) : "");
             alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory()));
         });
         return alarmRecordExportDTOList;
@@ -606,7 +604,7 @@
                 msg.put("alarmId", alarmIds);
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
-                msg.put("alarmTime", upTime);
+                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -689,6 +687,11 @@
         this.baseMapper.updateWellStatus(tagNumber, onLineStatus);
     }
 
+    @Override
+    public void updatePipeStatus(String tagNumber, String onLineStatus) {
+        this.baseMapper.updatePipeStatus(tagNumber, onLineStatus);
+    }
+
     /**
      * 更新离线异常
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index f59542d..4d76d6e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.alarm.dao.AlarmRuleDeviceMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmRuleSpecialDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmLevelControl;
 import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService;
@@ -12,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,8 @@
 
 
     private final IAlarmLevelControlService iAlarmLevelControlService;
+    private final AbstractPermissionContext permissionContext;
+
 
     @Override
     public Page<AlarmRuleDevice> listPage(Page<AlarmRuleDevice> page, AlarmRuleDeviceDTO request) {
@@ -46,7 +51,33 @@
 
         QueryWrapper<AlarmRuleDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
-        queryWrapper.orderByDesc( "ALARM_THRESHOLD");
+        queryWrapper.orderByDesc("ALARM_THRESHOLD");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public boolean syncAlarmRule() {
+        List<AlarmRuleSpecialDTO> alarmRuleSpecialDTOList = this.baseMapper.syncAlarmRule();
+        if (null != alarmRuleSpecialDTOList) {
+            String createName = permissionContext.getAuthService().getLoginUser().getName();
+            List<AlarmRuleDevice> alarmRuleDeviceList = new ArrayList<>();
+            for (AlarmRuleSpecialDTO alarmRuleSpecialDTO : alarmRuleSpecialDTOList) {
+                AlarmRuleDevice alarmRuleDevice = new AlarmRuleDevice();
+                alarmRuleDevice.setDevcode(alarmRuleSpecialDTO.getDevCode());
+                alarmRuleDevice.setAlarmLevelId(alarmRuleSpecialDTO.getAlarmLevelId());
+                alarmRuleDevice.setAlarmTypeId(alarmRuleSpecialDTO.getAlarmTypeId());
+                alarmRuleDevice.setAlarmThreshold(alarmRuleSpecialDTO.getAlarmThreshold());
+                alarmRuleDevice.setCreateUser(createName);
+                alarmRuleDeviceList.add(alarmRuleDevice);
+            }
+            this.saveBatch(alarmRuleDeviceList);
+        }
+        return true;
+    }
+
+    @Override
+    public List<AlarmRuleSpecialDTO> getRuleList(String devcode) {
+
+        return this.baseMapper.getRuleList(devcode);
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
index 765ae5c..37e4a9a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -79,7 +79,6 @@
     @Cacheable(value = "alarmRuleCache", key = "#devCode")
     @Override
     public List<AlarmRuleResponseDTO> getByDevCode(String devCode) {
-        //toDo:缓存取
         List<AlarmRuleResponseDTO> alarmRuleResponseDTOS = new ArrayList<>();
         List<AlarmRuleDevice> alarmRuleDeviceList = iAlarmRuleDeviceService.listByCode(devCode);
         //若不存在单个设备规则，则按照产品统一获取报警规则
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 41b78bb..e2ac858 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -46,7 +46,7 @@
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
-            alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()));
+            alarmPositionResponseDTO.setDeptName(ObjectUtil.isNotEmpty(alarmPositionResponseDTO.getDeptid())?commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid()):"");
         });
         return alarmPositionResponseDTOList;
     }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index a62fc94..619b7c9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -183,7 +183,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新监测井状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index c1c2154..6e57cc9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -215,6 +215,10 @@
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, CH4L + "," + CH4R);
 
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 728e208..da44c66 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -171,7 +171,7 @@
                     for (AlarmRuleResponseDTO alarmRuleResponseDTO : alarmRuleResponseDTOList) {
                         if (CommonUtil.isNumber(alarmRuleResponseDTO.getAlarmThreshold()) &&
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
-                            alarmFlag =true;
+                            alarmFlag = true;
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
@@ -187,7 +187,10 @@
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
                 alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas);
-
+                //7.更新管线状态 (1:正常，2：报警)
+                if (busWellDTOList != null && busWellDTOList.size() > 0) {
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index cccd7b1..aea3e88 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -58,6 +58,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-core</artifactId>
+            <version>2.0.0.alpha</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
index ec04131..399e294 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusGridController.java
@@ -1,8 +1,15 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +20,23 @@
  * @author zt
  * @since 2024-07-16
  */
+@Api(tags = "网格管理模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/busGrid")
 public class BusGridController {
 
+    private final IBusGridService iBusGridService;
+    /**
+     * 全量同步网格
+     *
+     * @return
+     */
+    @PostMapping("/synAllGrids")
+    @ResponseBody
+    public ReturnDTO<Object> synAllGrids() {
+
+        return ReturnUtil.success(iBusGridService.synAllGrids());
+    }
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index 91916f5..4eda0fb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -92,6 +92,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步部门")
     @PostMapping("/synAllDept")
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
@@ -105,6 +106,7 @@
      *
      * @return
      */
+    @ApiOperation("全量同步台账")
     @PostMapping("/synAllLedger")
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
index 70c9f44..d12dfb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/CtUserController.java
@@ -1,20 +1,44 @@
 package com.casic.missiles.modular.device.controller;
 
 
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * 同步用户表 前端控制器
  * </p>
  *
  * @author zt
  * @since 2024-11-25
  */
+@Api(tags = "用户同步模块")
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/ctUser")
 public class CtUserController {
 
+    private  final ICtUserService iCtUserService;
+    /**
+     * 全量同步账号
+     *
+     * @return
+     */
+    @ApiOperation("全量同步人员")
+    @PostMapping("/synAllUsers")
+    @ResponseBody
+    public ReturnDTO<Object> synAllUsers() {
+
+        return ReturnUtil.success(iCtUserService.synAllUsers());
+    }
+
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
index 25a203a..8f732e9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BdcRegionAreaMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@
 @Mapper
 public interface BdcRegionAreaMapper extends BaseMapper<BdcRegionArea> {
 
+
+
+    @Select("SELECT ra.*, bt.trajectory FROM `bdc_region_area` ra LEFT JOIN bdc_region_trajectory bt " +
+            "on ra.region_area_id = bt.business_id  where ra.del_flag=0 and ra.bussiness_type = 1")
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
index 47e7512..5ee5291 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java
@@ -65,4 +65,12 @@
     @Lang(InConditionDriver.class)
     @Select("SELECT max(LOGTIME) as logTime ,DEVCODE as devcode FROM `data_monitor_pipe_other` where DEVCODE in (#{devcodes}) and   LOGTIME  >=  DATE_SUB(CURDATE(), INTERVAL 7 DAY) GROUP BY DEVCODE" )
     List<CommonDataDTO> getMonitorPipeOtherData(@Param("devcodes") List<String>  devcodes);
+
+    @Select("SELECT ALARM_THRESHOLD FROM `alarm_rule_device` where DEVCODE = #{devcode}  order by ALARM_THRESHOLD asc " )
+    List<String> getSpecialDeviceRule(@Param("devcode") String devcode);
+
+    @Select(" select ar.ALARM_THRESHOLD  from alarm_rule  ar where ar.PRODUCT_ID  in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " +
+            " where bd.DEVCODE= #{devcode} and bd.VALID=1 " +
+            ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD asc")
+    List<String> getDeviceTypeRule(@Param("devcode") String devcode);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
index 0866c33..fe34aa2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusGridMapper.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.device.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
 import com.casic.missiles.modular.device.entity.BusGrid;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格管理	 Mapper 接口
@@ -15,4 +18,6 @@
 @Mapper
 public interface BusGridMapper extends BaseMapper<BusGrid> {
 
+    List<SyncUserDTO> getSyncUserDTOList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
index 687fe02..e0547bd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/CtUserMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@
 @Mapper
 public interface CtUserMapper extends BaseMapper<CtUser> {
 
+    @Select("SELECT USER_ID FROM `ct_role_user` WHERE ROLE_ID='6a050c90c1e648ee8d2034baea6856df'")
+    List<String> getCtUserGroupIds();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 60f32a3..99ef10b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -156,9 +156,9 @@
             <if test="request.endTime != null and request.endTime !='' ">
                 and  ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
             </if>
-            AND (
+            <!--AND (
             ar.`STATUS` = 0
-            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))
+            OR ( ar.`STATUS` = 1 AND ar.PROCESS_STATUS > 3 ))-->
         </where>
         ORDER BY ar.ALARM_TIME DESC
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
index 0f603c4..4788357 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusGridMapper.xml
@@ -18,5 +18,23 @@
     <sql id="Base_Column_List">
         ID, GRID_CODE, DEPTID, PRINCIPAL, TELEPHONE, PRESS_TYPE, PIPE_LENGTH, TS
     </sql>
-
+    <select id="getSyncUserDTOList" resultType="com.casic.missiles.modular.device.dto.SyncUserDTO">
+        WITH user_temp AS (
+            SELECT
+                ID,
+                ACCOUNT,
+                NAME,
+                PHONE,
+                DEPT_ID
+            FROM
+                sys_user
+            WHERE
+                DEPT_ID IN ( SELECT id FROM `sys_dept` WHERE tips = 'grid' ))
+        SELECT
+            *
+        FROM
+            ( SELECT *, ROW_NUMBER() OVER ( PARTITION BY DEPT_ID ORDER BY ID DESC ) AS rn FROM user_temp ) t
+        WHERE
+            rn = 1
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
index a716a72..aa6c790 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml
@@ -70,19 +70,15 @@
 
     <select id="pageGridList" resultType="com.casic.missiles.modular.device.entity.BusGrid">
         SELECT
-        bg.*,
-        sd.FULL_NAME as deptName
+        bg.*
         FROM
         bus_grid bg
-        LEFT JOIN sys_dept sd ON bg.DEPTID = sd.ID
         WHERE 1=1
 
         <if test="request.gridCode != null and request.gridCode !='' ">
             and bg.GRID_CODE like concat('%', #{request.gridCode}, '%')
         </if>
-        <if test="request.deptid != null and request.deptid !=''">
-            and bg.DEPTID = #{request.responsibleDept}
-        </if>
+
         <if test="request.locationState != null and request.locationState !=''">
             and bg.LOCATION_STATE = #{request.locationState}
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 7965bfc..5f8d90f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.device.dto;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -74,5 +75,11 @@
     @ApiModelProperty("左侧指示带长度")
     private String rightLength;
 
+    @ApiModelProperty("监控状态（1：正常，2：异常，3：离线，0：未监测）")
+    private String monitorState;
+
+    @ApiModelProperty("监控状态名称")
+    private String monitorStateName;
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
new file mode 100644
index 0000000..8edbe2d
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/SyncUserDTO.java
@@ -0,0 +1,25 @@
+package com.casic.missiles.modular.device.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SyncUserDTO {
+
+    @ApiModelProperty("人员id")
+    private Long id;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("人员名称")
+    private String name;
+
+    @ApiModelProperty("电话")
+    private String phone;
+
+    @ApiModelProperty("账号")
+    private String account;
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
index 14dc9b8..aef0ae4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BdcRegionArea.java
@@ -5,11 +5,13 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -100,7 +102,10 @@
     private String pressureLevel;
 
     @TableField("updt_time")
-    private LocalDateTime updtTime;
+    private Date updtTime;
 
+    @ApiModelProperty("区域点集合")
+    @TableField(exist = false)
+    private String trajectory;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index 5d1f30b..5659491 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -36,6 +36,10 @@
     @TableField("GRID_CODE")
     private String gridCode;
 
+    @ApiModelProperty("网格名称")
+    @TableField("GRID_Name")
+    private String gridName;
+
     @ApiModelProperty("管理单位")
     @TableField("DEPTID")
     private Long deptid;
@@ -68,6 +72,18 @@
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("同步id")
+    @TableField("SYNC_ID")
+    private String syncId;
+
+    @ApiModelProperty("地图坐标集合")
+    @TableField("TRAJECTORY")
+    private String trajectory;
+
+    @ApiModelProperty("是否同步1，是0，否")
+    @TableField("IS_SYNC")
+    private int isSync;
+
     @ApiModelProperty("部门名称")
     @TableField(exist = false)
     private String deptName;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
index 08a4bb6..eb4d377 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBdcRegionAreaService.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务类
@@ -13,4 +15,6 @@
  */
 public interface IBdcRegionAreaService extends IService<BdcRegionArea> {
 
+    List<BdcRegionArea> getBdcRegionAreaList();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 4ea13f2..65fb3ab 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -48,4 +48,6 @@
 
     String getBfcf(String devcode);
 
+    List<String> getDeviceRule(String devcode);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
index 1d16e8d..a65debb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusGridService.java
@@ -12,5 +12,5 @@
  * @since 2024-07-16
  */
 public interface IBusGridService extends IService<BusGrid> {
-
+    boolean synAllGrids();
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
index ec973f5..d6f42b2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java
@@ -40,4 +40,6 @@
     boolean synAllDept();
 
     boolean synAllLedger();
+
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
index f681c35..acd3cb4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/ICtUserService.java
@@ -13,4 +13,6 @@
  */
 public interface ICtUserService extends IService<CtUser> {
 
+    boolean synAllUsers();
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
index fa513fb..0815a30 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BdcRegionAreaServiceImpl.java
@@ -1,11 +1,14 @@
 package com.casic.missiles.modular.device.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.device.dao.BdcRegionAreaMapper;
 import com.casic.missiles.modular.device.entity.BdcRegionArea;
 import com.casic.missiles.modular.device.service.IBdcRegionAreaService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务实现类
@@ -17,4 +20,8 @@
 @Service
 public class BdcRegionAreaServiceImpl extends ServiceImpl<BdcRegionAreaMapper, BdcRegionArea> implements IBdcRegionAreaService {
 
+    @Override
+    public List<BdcRegionArea> getBdcRegionAreaList() {
+        return this.baseMapper.getBdcRegionAreaList();
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index a2e45de..610fdf6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -489,4 +489,15 @@
         }
         return true;
     }
+
+
+    @Cacheable(value = "alarmRuleCache", key = "#devcode")
+    @Override
+    public List<String> getDeviceRule(String devcode) {
+        List<String> alarmRuleValueList = this.baseMapper.getSpecialDeviceRule(devcode);
+        if(alarmRuleValueList==null||alarmRuleValueList.size()<1){
+            alarmRuleValueList=this.baseMapper.getDeviceTypeRule(devcode);
+        }
+        return alarmRuleValueList;
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java
index 7ca3100..b230a73 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusGridServiceImpl.java
@@ -1,11 +1,24 @@
 package com.casic.missiles.modular.device.service.impl;
 
-import com.casic.missiles.modular.device.dao.BusGridMapper;
-import com.casic.missiles.modular.device.service.IBusGridService;
-import com.casic.missiles.modular.device.entity.BusGrid;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDeptService;
+import com.casic.missiles.modular.device.dao.BusGridMapper;
+import com.casic.missiles.modular.device.dto.SyncUserDTO;
+import com.casic.missiles.modular.device.entity.BdcRegionArea;
+import com.casic.missiles.modular.device.entity.BusGrid;
+import com.casic.missiles.modular.device.service.IBdcRegionAreaService;
+import com.casic.missiles.modular.device.service.IBusGridService;
+import com.casic.missiles.modular.system.model.Dept;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * <p>
  * 网格管理	 服务实现类
@@ -14,7 +27,60 @@
  * @author zt
  * @since 2024-07-16
  */
+@RequiredArgsConstructor
 @Service
 public class BusGridServiceImpl extends ServiceImpl<BusGridMapper, BusGrid> implements IBusGridService {
 
+    private final IBdcRegionAreaService iBdcRegionAreaService;
+    private final AbstractDeptService abstractDeptService;
+
+    @Override
+    public boolean synAllGrids() {
+        List<BdcRegionArea> bdcRegionAreaList = iBdcRegionAreaService.getBdcRegionAreaList();
+        List<Dept> deptList = abstractDeptService.getListByTips("");
+        List<SyncUserDTO> syncUserDTOList = this.baseMapper.getSyncUserDTOList();
+        List<BusGrid> busGrids = this.list();
+        List<BusGrid> busGridList = new ArrayList<>();
+        for (BdcRegionArea bdcRegionArea : bdcRegionAreaList) {
+            BusGrid busGrid = new BusGrid();
+
+            Optional<BusGrid> firstBusGrid = busGrids.stream().filter(busGrid1 -> Objects.equals(busGrid1.getSyncId(), bdcRegionArea.getRegionAreaId())).findFirst();
+            BusGrid busGridOld = null;
+            if (firstBusGrid.isPresent()) {
+                busGridOld = firstBusGrid.get();
+                busGrid.setId(busGridOld.getId());
+            }
+            busGrid.setGridCode(bdcRegionArea.getRegionCode());
+            busGrid.setPressType(bdcRegionArea.getPressureLevel());
+            busGrid.setIsSync(1);
+            busGrid.setSyncId(bdcRegionArea.getRegionAreaId());
+            busGrid.setGridName(bdcRegionArea.getRegionName());
+            busGrid.setPipeLength(bdcRegionArea.getPipelineLength());
+            busGrid.setTrajectory(bdcRegionArea.getTrajectory());
+            if (ObjectUtil.isNotEmpty(bdcRegionArea.getRegionCode())) {
+                for (Dept dept : deptList) {
+                    if (ObjectUtil.equals(bdcRegionArea.getRegionCode(), dept.getTenantId())) {
+                        busGrid.setDeptid(dept.getId());
+                        Optional<SyncUserDTO> syncUserDTO = syncUserDTOList.stream().filter(syncUserDTO1 -> Objects.equals(syncUserDTO1.getDeptId(), dept.getId())).findFirst();
+                        if (syncUserDTO.isPresent()) {
+                            busGrid.setPrincipal(syncUserDTO.get().getName());
+                            busGrid.setTelephone(syncUserDTO.get().getPhone());
+                        }
+                        break;
+                    }
+                }
+            }
+            if (ObjectUtil.isNotEmpty(bdcRegionArea.getTrajectory()))
+                busGrid.setLocationState("1");
+
+            if (busGridOld != null
+                    && StrUtil.equals(busGridOld.getGridCode(), busGrid.getGridCode()) && StrUtil.equals(busGridOld.getGridName(), busGrid.getGridName())
+                    && StrUtil.equals(busGridOld.getPressType(), busGrid.getPressType()) && StrUtil.equals(busGridOld.getPipeLength(), busGrid.getPipeLength())
+                    && StrUtil.equals(busGridOld.getPrincipal(), busGrid.getPrincipal()) && StrUtil.equals(busGridOld.getTelephone(), busGrid.getTelephone())
+                    && StrUtil.equals(busGridOld.getTrajectory(), busGrid.getTrajectory()) && ObjectUtil.equals(busGridOld.getDeptid(), busGrid.getDeptid()))
+                continue;
+            busGridList.add(busGrid);
+        }
+        return this.saveOrUpdateBatch(busGridList);
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
index f0ba160..6c7173b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
@@ -1,14 +1,11 @@
 package com.casic.missiles.modular.device.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.datascope.ScopeEnums;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.enums.DeviceDataEnum;
@@ -19,15 +16,18 @@
 import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
 import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
 import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusDeviceService;
 import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
 import com.casic.missiles.server.CommonServer;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -45,6 +45,9 @@
     private final AbstractDictService abstractDictService;
     private final BusDeviceMapper busDeviceMapper;
     private final CommonServer commonServer;
+    @Lazy
+    @Autowired
+    private  IBusDeviceService iBusDeviceService;
 
     @Override
     public Page<BusLedgerPipe> listPage(Page<BusLedgerPipe> page, BusLedgerPipeRequestDTO request) {
@@ -74,7 +77,7 @@
         Page<BusLedgerPipe> pageList = this.baseMapper.monitorPipePageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<BusLedgerPipe> busLedgerList = pageList.getRecords();
         busLedgerList.forEach(busLedger -> {
-            busLedger.setOnState(abstractDictService.getDictNameByCode("onState", busLedger.getOnState())); // 使用状态字典值
+            busLedger.setOnState("1".equals(busLedger.getOnState())?"在用":"备用"); // 在用状态字典值
             busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); // 管理单位名称
             busLedger.setPressType(abstractDictService.getDictNameByCode("wellType", busLedger.getPressType())); // 位置状态字典值
             busLedger.setMonitorState(abstractDictService.getDictNameByCode("monitorState", busLedger.getMonitorState())); // 监控状态字典值
@@ -91,6 +94,7 @@
             busLedgerPipeResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(busLedgerPipeResponseDTO.getDeptid())); // 管理单位名称
             busLedgerPipeResponseDTO.setPressType(abstractDictService.getDictNameByCode("wellType", busLedgerPipeResponseDTO.getPressType())); // 位置状态字典值
             busLedgerPipeResponseDTO.setManageType(abstractDictService.getDictNameByCode("manageType", busLedgerPipeResponseDTO.getManageType())); // 位置状态字典值
+            busLedgerPipeResponseDTO.setMonitorStateName(abstractDictService.getDictNameByCode("monitorState", busLedgerPipeResponseDTO.getMonitorState())); // 监控状态字典值
         }
         return busLedgerPipeResponseDTO;
     }
@@ -109,6 +113,11 @@
                     queryColumns[2],
                     deviceDataEnum.getOrderColumn(),
                     request);
+
+            //加入阈值，用于判断设备状态
+            Map<String, Object> objectMap = new HashMap<>();
+            objectMap.put("alarmRuleValue", iBusDeviceService.getDeviceRule(request.getDevcode()));
+            resultMap.add(objectMap);
         }
         return resultMap;
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java
index d3a9dbf..c98ec10 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java
@@ -1,12 +1,12 @@
 package com.casic.missiles.modular.device.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.modular.device.dao.BusLedgerMapper;
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
@@ -20,14 +20,12 @@
 import com.casic.missiles.modular.device.service.IEqEquipRqService;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.server.CommonServer;
+import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -48,6 +46,7 @@
     private final ICtOrganizationService iCtOrganizationService;
     private final IEqEquipRqService iEqEquipRqService;
 
+
     public Page<BusLedger> pageList(Page<BusLedger> page, BusLedgerDTO request) {
         Page<BusLedger> pageList = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptid()));
         List<BusLedger> busLedgerList = pageList.getRecords();
@@ -61,11 +60,27 @@
         return pageList;
     }
 
+    //压力级制 0低压 1中压A 2中压B 3次高压A 4次高压B 5高压A 6高压B
+    public static String[] pressureLevelArr={"低压","中压A","中压B","次高压A","次高压B","高压A","高压B"};
     public Page<BusGrid> pageGridList(Page<BusGrid> page, BusLedgerDTO request) {
         Page<BusGrid> pageGridList = this.baseMapper.pageGridList(page, request, commonServer.getDeptScopeIds(request.getDeptid()));
         List<BusGrid> busGridList = pageGridList.getRecords();
         busGridList.forEach(busGrid -> {
             busGrid.setLocationStateName(abstractDictService.getDictNameByCode("locationState", busGrid.getLocationState()));
+            busGrid.setDeptName(ObjectUtil.isNotEmpty(busGrid.getDeptid())?commonServer.getDeptNamesByDeptId(busGrid.getDeptid()):"");
+            String pressType = busGrid.getPressType();
+            if(ObjectUtil.isNotEmpty(pressType)){
+                String[] pressTypeArr= pressType.split(",");
+                String pressTypes="";
+                for(String str:pressTypeArr){
+                    if(CommonUtil.isNumber(str)&&Integer.valueOf(str)<7){
+                        pressTypes+=pressureLevelArr[Integer.valueOf(str)]+",";
+                    }else {
+                        pressTypes+=str+",";
+                    }
+                }
+                busGrid.setPressType(ObjectUtil.isNotEmpty(pressTypes)?pressTypes.substring(0,pressTypes.length()-1):"");
+            }
         });
         return pageGridList;
     }
@@ -147,34 +162,35 @@
         List<CtOrganization> ctOrganizationList = iCtOrganizationService.getCtOrganizationList();
         //获取闸井系统已存在的部门
         List<Dept> deptList = abstractDeptService.getListByTips("");
-        deptList = deptList.stream().filter(object -> ObjectUtil.isNotEmpty(object.getSyncId())).collect(Collectors.toList());
-        List<String> synIds = deptList.stream().map(Dept::getSyncId).collect(Collectors.toList());
-
         for (CtOrganization ctOrganization : ctOrganizationList) {
-            if (!synIds.contains(ctOrganization.getOrgId())) {
-                Dept dept1 = new Dept();
-                dept1.setDelFlag("0");
-                dept1.setPid(getPid(ctOrganization, deptList));
-                dept1.setNum(99);
-                dept1.setSimpleName(ctOrganization.getOrgName());
-                dept1.setFullName(ctOrganization.getOrgName());
-                dept1.setTips(getTips(ctOrganization.getOrgType() + ""));
-                dept1.setSyncId(ctOrganization.getOrgId());
-                dept1.setSyncPid(ctOrganization.getParentId());
-                dept1.setTenantId(ctOrganization.getOrgCode());
-                dept1.setIsSync(1);
-                dept1.setIsParent(DictEnum.SYNC_GRID.equals(ctOrganization.getOrgType() + "") ? "1" : "0");
-                dept1.setDeptType(DictEnum.SYNC_COMPANY.equals(ctOrganization.getOrgType() + "") ? "03" : "04");
-                dept1.setPids(getPids(ctOrganization, deptList));
-                dept1.setCreateTime(new Date());
-                abstractDeptService.saveOrUpdate(dept1);
-                deptList.add(dept1);
-                deptList = deptList.stream().filter(object -> ObjectUtil.isNotEmpty(object.getSyncId())).collect(Collectors.toList());
-                synIds = deptList.stream().map(Dept::getSyncId).collect(Collectors.toList());
+            Dept dept1 = new Dept();
+            Optional<Dept> firstDept = deptList.stream().filter(dept -> Objects.equals(dept.getSyncId(), ctOrganization.getOrgId())).findFirst();
+            Dept deptOld = null;
+            if (firstDept.isPresent()) {
+                deptOld = firstDept.get();
+                dept1.setId(deptOld.getId());
             }
-
+            dept1.setDelFlag("0");
+            dept1.setPid(getPid(ctOrganization, deptList));
+            dept1.setNum(99);
+            dept1.setSimpleName(ctOrganization.getOrgName());
+            dept1.setFullName(ctOrganization.getOrgName());
+            dept1.setTips(getTips(ctOrganization.getOrgType() + ""));
+            dept1.setSyncId(ctOrganization.getOrgId());
+            dept1.setSyncPid(ctOrganization.getParentId());
+            dept1.setTenantId(ctOrganization.getOrgCode());
+            dept1.setIsSync(1);
+            dept1.setIsParent(DictEnum.SYNC_GRID.equals(ctOrganization.getOrgType() + "") ? "1" : "0");
+            dept1.setDeptType(DictEnum.SYNC_COMPANY.equals(ctOrganization.getOrgType() + "") ? "03" : "04");
+            dept1.setPids(getPids(ctOrganization, deptList));
+            dept1.setCreateTime(new Date());
+            if (deptOld != null && StrUtil.equals(deptOld.getFullName(), dept1.getFullName()) && ObjectUtil.equals(deptOld.getPid(), dept1.getPid())
+                    && StrUtil.equals(deptOld.getSyncId(), dept1.getSyncId()) && StrUtil.equals(deptOld.getSyncPid(), dept1.getSyncPid())
+                    && StrUtil.equals(deptOld.getPids(), dept1.getPids()) && StrUtil.equals(deptOld.getDeptType(), dept1.getDeptType()))
+                continue;
+            abstractDeptService.saveOrUpdate(dept1);
+            deptList.add(dept1);
         }
-
         return true;
     }
 
@@ -184,7 +200,7 @@
             return "[0],[24]";
         } else {
             for (Dept dept : deptList) {
-                if (dept.getSyncId().equals(ctOrganization.getParentId())) {
+                if (dept.getSyncId() != null && dept.getSyncId().equals(ctOrganization.getParentId())) {
                     return dept.getPids().concat(",[").concat(dept.getId() + "").concat("]");
                 }
             }
@@ -220,7 +236,7 @@
             return 24L;
         }
         for (Dept dept : deptList) {
-            if (dept.getSyncId().equals(ctOrganization.getParentId())) {
+            if (dept.getSyncId() != null && dept.getSyncId().equals(ctOrganization.getParentId())) {
                 return dept.getId();
             }
         }
@@ -228,49 +244,63 @@
     }
 
 
-    public List<String> manageTypeList = Arrays.asList("1","201","202");
+    public List<String> manageTypeList = Arrays.asList("1", "201", "202");
+
     @Transactional
     @Override
     public boolean synAllLedger() {
         QueryWrapper<BusLedger> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("valid", "1");
         List<BusLedger> busLedgerList = this.baseMapper.selectList(queryWrapper);
-        List<String> ledgerCodeList = busLedgerList.stream().map(BusLedger::getLedgerCode).collect(Collectors.toList());
         List<SyncTagDTO> wellList = iEqEquipRqService.getWellList();
+        wellList = wellList.stream().filter(CommonUtil.distinctByProperty(SyncTagDTO::getLedgerCode)).collect(Collectors.toList());
         List<Dept> deptList = abstractDeptService.getListByTips("");
         List<BusLedger> busLedgers = new ArrayList<>();
         for (SyncTagDTO syncTagDTO : wellList) {
-            if (!ledgerCodeList.contains(syncTagDTO.getLedgerCode())) {
-                BusLedger busLedger = new BusLedger();
-                busLedger.setLedgerCode(syncTagDTO.getLedgerCode());
-                busLedger.setLedgerName(syncTagDTO.getLedgerName());
-                busLedger.setTagNumber(syncTagDTO.getTagNumber());
-                busLedger.setLatGaode(syncTagDTO.getLatGaode());
-                busLedger.setLngGaode(syncTagDTO.getLngGaode());
-                busLedger.setPosition(syncTagDTO.getPosition());
-                if (ObjectUtil.isNotEmpty(syncTagDTO.getOrgCode())) {
-                    for (Dept dept : deptList) {
-                        if (syncTagDTO.getOrgCode().equals(dept.getTenantId())) {
-                            busLedger.setDeptid(dept.getId());
-                            break;
-                        }
+            BusLedger busLedger = new BusLedger();
+            Optional<BusLedger> firstBusLedger = busLedgerList.stream().filter(busLedger1 -> Objects.equals(busLedger1.getLedgerCode(), syncTagDTO.getLedgerCode())).findFirst();
+            BusLedger busLedgerOld = null;
+            if (firstBusLedger.isPresent()) {
+                busLedgerOld = firstBusLedger.get();
+                busLedger.setId(busLedgerOld.getId());
+            }
+//            if (!ledgerCodeList.contains(syncTagDTO.getLedgerCode())) {
+            busLedger.setLedgerCode(syncTagDTO.getLedgerCode());
+            busLedger.setLedgerName(syncTagDTO.getLedgerName());
+            busLedger.setTagNumber(syncTagDTO.getTagNumber());
+            busLedger.setLatGaode(syncTagDTO.getLatGaode());
+            busLedger.setLngGaode(syncTagDTO.getLngGaode());
+            busLedger.setPosition(syncTagDTO.getPosition());
+            if (ObjectUtil.isNotEmpty(syncTagDTO.getOrgCode())) {
+                for (Dept dept : deptList) {
+                    if (syncTagDTO.getOrgCode().equals(dept.getTenantId())) {
+                        busLedger.setDeptid(dept.getId());
+                        break;
                     }
                 }
-                busLedger.setManageType(manageTypeList.contains(syncTagDTO.getManageType())?"1":"0");
-                busLedger.setOnState(DictEnum.IS_USED.equals(syncTagDTO.getOnState()) ? DictEnum.IS_USED : "0");
-                busLedger.setLocationState("1");
-                busLedger.setWellType("3");
-                busLedger.setTargetId(syncTagDTO.getTargetId());
-                busLedger.setTargetCode(syncTagDTO.getOrgCode());
-                busLedger.setPropertyOwner(syncTagDTO.getPropertyOwner());
-                busLedger.setPropertyPerson(syncTagDTO.getPropertyPerson());
-                busLedger.setPropertyPhone(syncTagDTO.getPropertyPhone());
-                busLedger.setOpenDate(syncTagDTO.getOpenDate());
-                busLedger.setArea(syncTagDTO.getArea());
-                busLedger.setType("1");
-                busLedgers.add(busLedger);
             }
+            busLedger.setManageType(manageTypeList.contains(syncTagDTO.getManageType()) ? "1" : "0");
+            busLedger.setOnState(DictEnum.IS_USED.equals(syncTagDTO.getOnState()) ? DictEnum.IS_USED : "0");
+            busLedger.setLocationState("1");
+            busLedger.setWellType("3");
+            busLedger.setTargetId(syncTagDTO.getTargetId());
+            busLedger.setTargetCode(syncTagDTO.getOrgCode());
+            busLedger.setPropertyOwner(syncTagDTO.getPropertyOwner());
+            busLedger.setPropertyPerson(syncTagDTO.getPropertyPerson());
+            busLedger.setPropertyPhone(syncTagDTO.getPropertyPhone());
+            busLedger.setOpenDate(syncTagDTO.getOpenDate());
+            busLedger.setArea(syncTagDTO.getArea());
+            busLedger.setType("1");
+            if (busLedgerOld != null && StrUtil.equals(busLedgerOld.getLedgerCode(), busLedger.getLedgerCode()) && StrUtil.equals(busLedgerOld.getLedgerName(), busLedger.getLedgerName())
+                    && StrUtil.equals(busLedgerOld.getTagNumber(), busLedger.getTagNumber()) && StrUtil.equals(busLedgerOld.getLatGaode(), busLedger.getLatGaode())
+                    && StrUtil.equals(busLedgerOld.getLngGaode(), busLedger.getLngGaode()) && StrUtil.equals(busLedgerOld.getPosition(), busLedger.getPosition())
+                    && StrUtil.equals(busLedgerOld.getTargetId(), busLedger.getTargetId()) && StrUtil.equals(busLedgerOld.getTargetCode(), busLedger.getTargetCode()))
+                continue;
+            busLedgers.add(busLedger);
         }
-        return this.saveBatch(busLedgers);
+//        }
+        return this.saveOrUpdateBatch(busLedgers);
     }
+
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/CtUserServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/CtUserServiceImpl.java
index 394011d..b54e8dd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/CtUserServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/CtUserServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.modular.device.service.impl;
 
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDeptService;
+import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.modular.device.dao.CtUserMapper;
 import com.casic.missiles.modular.device.entity.CtUser;
 import com.casic.missiles.modular.device.service.ICtUserService;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.modular.system.model.Role;
+import com.casic.missiles.modular.system.model.User;
+import com.casic.missiles.modular.system.service.IRoleService;
+import com.casic.missiles.modular.system.service.IUserService;
+import com.casic.missiles.server.CommonServer;
+import com.casic.missiles.util.CommonUtil;
+import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -14,7 +37,122 @@
  * @author zt
  * @since 2024-11-25
  */
+@RequiredArgsConstructor
 @Service
 public class CtUserServiceImpl extends ServiceImpl<CtUserMapper, CtUser> implements ICtUserService {
 
+
+    private final AbstractDeptService abstractDeptService;
+    private final IRoleService iRoleService;
+    private final IUserService userService;
+    private final CommonServer commonServer;
+    private static final Logger logger = LoggerFactory.getLogger(CtUserServiceImpl.class);
+
+    @Transactional
+    @Override
+    public boolean synAllUsers() {
+
+        QueryWrapper<CtUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("STATE", 1);
+        queryWrapper.eq("DEL_FLAG", 0);
+        queryWrapper.isNotNull("ORG_ID");
+        List<CtUser> ctUserList = this.baseMapper.selectList(queryWrapper);
+        ctUserList = ctUserList.stream().filter(CommonUtil.distinctByProperty(CtUser::getUserCode)).collect(Collectors.toList());
+        List<Dept> deptList = abstractDeptService.getListByTips("");
+        QueryWrapper<User> userQueryWrapper = new QueryWrapper<>();
+        List<User> userSynList = userService.list(userQueryWrapper);
+        //找出班组长人员
+        List<String> ctUserIds = this.baseMapper.getCtUserGroupIds();
+        List<User> userList = new ArrayList<>();
+        Map<Long, Long> roleIdCache = new HashMap();
+        for (CtUser ctUser : ctUserList) {
+            User user = new User();
+            Optional<User> firstUser = userSynList.stream().filter(user1 -> Objects.equals(user1.getAccount(), ctUser.getUserCode())).findFirst();
+            User userOld = null;
+            if (firstUser.isPresent()) {
+                userOld = firstUser.get();
+                user.setId(userOld.getId());
+            }
+            user.setAccount(ctUser.getUserCode());
+            user.setName(ctUser.getUserName());
+            user.setSex(1);
+            user.setEmail(ctUser.getEmail());
+            user.setPhone(ctUser.getPhone());
+            user.setSyncDeptid(ctUser.getOrgId());
+            Optional<Dept> firstDept = deptList.stream().filter(dept -> Objects.equals(dept.getSyncId(), ctUser.getOrgId())).findFirst();
+            String deptName = "";
+            Long roleDeptId = null;
+            if (firstDept.isPresent()) {
+                user.setDeptId(firstDept.get().getId());
+                roleDeptId = firstDept.get().getId();
+                if ("group".equals(firstDept.get().getTips())) {
+                    roleDeptId = firstDept.get().getPid();
+                } else if ("grid".equals(firstDept.get().getTips())) {
+                    String pids = firstDept.get().getPids();
+                    String[] pidsArr = pids.split(",");
+                    if (pidsArr.length > 4) {
+                        roleDeptId = Long.valueOf(pidsArr[3].substring(1, pidsArr[3].length() - 1));
+                    }
+                }
+            }
+            if (ObjectUtil.isEmpty(roleDeptId)) {
+                logger.error("同步用户，组织机构未找到,用户为：" + user.getName() + ",组织机构为：" + ctUser.getOrgId());
+                continue;
+            }
+            deptName = commonServer.getDeptNamesByDeptId(roleDeptId);
+            if (!roleIdCache.containsKey(roleDeptId)) {
+                Role role = this.getDeptRole(roleDeptId, deptName, true, true);
+                roleIdCache.put(roleDeptId, role.getId());
+            }
+
+            if (ctUserIds.contains(ctUser.getUserId())) {
+                user.setAttr1("monitor");
+            }
+            user.setRoleId(String.valueOf(roleIdCache.get(roleDeptId)));
+            user.setStatus("1");
+            user.setSyncId(ctUser.getUserId());
+            user.setSyncName(ctUser.getUserName());
+            user.setSyncPwd(ctUser.getUserPass());
+            user.setSyncDeptid(ctUser.getOrgId());
+            user.setIsSync(1);
+            user.setCreateUser(1L);
+            user.setDelFlag("0");
+            user.setSalt(ShiroKit.getRandomSalt(5));
+            user.setPassword(ShiroKit.md5("111111", user.getSalt()));
+            if (userOld != null && ObjectUtil.equals(userOld.getId(), user.getId()) && ObjectUtil.equals(userOld.getDeptId(), user.getDeptId()) &&
+                    StrUtil.equals(userOld.getName(), user.getName()) && userOld.getAccount().equals(user.getAccount()) &&
+                    StrUtil.equals(userOld.getSyncId(), user.getSyncId()) && StrUtil.equals(userOld.getSyncDeptid(), user.getSyncDeptid()))
+                continue;
+            userList.add(user);
+        }
+        return userService.saveOrUpdateBatch(userList);
+    }
+
+
+    public Role getDeptRole(Long deptId, String deptName, boolean isDefault, boolean defaultCreate) {
+        QueryWrapper<Role> entityWrapper = new QueryWrapper();
+        entityWrapper.eq("dept_id", deptId);
+        if (ObjectUtil.isEmpty(isDefault)) {
+            entityWrapper.eq("IS_DEFAULT", 1);
+        }
+
+        List<Role> roles = iRoleService.list(entityWrapper);
+        if (ObjectUtil.isEmpty(roles)) {
+            Role role = new Role();
+            role.setId(IdUtil.getSnowflake(1, 1).nextId());
+            role.setNum(99);
+            role.setPid(1L);
+            role.setName(deptName.concat("普通角色"));
+            role.setDeptId(deptId);
+            role.setDataScope(String.valueOf(deptId));
+            role.setDataScopeType("2");
+            role.setTips("member");
+            role.setIsDefault(1);
+//            role.setCreateTime(new Date());
+            iRoleService.saveOrUpdate(role);
+            return role;
+        } else {
+            return roles.get(0);
+        }
+    }
 }
diff --git a/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java b/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java
index 57f41c3..2a070c9 100644
--- a/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java
+++ b/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java
@@ -4,6 +4,9 @@
 
 import java.text.SimpleDateFormat;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.function.Predicate;
 
 public class CommonUtil {
     public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -28,4 +31,10 @@
         return ObjectUtil.isNotNull(objMap.get(name)) ? objMap.get(name).toString() : "";
 
     }
+
+    public static <T> Predicate<T> distinctByProperty(Function<? super T, Object> keyExtractor) {
+        Map<Object, Boolean> map = new ConcurrentHashMap<>();
+        return t -> map.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null;
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CodeGenerator.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CodeGenerator.java
index 1abcd55..ce8992b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CodeGenerator.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CodeGenerator.java
@@ -65,7 +65,7 @@
 
                 //策略配置
                 .strategyConfig(builder -> {
-                    builder.addInclude("sys_operation_log") // 设置需要生成的表名
+                    builder.addInclude("sys_role") // 设置需要生成的表名
                             .addTablePrefix() // 设置过滤表前缀
                             .entityBuilder() //实体类配置
                             .enableLombok() //使用lombok
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 395de41..ffe4cdf 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -4,15 +4,15 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_iot_platform?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
-    username: root
-    password: Casic203
-#    url: jdbc:mysql://172.27.34.168:3316/casic_iot_platform?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
-#    username: bjwxduser
-#    password: hpQEn5my9md#U
+#    url: jdbc:mysql://111.198.10.15:11336/casic_iot_platform?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
+#    username: root
+#    password: Casic203
+    url: jdbc:mysql://172.27.34.168:3316/casic_iot_platform?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
+    username: bjwxduser
+    password: hpQEn5my9md#U
   jms:
     pub-sub-domain: true
-# session:
+# session:b
 #   store-type: redis
   redis:
     host: 111.198.10.15
@@ -22,12 +22,12 @@
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
 casic:
   #kaptcha-open: false #是否开启登录时验证码 (true/false)
-  no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/v2/api-docs,/v2/api-docs-ext,/doc.html,/v2/api-docs/swagger-ui.html,/swagger-resources,/webjars/**,/device/receiveData,/alarmReturn,/getMap
+  no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/v2/api-docs,/v2/api-docs-ext,/doc.html,/v2/api-docs/swagger-ui.html,/swagger-resources,/webjars/**,/device/receiveData,/alarmReturn,/getMap,/system/busGrid/synAllGrids,/system/busLedger/synAllLedger,/system/busLedger/synAllDept,/system/ctUser/synAllUsers
   #flowable数据源和多数据源配置
   db:
     init:
       enable: false
-  brAppUrl: http://10.30.7.26:20110/monitorDataReceive/alarmPush
+  brAppUrl: http://10.30.7.26:20115/monitorDataReceive/alarmPush
 
 smartcity:
   config: