diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 30c9a38..08aec6b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -22,6 +22,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -279,7 +280,8 @@
                     page.setSearchCount(!alarmJobService.checkJobStatus(jobListParam.getJobStatus()));
                 }
             }
-            retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
+            Long deptId = ObjectUtils.isEmpty(jobListParam.getDeptId()) ? currentUser.getDeptId():jobListParam.getDeptId();
+            retList = alarmJobService.jobListSearchApp(page, jobListParam,deptId, currentUser.getId(), leaderId);
         }
         retList.forEach(this::alarmJobWrapper);
         page.setRecords(retList);
@@ -508,7 +510,7 @@
     public Object jobInfo(@RequestParam(value = "id", required = true) Long id) {
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>>  retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
+        List<Map<String, Object>> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
         retList.forEach(this::alarmJobWrapper);
         return ResponseData.success(retList);
     }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 30c9a38..08aec6b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -22,6 +22,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -279,7 +280,8 @@
                     page.setSearchCount(!alarmJobService.checkJobStatus(jobListParam.getJobStatus()));
                 }
             }
-            retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
+            Long deptId = ObjectUtils.isEmpty(jobListParam.getDeptId()) ? currentUser.getDeptId():jobListParam.getDeptId();
+            retList = alarmJobService.jobListSearchApp(page, jobListParam,deptId, currentUser.getId(), leaderId);
         }
         retList.forEach(this::alarmJobWrapper);
         page.setRecords(retList);
@@ -508,7 +510,7 @@
     public Object jobInfo(@RequestParam(value = "id", required = true) Long id) {
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>>  retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
+        List<Map<String, Object>> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
         retList.forEach(this::alarmJobWrapper);
         return ResponseData.success(retList);
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java
index c83bff8..a9544aa 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java
@@ -17,6 +17,7 @@
      * 风险等级
      */
     private String alarmLevel;
+    private Long deptId;
     private String alarmContent;
     private String jobStatus;
     private String beginTime;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 30c9a38..08aec6b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -22,6 +22,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -279,7 +280,8 @@
                     page.setSearchCount(!alarmJobService.checkJobStatus(jobListParam.getJobStatus()));
                 }
             }
-            retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
+            Long deptId = ObjectUtils.isEmpty(jobListParam.getDeptId()) ? currentUser.getDeptId():jobListParam.getDeptId();
+            retList = alarmJobService.jobListSearchApp(page, jobListParam,deptId, currentUser.getId(), leaderId);
         }
         retList.forEach(this::alarmJobWrapper);
         page.setRecords(retList);
@@ -508,7 +510,7 @@
     public Object jobInfo(@RequestParam(value = "id", required = true) Long id) {
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>>  retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
+        List<Map<String, Object>> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
         retList.forEach(this::alarmJobWrapper);
         return ResponseData.success(retList);
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java
index c83bff8..a9544aa 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java
@@ -17,6 +17,7 @@
      * 风险等级
      */
     private String alarmLevel;
+    private Long deptId;
     private String alarmContent;
     private String jobStatus;
     private String beginTime;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index aeca8cd..e17b700 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -889,6 +889,9 @@
             <if test="alarmLevel!='' and alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{alarmLevel}
             </if>
+            <if test="deptId!='' and deptId!=null">
+                AND bwi.deptid = #{deptId}
+            </if>
             <if test="alarmContent!='' and alarmContent!=null">
                 AND ar.ALARM_CONTENT = #{alarmContent}
             </if>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 30c9a38..08aec6b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -22,6 +22,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -279,7 +280,8 @@
                     page.setSearchCount(!alarmJobService.checkJobStatus(jobListParam.getJobStatus()));
                 }
             }
-            retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
+            Long deptId = ObjectUtils.isEmpty(jobListParam.getDeptId()) ? currentUser.getDeptId():jobListParam.getDeptId();
+            retList = alarmJobService.jobListSearchApp(page, jobListParam,deptId, currentUser.getId(), leaderId);
         }
         retList.forEach(this::alarmJobWrapper);
         page.setRecords(retList);
@@ -508,7 +510,7 @@
     public Object jobInfo(@RequestParam(value = "id", required = true) Long id) {
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>>  retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
+        List<Map<String, Object>> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
         retList.forEach(this::alarmJobWrapper);
         return ResponseData.success(retList);
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java
index c83bff8..a9544aa 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java
@@ -17,6 +17,7 @@
      * 风险等级
      */
     private String alarmLevel;
+    private Long deptId;
     private String alarmContent;
     private String jobStatus;
     private String beginTime;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index aeca8cd..e17b700 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -889,6 +889,9 @@
             <if test="alarmLevel!='' and alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{alarmLevel}
             </if>
+            <if test="deptId!='' and deptId!=null">
+                AND bwi.deptid = #{deptId}
+            </if>
             <if test="alarmContent!='' and alarmContent!=null">
                 AND ar.ALARM_CONTENT = #{alarmContent}
             </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/LiquidController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/LiquidController.java
index 5936186..cbabeea 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/LiquidController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/LiquidController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.dict.BusConfigDict;
 import com.casic.missiles.modular.system.dto.BusConfigDTO;
 import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
+import com.casic.missiles.modular.system.dto.LiquidBusConfigDTO;
 import com.casic.missiles.modular.system.service.IBusConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 30c9a38..08aec6b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -22,6 +22,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -279,7 +280,8 @@
                     page.setSearchCount(!alarmJobService.checkJobStatus(jobListParam.getJobStatus()));
                 }
             }
-            retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
+            Long deptId = ObjectUtils.isEmpty(jobListParam.getDeptId()) ? currentUser.getDeptId():jobListParam.getDeptId();
+            retList = alarmJobService.jobListSearchApp(page, jobListParam,deptId, currentUser.getId(), leaderId);
         }
         retList.forEach(this::alarmJobWrapper);
         page.setRecords(retList);
@@ -508,7 +510,7 @@
     public Object jobInfo(@RequestParam(value = "id", required = true) Long id) {
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>>  retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
+        List<Map<String, Object>> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
         retList.forEach(this::alarmJobWrapper);
         return ResponseData.success(retList);
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java
index c83bff8..a9544aa 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java
@@ -17,6 +17,7 @@
      * 风险等级
      */
     private String alarmLevel;
+    private Long deptId;
     private String alarmContent;
     private String jobStatus;
     private String beginTime;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index aeca8cd..e17b700 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -889,6 +889,9 @@
             <if test="alarmLevel!='' and alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{alarmLevel}
             </if>
+            <if test="deptId!='' and deptId!=null">
+                AND bwi.deptid = #{deptId}
+            </if>
             <if test="alarmContent!='' and alarmContent!=null">
                 AND ar.ALARM_CONTENT = #{alarmContent}
             </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/LiquidController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/LiquidController.java
index 5936186..cbabeea 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/LiquidController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/LiquidController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.dict.BusConfigDict;
 import com.casic.missiles.modular.system.dto.BusConfigDTO;
 import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
+import com.casic.missiles.modular.system.dto.LiquidBusConfigDTO;
 import com.casic.missiles.modular.system.service.IBusConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
index 1724edb..1a3b37e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
@@ -142,7 +142,6 @@
     private String sensorId;
 
     public static Map<Integer, String> sensorHashMap = new HashMap<Integer, String>();
-
     {//根据前期产品化文档，配置时存入config表中对应的sensorid字段，区分是哪类设备
         sensorHashMap.put(DeviceTypeEnum.Liquid.getIndex(), "000034");
         sensorHashMap.put(DeviceTypeEnum.Methane.getIndex(), "000044");

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 30c9a38..08aec6b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -22,6 +22,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -279,7 +280,8 @@
                     page.setSearchCount(!alarmJobService.checkJobStatus(jobListParam.getJobStatus()));
                 }
             }
-            retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
+            Long deptId = ObjectUtils.isEmpty(jobListParam.getDeptId()) ? currentUser.getDeptId():jobListParam.getDeptId();
+            retList = alarmJobService.jobListSearchApp(page, jobListParam,deptId, currentUser.getId(), leaderId);
         }
         retList.forEach(this::alarmJobWrapper);
         page.setRecords(retList);
@@ -508,7 +510,7 @@
     public Object jobInfo(@RequestParam(value = "id", required = true) Long id) {
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>>  retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
+        List<Map<String, Object>> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
         retList.forEach(this::alarmJobWrapper);
         return ResponseData.success(retList);
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java
index c83bff8..a9544aa 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java
@@ -17,6 +17,7 @@
      * 风险等级
      */
     private String alarmLevel;
+    private Long deptId;
     private String alarmContent;
     private String jobStatus;
     private String beginTime;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index aeca8cd..e17b700 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -889,6 +889,9 @@
             <if test="alarmLevel!='' and alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{alarmLevel}
             </if>
+            <if test="deptId!='' and deptId!=null">
+                AND bwi.deptid = #{deptId}
+            </if>
             <if test="alarmContent!='' and alarmContent!=null">
                 AND ar.ALARM_CONTENT = #{alarmContent}
             </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/LiquidController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/LiquidController.java
index 5936186..cbabeea 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/LiquidController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/LiquidController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.dict.BusConfigDict;
 import com.casic.missiles.modular.system.dto.BusConfigDTO;
 import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
+import com.casic.missiles.modular.system.dto.LiquidBusConfigDTO;
 import com.casic.missiles.modular.system.service.IBusConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
index 1724edb..1a3b37e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
@@ -142,7 +142,6 @@
     private String sensorId;
 
     public static Map<Integer, String> sensorHashMap = new HashMap<Integer, String>();
-
     {//根据前期产品化文档，配置时存入config表中对应的sensorid字段，区分是哪类设备
         sensorHashMap.put(DeviceTypeEnum.Liquid.getIndex(), "000034");
         sensorHashMap.put(DeviceTypeEnum.Methane.getIndex(), "000044");
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/LiquidBusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/LiquidBusConfigDTO.java
new file mode 100644
index 0000000..94e9bf2
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/LiquidBusConfigDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class LiquidBusConfigDTO {
+
+    private Long deviceId;
+    private String percent; //报警阈值（井深百分比）
+    private String installHeight; //安装高度
+    private String retryTimes;//	重传次数
+    private String ip;
+    private String port;
+    private String attemptsMax; //最大尝试次数
+    private String collectCycle;//采集间隔
+    private String collectCnt;//数据上报间隔
+    private String dataThreshold;//边界阈值（小数）
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 30c9a38..08aec6b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -22,6 +22,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -279,7 +280,8 @@
                     page.setSearchCount(!alarmJobService.checkJobStatus(jobListParam.getJobStatus()));
                 }
             }
-            retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
+            Long deptId = ObjectUtils.isEmpty(jobListParam.getDeptId()) ? currentUser.getDeptId():jobListParam.getDeptId();
+            retList = alarmJobService.jobListSearchApp(page, jobListParam,deptId, currentUser.getId(), leaderId);
         }
         retList.forEach(this::alarmJobWrapper);
         page.setRecords(retList);
@@ -508,7 +510,7 @@
     public Object jobInfo(@RequestParam(value = "id", required = true) Long id) {
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>>  retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
+        List<Map<String, Object>> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
         retList.forEach(this::alarmJobWrapper);
         return ResponseData.success(retList);
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java
index c83bff8..a9544aa 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java
@@ -17,6 +17,7 @@
      * 风险等级
      */
     private String alarmLevel;
+    private Long deptId;
     private String alarmContent;
     private String jobStatus;
     private String beginTime;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index aeca8cd..e17b700 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -889,6 +889,9 @@
             <if test="alarmLevel!='' and alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{alarmLevel}
             </if>
+            <if test="deptId!='' and deptId!=null">
+                AND bwi.deptid = #{deptId}
+            </if>
             <if test="alarmContent!='' and alarmContent!=null">
                 AND ar.ALARM_CONTENT = #{alarmContent}
             </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/LiquidController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/LiquidController.java
index 5936186..cbabeea 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/LiquidController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/LiquidController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.dict.BusConfigDict;
 import com.casic.missiles.modular.system.dto.BusConfigDTO;
 import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
+import com.casic.missiles.modular.system.dto.LiquidBusConfigDTO;
 import com.casic.missiles.modular.system.service.IBusConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
index 1724edb..1a3b37e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
@@ -142,7 +142,6 @@
     private String sensorId;
 
     public static Map<Integer, String> sensorHashMap = new HashMap<Integer, String>();
-
     {//根据前期产品化文档，配置时存入config表中对应的sensorid字段，区分是哪类设备
         sensorHashMap.put(DeviceTypeEnum.Liquid.getIndex(), "000034");
         sensorHashMap.put(DeviceTypeEnum.Methane.getIndex(), "000044");
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/LiquidBusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/LiquidBusConfigDTO.java
new file mode 100644
index 0000000..94e9bf2
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/LiquidBusConfigDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class LiquidBusConfigDTO {
+
+    private Long deviceId;
+    private String percent; //报警阈值（井深百分比）
+    private String installHeight; //安装高度
+    private String retryTimes;//	重传次数
+    private String ip;
+    private String port;
+    private String attemptsMax; //最大尝试次数
+    private String collectCycle;//采集间隔
+    private String collectCnt;//数据上报间隔
+    private String dataThreshold;//边界阈值（小数）
+}
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
index 3106926..15e9dd7 100644
--- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
@@ -46,7 +46,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "admin";
+            username = "gwq";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 30c9a38..08aec6b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -22,6 +22,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -279,7 +280,8 @@
                     page.setSearchCount(!alarmJobService.checkJobStatus(jobListParam.getJobStatus()));
                 }
             }
-            retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
+            Long deptId = ObjectUtils.isEmpty(jobListParam.getDeptId()) ? currentUser.getDeptId():jobListParam.getDeptId();
+            retList = alarmJobService.jobListSearchApp(page, jobListParam,deptId, currentUser.getId(), leaderId);
         }
         retList.forEach(this::alarmJobWrapper);
         page.setRecords(retList);
@@ -508,7 +510,7 @@
     public Object jobInfo(@RequestParam(value = "id", required = true) Long id) {
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>>  retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
+        List<Map<String, Object>> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
         retList.forEach(this::alarmJobWrapper);
         return ResponseData.success(retList);
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java
index c83bff8..a9544aa 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobListParam.java
@@ -17,6 +17,7 @@
      * 风险等级
      */
     private String alarmLevel;
+    private Long deptId;
     private String alarmContent;
     private String jobStatus;
     private String beginTime;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index aeca8cd..e17b700 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -889,6 +889,9 @@
             <if test="alarmLevel!='' and alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{alarmLevel}
             </if>
+            <if test="deptId!='' and deptId!=null">
+                AND bwi.deptid = #{deptId}
+            </if>
             <if test="alarmContent!='' and alarmContent!=null">
                 AND ar.ALARM_CONTENT = #{alarmContent}
             </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/LiquidController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/LiquidController.java
index 5936186..cbabeea 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/LiquidController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/LiquidController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.dict.BusConfigDict;
 import com.casic.missiles.modular.system.dto.BusConfigDTO;
 import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
+import com.casic.missiles.modular.system.dto.LiquidBusConfigDTO;
 import com.casic.missiles.modular.system.service.IBusConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
index 1724edb..1a3b37e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
@@ -142,7 +142,6 @@
     private String sensorId;
 
     public static Map<Integer, String> sensorHashMap = new HashMap<Integer, String>();
-
     {//根据前期产品化文档，配置时存入config表中对应的sensorid字段，区分是哪类设备
         sensorHashMap.put(DeviceTypeEnum.Liquid.getIndex(), "000034");
         sensorHashMap.put(DeviceTypeEnum.Methane.getIndex(), "000044");
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/LiquidBusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/LiquidBusConfigDTO.java
new file mode 100644
index 0000000..94e9bf2
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/LiquidBusConfigDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class LiquidBusConfigDTO {
+
+    private Long deviceId;
+    private String percent; //报警阈值（井深百分比）
+    private String installHeight; //安装高度
+    private String retryTimes;//	重传次数
+    private String ip;
+    private String port;
+    private String attemptsMax; //最大尝试次数
+    private String collectCycle;//采集间隔
+    private String collectCnt;//数据上报间隔
+    private String dataThreshold;//边界阈值（小数）
+}
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
index 3106926..15e9dd7 100644
--- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
@@ -46,7 +46,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "admin";
+            username = "gwq";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 0cf0abf..885b793 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -3,7 +3,7 @@
 ##########################################################
 spring:
   profiles:
-    active: dev
+    active: postgre
   servlet:
     multipart:
       max-file-size: 50MB