diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 34cf78b..f73a747 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -49,10 +49,10 @@
      */
     @RequestMapping(value = "/alarmNow")
     @ResponseBody
-    public Object alarmNow(String alarmType) {
+    public Object alarmNow(String alarmType,Long deviceType) {
         // 查询当前有效的报警记录（status=1）
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType);
+        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType,deviceType);
         SuccessResponseData successResult = new SuccessResponseData();
         successResult.setData(alarmNowViewList);
         successResult.setMessage("success");

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 34cf78b..f73a747 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -49,10 +49,10 @@
      */
     @RequestMapping(value = "/alarmNow")
     @ResponseBody
-    public Object alarmNow(String alarmType) {
+    public Object alarmNow(String alarmType,Long deviceType) {
         // 查询当前有效的报警记录（status=1）
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType);
+        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType,deviceType);
         SuccessResponseData successResult = new SuccessResponseData();
         successResult.setData(alarmNowViewList);
         successResult.setMessage("success");
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
index 12a476c..50ab7cf 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
@@ -10,7 +10,7 @@
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author casic123
@@ -18,11 +18,12 @@
  */
 public interface AlarmNowViewMapper extends BaseMapper<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope,@Param("alarmType")String alarmType);
+    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope, @Param("alarmType") String alarmType,
+                                          @Param("deviceType") Long deviceType);
 
     List<AlarmNowView> getAlarmsByWell(@Param("id") Long id);
 
-    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime")String beginTime, @Param("endTime")String endTime, @Param("deptIds")String deptIds);
+    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptIds") String deptIds);
 
-    Map<String, Object> countAlarmsByDay(@Param("date")String date,@Param("deptIds")String deptIds);
+    Map<String, Object> countAlarmsByDay(@Param("date") String date, @Param("deptIds") String deptIds);
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 34cf78b..f73a747 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -49,10 +49,10 @@
      */
     @RequestMapping(value = "/alarmNow")
     @ResponseBody
-    public Object alarmNow(String alarmType) {
+    public Object alarmNow(String alarmType,Long deviceType) {
         // 查询当前有效的报警记录（status=1）
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType);
+        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType,deviceType);
         SuccessResponseData successResult = new SuccessResponseData();
         successResult.setData(alarmNowViewList);
         successResult.setMessage("success");
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
index 12a476c..50ab7cf 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
@@ -10,7 +10,7 @@
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author casic123
@@ -18,11 +18,12 @@
  */
 public interface AlarmNowViewMapper extends BaseMapper<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope,@Param("alarmType")String alarmType);
+    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope, @Param("alarmType") String alarmType,
+                                          @Param("deviceType") Long deviceType);
 
     List<AlarmNowView> getAlarmsByWell(@Param("id") Long id);
 
-    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime")String beginTime, @Param("endTime")String endTime, @Param("deptIds")String deptIds);
+    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptIds") String deptIds);
 
-    Map<String, Object> countAlarmsByDay(@Param("date")String date,@Param("deptIds")String deptIds);
+    Map<String, Object> countAlarmsByDay(@Param("date") String date, @Param("deptIds") String deptIds);
 }
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 8bb2bac..0922e75 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
@@ -555,7 +555,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY  aj.CREATE_TIME  DESC
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -793,8 +793,7 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like
-                <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 34cf78b..f73a747 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -49,10 +49,10 @@
      */
     @RequestMapping(value = "/alarmNow")
     @ResponseBody
-    public Object alarmNow(String alarmType) {
+    public Object alarmNow(String alarmType,Long deviceType) {
         // 查询当前有效的报警记录（status=1）
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType);
+        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType,deviceType);
         SuccessResponseData successResult = new SuccessResponseData();
         successResult.setData(alarmNowViewList);
         successResult.setMessage("success");
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
index 12a476c..50ab7cf 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
@@ -10,7 +10,7 @@
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author casic123
@@ -18,11 +18,12 @@
  */
 public interface AlarmNowViewMapper extends BaseMapper<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope,@Param("alarmType")String alarmType);
+    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope, @Param("alarmType") String alarmType,
+                                          @Param("deviceType") Long deviceType);
 
     List<AlarmNowView> getAlarmsByWell(@Param("id") Long id);
 
-    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime")String beginTime, @Param("endTime")String endTime, @Param("deptIds")String deptIds);
+    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptIds") String deptIds);
 
-    Map<String, Object> countAlarmsByDay(@Param("date")String date,@Param("deptIds")String deptIds);
+    Map<String, Object> countAlarmsByDay(@Param("date") String date, @Param("deptIds") String deptIds);
 }
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 8bb2bac..0922e75 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
@@ -555,7 +555,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY  aj.CREATE_TIME  DESC
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -793,8 +793,7 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like
-                <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index bc5063d..4edee65 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -22,6 +22,9 @@
         <if test="alarmType!='' and alarmType!=null">
             AND alarmtype = #{alarmType}
         </if>
+        <if test="deviceType!='' and deviceType!=null">
+            AND  devicetype = #{deviceType}
+        </if>
         ORDER BY alarmTimeDate DESC
     </select>
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 34cf78b..f73a747 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -49,10 +49,10 @@
      */
     @RequestMapping(value = "/alarmNow")
     @ResponseBody
-    public Object alarmNow(String alarmType) {
+    public Object alarmNow(String alarmType,Long deviceType) {
         // 查询当前有效的报警记录（status=1）
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType);
+        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType,deviceType);
         SuccessResponseData successResult = new SuccessResponseData();
         successResult.setData(alarmNowViewList);
         successResult.setMessage("success");
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
index 12a476c..50ab7cf 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
@@ -10,7 +10,7 @@
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author casic123
@@ -18,11 +18,12 @@
  */
 public interface AlarmNowViewMapper extends BaseMapper<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope,@Param("alarmType")String alarmType);
+    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope, @Param("alarmType") String alarmType,
+                                          @Param("deviceType") Long deviceType);
 
     List<AlarmNowView> getAlarmsByWell(@Param("id") Long id);
 
-    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime")String beginTime, @Param("endTime")String endTime, @Param("deptIds")String deptIds);
+    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptIds") String deptIds);
 
-    Map<String, Object> countAlarmsByDay(@Param("date")String date,@Param("deptIds")String deptIds);
+    Map<String, Object> countAlarmsByDay(@Param("date") String date, @Param("deptIds") String deptIds);
 }
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 8bb2bac..0922e75 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
@@ -555,7 +555,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY  aj.CREATE_TIME  DESC
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -793,8 +793,7 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like
-                <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index bc5063d..4edee65 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -22,6 +22,9 @@
         <if test="alarmType!='' and alarmType!=null">
             AND alarmtype = #{alarmType}
         </if>
+        <if test="deviceType!='' and deviceType!=null">
+            AND  devicetype = #{deviceType}
+        </if>
         ORDER BY alarmTimeDate DESC
     </select>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
index 218a145..cec1f9f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
@@ -16,6 +16,6 @@
  */
 public interface IAlarmNowViewService extends IService<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType);
+    List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType,Long deviceType);
     List<AlarmNowView> getAlarmsByWell(Long id);
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 34cf78b..f73a747 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -49,10 +49,10 @@
      */
     @RequestMapping(value = "/alarmNow")
     @ResponseBody
-    public Object alarmNow(String alarmType) {
+    public Object alarmNow(String alarmType,Long deviceType) {
         // 查询当前有效的报警记录（status=1）
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType);
+        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType,deviceType);
         SuccessResponseData successResult = new SuccessResponseData();
         successResult.setData(alarmNowViewList);
         successResult.setMessage("success");
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
index 12a476c..50ab7cf 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
@@ -10,7 +10,7 @@
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author casic123
@@ -18,11 +18,12 @@
  */
 public interface AlarmNowViewMapper extends BaseMapper<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope,@Param("alarmType")String alarmType);
+    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope, @Param("alarmType") String alarmType,
+                                          @Param("deviceType") Long deviceType);
 
     List<AlarmNowView> getAlarmsByWell(@Param("id") Long id);
 
-    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime")String beginTime, @Param("endTime")String endTime, @Param("deptIds")String deptIds);
+    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptIds") String deptIds);
 
-    Map<String, Object> countAlarmsByDay(@Param("date")String date,@Param("deptIds")String deptIds);
+    Map<String, Object> countAlarmsByDay(@Param("date") String date, @Param("deptIds") String deptIds);
 }
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 8bb2bac..0922e75 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
@@ -555,7 +555,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY  aj.CREATE_TIME  DESC
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -793,8 +793,7 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like
-                <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index bc5063d..4edee65 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -22,6 +22,9 @@
         <if test="alarmType!='' and alarmType!=null">
             AND alarmtype = #{alarmType}
         </if>
+        <if test="deviceType!='' and deviceType!=null">
+            AND  devicetype = #{deviceType}
+        </if>
         ORDER BY alarmTimeDate DESC
     </select>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
index 218a145..cec1f9f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
@@ -16,6 +16,6 @@
  */
 public interface IAlarmNowViewService extends IService<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType);
+    List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType,Long deviceType);
     List<AlarmNowView> getAlarmsByWell(Long id);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
index 927dfea..38e6c48 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
@@ -26,8 +26,8 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType) {
-        List<AlarmNowView> alarmNowViewList = this.baseMapper.getNowAlarmRecords(dataScope, alarmType);
+    public List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType,Long deviceType) {
+        List<AlarmNowView> alarmNowViewList = this.baseMapper.getNowAlarmRecords(dataScope, alarmType,deviceType);
         for (AlarmNowView alarmNowView : alarmNowViewList) {
             alarmNowView.setWellTypeName(dictService.getDictNameByCode("sluicewellType", alarmNowView.getWellType()));
         }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 34cf78b..f73a747 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -49,10 +49,10 @@
      */
     @RequestMapping(value = "/alarmNow")
     @ResponseBody
-    public Object alarmNow(String alarmType) {
+    public Object alarmNow(String alarmType,Long deviceType) {
         // 查询当前有效的报警记录（status=1）
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType);
+        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType,deviceType);
         SuccessResponseData successResult = new SuccessResponseData();
         successResult.setData(alarmNowViewList);
         successResult.setMessage("success");
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
index 12a476c..50ab7cf 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
@@ -10,7 +10,7 @@
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author casic123
@@ -18,11 +18,12 @@
  */
 public interface AlarmNowViewMapper extends BaseMapper<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope,@Param("alarmType")String alarmType);
+    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope, @Param("alarmType") String alarmType,
+                                          @Param("deviceType") Long deviceType);
 
     List<AlarmNowView> getAlarmsByWell(@Param("id") Long id);
 
-    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime")String beginTime, @Param("endTime")String endTime, @Param("deptIds")String deptIds);
+    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptIds") String deptIds);
 
-    Map<String, Object> countAlarmsByDay(@Param("date")String date,@Param("deptIds")String deptIds);
+    Map<String, Object> countAlarmsByDay(@Param("date") String date, @Param("deptIds") String deptIds);
 }
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 8bb2bac..0922e75 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
@@ -555,7 +555,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY  aj.CREATE_TIME  DESC
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -793,8 +793,7 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like
-                <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index bc5063d..4edee65 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -22,6 +22,9 @@
         <if test="alarmType!='' and alarmType!=null">
             AND alarmtype = #{alarmType}
         </if>
+        <if test="deviceType!='' and deviceType!=null">
+            AND  devicetype = #{deviceType}
+        </if>
         ORDER BY alarmTimeDate DESC
     </select>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
index 218a145..cec1f9f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
@@ -16,6 +16,6 @@
  */
 public interface IAlarmNowViewService extends IService<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType);
+    List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType,Long deviceType);
     List<AlarmNowView> getAlarmsByWell(Long id);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
index 927dfea..38e6c48 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
@@ -26,8 +26,8 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType) {
-        List<AlarmNowView> alarmNowViewList = this.baseMapper.getNowAlarmRecords(dataScope, alarmType);
+    public List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType,Long deviceType) {
+        List<AlarmNowView> alarmNowViewList = this.baseMapper.getNowAlarmRecords(dataScope, alarmType,deviceType);
         for (AlarmNowView alarmNowView : alarmNowViewList) {
             alarmNowView.setWellTypeName(dictService.getDictNameByCode("sluicewellType", alarmNowView.getWellType()));
         }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index d974fcd..e505933 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -224,7 +224,7 @@
                deptName,
                wellCode,
                POSITION as position,
-              CASE WHEN 	bds.ONLINE_STATE  <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END  AS "onlineState",
+              CASE WHEN 	dov.onlineState  <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END  AS "onlineState",
                coordinateX,
                coordinateY,
                latBaidu,

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 34cf78b..f73a747 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -49,10 +49,10 @@
      */
     @RequestMapping(value = "/alarmNow")
     @ResponseBody
-    public Object alarmNow(String alarmType) {
+    public Object alarmNow(String alarmType,Long deviceType) {
         // 查询当前有效的报警记录（status=1）
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType);
+        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType,deviceType);
         SuccessResponseData successResult = new SuccessResponseData();
         successResult.setData(alarmNowViewList);
         successResult.setMessage("success");
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
index 12a476c..50ab7cf 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
@@ -10,7 +10,7 @@
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author casic123
@@ -18,11 +18,12 @@
  */
 public interface AlarmNowViewMapper extends BaseMapper<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope,@Param("alarmType")String alarmType);
+    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope, @Param("alarmType") String alarmType,
+                                          @Param("deviceType") Long deviceType);
 
     List<AlarmNowView> getAlarmsByWell(@Param("id") Long id);
 
-    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime")String beginTime, @Param("endTime")String endTime, @Param("deptIds")String deptIds);
+    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptIds") String deptIds);
 
-    Map<String, Object> countAlarmsByDay(@Param("date")String date,@Param("deptIds")String deptIds);
+    Map<String, Object> countAlarmsByDay(@Param("date") String date, @Param("deptIds") String deptIds);
 }
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 8bb2bac..0922e75 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
@@ -555,7 +555,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY  aj.CREATE_TIME  DESC
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -793,8 +793,7 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like
-                <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index bc5063d..4edee65 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -22,6 +22,9 @@
         <if test="alarmType!='' and alarmType!=null">
             AND alarmtype = #{alarmType}
         </if>
+        <if test="deviceType!='' and deviceType!=null">
+            AND  devicetype = #{deviceType}
+        </if>
         ORDER BY alarmTimeDate DESC
     </select>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
index 218a145..cec1f9f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
@@ -16,6 +16,6 @@
  */
 public interface IAlarmNowViewService extends IService<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType);
+    List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType,Long deviceType);
     List<AlarmNowView> getAlarmsByWell(Long id);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
index 927dfea..38e6c48 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
@@ -26,8 +26,8 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType) {
-        List<AlarmNowView> alarmNowViewList = this.baseMapper.getNowAlarmRecords(dataScope, alarmType);
+    public List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType,Long deviceType) {
+        List<AlarmNowView> alarmNowViewList = this.baseMapper.getNowAlarmRecords(dataScope, alarmType,deviceType);
         for (AlarmNowView alarmNowView : alarmNowViewList) {
             alarmNowView.setWellTypeName(dictService.getDictNameByCode("sluicewellType", alarmNowView.getWellType()));
         }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index d974fcd..e505933 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -224,7 +224,7 @@
                deptName,
                wellCode,
                POSITION as position,
-              CASE WHEN 	bds.ONLINE_STATE  <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END  AS "onlineState",
+              CASE WHEN 	dov.onlineState  <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END  AS "onlineState",
                coordinateX,
                coordinateY,
                latBaidu,
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 31348f7..cdd13f2 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -72,9 +72,9 @@
         </dependency>
 
         <!--<dependency>-->
-            <!--<groupId>org.postgresql</groupId>-->
-            <!--<artifactId>chgjdbc</artifactId>-->
-            <!--<version>6.0.3-SNAPSHOT</version>-->
+        <!--<groupId>org.postgresql</groupId>-->
+        <!--<artifactId>chgjdbc</artifactId>-->
+        <!--<version>6.0.3-SNAPSHOT</version>-->
         <!--</dependency>-->
 
         <dependency>
@@ -86,12 +86,6 @@
             <groupId>com.casic</groupId>
             <artifactId>casic-admin-core</artifactId>
             <version>${admin.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.springfox</groupId>
-                    <artifactId>springfox-swagger-ui</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
@@ -103,6 +97,8 @@
             <artifactId>casic-server-support</artifactId>
             <version>${pro.version}</version>
         </dependency>
+
+
         <!--        版本问题 nacos starter 支持boot 2.4之前版本　需通过java api方式集成-->
         <!--        <dependency>-->
         <!--            <groupId>com.alibaba.boot</groupId>-->
@@ -160,6 +156,32 @@
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
         </dependency>
+
+        <!--<dependency>-->
+            <!--<groupId>io.springfox</groupId>-->
+            <!--<artifactId>springfox-swagger2</artifactId>-->
+            <!--<version>2.9.2</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>io.springfox</groupId>-->
+            <!--<artifactId>springfox-swagger-ui</artifactId>-->
+            <!--<version>2.9.2</version>-->
+        <!--</dependency>-->
+
+        <!--&lt;!&ndash;&lt;!&ndash;引入Knife4j的官方start包,Swagger2基于Springfox2.10.5项目&ndash;&gt;&ndash;&gt;-->
+        <!--<dependency>-->
+            <!--<groupId>com.github.xiaoymin</groupId>-->
+            <!--&lt;!&ndash;使用Swagger2&ndash;&gt;-->
+            <!--<artifactId>knife4j-spring-boot-starter</artifactId>-->
+            <!--<version>3.0.3</version>-->
+            <!--<exclusions>-->
+                <!--<exclusion>-->
+                    <!--<artifactId>guava</artifactId>-->
+                    <!--<groupId>com.google.guava</groupId>-->
+                <!--</exclusion>-->
+            <!--</exclusions>-->
+        <!--</dependency>-->
+
     </dependencies>
     <build>
         <plugins>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 34cf78b..f73a747 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -49,10 +49,10 @@
      */
     @RequestMapping(value = "/alarmNow")
     @ResponseBody
-    public Object alarmNow(String alarmType) {
+    public Object alarmNow(String alarmType,Long deviceType) {
         // 查询当前有效的报警记录（status=1）
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType);
+        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType,deviceType);
         SuccessResponseData successResult = new SuccessResponseData();
         successResult.setData(alarmNowViewList);
         successResult.setMessage("success");
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
index 12a476c..50ab7cf 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
@@ -10,7 +10,7 @@
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author casic123
@@ -18,11 +18,12 @@
  */
 public interface AlarmNowViewMapper extends BaseMapper<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope,@Param("alarmType")String alarmType);
+    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope, @Param("alarmType") String alarmType,
+                                          @Param("deviceType") Long deviceType);
 
     List<AlarmNowView> getAlarmsByWell(@Param("id") Long id);
 
-    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime")String beginTime, @Param("endTime")String endTime, @Param("deptIds")String deptIds);
+    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptIds") String deptIds);
 
-    Map<String, Object> countAlarmsByDay(@Param("date")String date,@Param("deptIds")String deptIds);
+    Map<String, Object> countAlarmsByDay(@Param("date") String date, @Param("deptIds") String deptIds);
 }
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 8bb2bac..0922e75 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
@@ -555,7 +555,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY  aj.CREATE_TIME  DESC
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -793,8 +793,7 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like
-                <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index bc5063d..4edee65 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -22,6 +22,9 @@
         <if test="alarmType!='' and alarmType!=null">
             AND alarmtype = #{alarmType}
         </if>
+        <if test="deviceType!='' and deviceType!=null">
+            AND  devicetype = #{deviceType}
+        </if>
         ORDER BY alarmTimeDate DESC
     </select>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
index 218a145..cec1f9f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
@@ -16,6 +16,6 @@
  */
 public interface IAlarmNowViewService extends IService<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType);
+    List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType,Long deviceType);
     List<AlarmNowView> getAlarmsByWell(Long id);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
index 927dfea..38e6c48 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
@@ -26,8 +26,8 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType) {
-        List<AlarmNowView> alarmNowViewList = this.baseMapper.getNowAlarmRecords(dataScope, alarmType);
+    public List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType,Long deviceType) {
+        List<AlarmNowView> alarmNowViewList = this.baseMapper.getNowAlarmRecords(dataScope, alarmType,deviceType);
         for (AlarmNowView alarmNowView : alarmNowViewList) {
             alarmNowView.setWellTypeName(dictService.getDictNameByCode("sluicewellType", alarmNowView.getWellType()));
         }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index d974fcd..e505933 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -224,7 +224,7 @@
                deptName,
                wellCode,
                POSITION as position,
-              CASE WHEN 	bds.ONLINE_STATE  <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END  AS "onlineState",
+              CASE WHEN 	dov.onlineState  <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END  AS "onlineState",
                coordinateX,
                coordinateY,
                latBaidu,
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 31348f7..cdd13f2 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -72,9 +72,9 @@
         </dependency>
 
         <!--<dependency>-->
-            <!--<groupId>org.postgresql</groupId>-->
-            <!--<artifactId>chgjdbc</artifactId>-->
-            <!--<version>6.0.3-SNAPSHOT</version>-->
+        <!--<groupId>org.postgresql</groupId>-->
+        <!--<artifactId>chgjdbc</artifactId>-->
+        <!--<version>6.0.3-SNAPSHOT</version>-->
         <!--</dependency>-->
 
         <dependency>
@@ -86,12 +86,6 @@
             <groupId>com.casic</groupId>
             <artifactId>casic-admin-core</artifactId>
             <version>${admin.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.springfox</groupId>
-                    <artifactId>springfox-swagger-ui</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
@@ -103,6 +97,8 @@
             <artifactId>casic-server-support</artifactId>
             <version>${pro.version}</version>
         </dependency>
+
+
         <!--        版本问题 nacos starter 支持boot 2.4之前版本　需通过java api方式集成-->
         <!--        <dependency>-->
         <!--            <groupId>com.alibaba.boot</groupId>-->
@@ -160,6 +156,32 @@
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
         </dependency>
+
+        <!--<dependency>-->
+            <!--<groupId>io.springfox</groupId>-->
+            <!--<artifactId>springfox-swagger2</artifactId>-->
+            <!--<version>2.9.2</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>io.springfox</groupId>-->
+            <!--<artifactId>springfox-swagger-ui</artifactId>-->
+            <!--<version>2.9.2</version>-->
+        <!--</dependency>-->
+
+        <!--&lt;!&ndash;&lt;!&ndash;引入Knife4j的官方start包,Swagger2基于Springfox2.10.5项目&ndash;&gt;&ndash;&gt;-->
+        <!--<dependency>-->
+            <!--<groupId>com.github.xiaoymin</groupId>-->
+            <!--&lt;!&ndash;使用Swagger2&ndash;&gt;-->
+            <!--<artifactId>knife4j-spring-boot-starter</artifactId>-->
+            <!--<version>3.0.3</version>-->
+            <!--<exclusions>-->
+                <!--<exclusion>-->
+                    <!--<artifactId>guava</artifactId>-->
+                    <!--<groupId>com.google.guava</groupId>-->
+                <!--</exclusion>-->
+            <!--</exclusions>-->
+        <!--</dependency>-->
+
     </dependencies>
     <build>
         <plugins>
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index 460d4db..6eebb1a 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -3,11 +3,13 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+//import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 /**
  * SpringBoot方式启动类
@@ -16,16 +18,19 @@
  * @Date 2021/06/06 12:06
  */
 @SpringBootApplication
+//@ComponentScan(
+//        excludeFilters = {@ComponentScan.Filter(
+//                type = FilterType.REGEX,
+//                pattern = {"com.casic.missiles.config.web.ShiroConfig"})})
 @EnableCaching
 @EnableScheduling
 @EnableTransactionManagement(proxyTargetClass = true)
 @EnableAsync
-@ServletComponentScan
 @Slf4j
+//@EnableSwagger2
 public class CasicApplication {
     public static void main(String[] args) {
         SpringApplication.run(CasicApplication.class, args);
         log.info("CasicApplication is success!");
     }
-
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 34cf78b..f73a747 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -49,10 +49,10 @@
      */
     @RequestMapping(value = "/alarmNow")
     @ResponseBody
-    public Object alarmNow(String alarmType) {
+    public Object alarmNow(String alarmType,Long deviceType) {
         // 查询当前有效的报警记录（status=1）
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType);
+        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType,deviceType);
         SuccessResponseData successResult = new SuccessResponseData();
         successResult.setData(alarmNowViewList);
         successResult.setMessage("success");
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
index 12a476c..50ab7cf 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
@@ -10,7 +10,7 @@
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author casic123
@@ -18,11 +18,12 @@
  */
 public interface AlarmNowViewMapper extends BaseMapper<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope,@Param("alarmType")String alarmType);
+    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope, @Param("alarmType") String alarmType,
+                                          @Param("deviceType") Long deviceType);
 
     List<AlarmNowView> getAlarmsByWell(@Param("id") Long id);
 
-    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime")String beginTime, @Param("endTime")String endTime, @Param("deptIds")String deptIds);
+    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptIds") String deptIds);
 
-    Map<String, Object> countAlarmsByDay(@Param("date")String date,@Param("deptIds")String deptIds);
+    Map<String, Object> countAlarmsByDay(@Param("date") String date, @Param("deptIds") String deptIds);
 }
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 8bb2bac..0922e75 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
@@ -555,7 +555,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY  aj.CREATE_TIME  DESC
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -793,8 +793,7 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like
-                <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index bc5063d..4edee65 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -22,6 +22,9 @@
         <if test="alarmType!='' and alarmType!=null">
             AND alarmtype = #{alarmType}
         </if>
+        <if test="deviceType!='' and deviceType!=null">
+            AND  devicetype = #{deviceType}
+        </if>
         ORDER BY alarmTimeDate DESC
     </select>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
index 218a145..cec1f9f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
@@ -16,6 +16,6 @@
  */
 public interface IAlarmNowViewService extends IService<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType);
+    List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType,Long deviceType);
     List<AlarmNowView> getAlarmsByWell(Long id);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
index 927dfea..38e6c48 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
@@ -26,8 +26,8 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType) {
-        List<AlarmNowView> alarmNowViewList = this.baseMapper.getNowAlarmRecords(dataScope, alarmType);
+    public List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType,Long deviceType) {
+        List<AlarmNowView> alarmNowViewList = this.baseMapper.getNowAlarmRecords(dataScope, alarmType,deviceType);
         for (AlarmNowView alarmNowView : alarmNowViewList) {
             alarmNowView.setWellTypeName(dictService.getDictNameByCode("sluicewellType", alarmNowView.getWellType()));
         }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index d974fcd..e505933 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -224,7 +224,7 @@
                deptName,
                wellCode,
                POSITION as position,
-              CASE WHEN 	bds.ONLINE_STATE  <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END  AS "onlineState",
+              CASE WHEN 	dov.onlineState  <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END  AS "onlineState",
                coordinateX,
                coordinateY,
                latBaidu,
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 31348f7..cdd13f2 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -72,9 +72,9 @@
         </dependency>
 
         <!--<dependency>-->
-            <!--<groupId>org.postgresql</groupId>-->
-            <!--<artifactId>chgjdbc</artifactId>-->
-            <!--<version>6.0.3-SNAPSHOT</version>-->
+        <!--<groupId>org.postgresql</groupId>-->
+        <!--<artifactId>chgjdbc</artifactId>-->
+        <!--<version>6.0.3-SNAPSHOT</version>-->
         <!--</dependency>-->
 
         <dependency>
@@ -86,12 +86,6 @@
             <groupId>com.casic</groupId>
             <artifactId>casic-admin-core</artifactId>
             <version>${admin.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.springfox</groupId>
-                    <artifactId>springfox-swagger-ui</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
@@ -103,6 +97,8 @@
             <artifactId>casic-server-support</artifactId>
             <version>${pro.version}</version>
         </dependency>
+
+
         <!--        版本问题 nacos starter 支持boot 2.4之前版本　需通过java api方式集成-->
         <!--        <dependency>-->
         <!--            <groupId>com.alibaba.boot</groupId>-->
@@ -160,6 +156,32 @@
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
         </dependency>
+
+        <!--<dependency>-->
+            <!--<groupId>io.springfox</groupId>-->
+            <!--<artifactId>springfox-swagger2</artifactId>-->
+            <!--<version>2.9.2</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>io.springfox</groupId>-->
+            <!--<artifactId>springfox-swagger-ui</artifactId>-->
+            <!--<version>2.9.2</version>-->
+        <!--</dependency>-->
+
+        <!--&lt;!&ndash;&lt;!&ndash;引入Knife4j的官方start包,Swagger2基于Springfox2.10.5项目&ndash;&gt;&ndash;&gt;-->
+        <!--<dependency>-->
+            <!--<groupId>com.github.xiaoymin</groupId>-->
+            <!--&lt;!&ndash;使用Swagger2&ndash;&gt;-->
+            <!--<artifactId>knife4j-spring-boot-starter</artifactId>-->
+            <!--<version>3.0.3</version>-->
+            <!--<exclusions>-->
+                <!--<exclusion>-->
+                    <!--<artifactId>guava</artifactId>-->
+                    <!--<groupId>com.google.guava</groupId>-->
+                <!--</exclusion>-->
+            <!--</exclusions>-->
+        <!--</dependency>-->
+
     </dependencies>
     <build>
         <plugins>
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index 460d4db..6eebb1a 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -3,11 +3,13 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+//import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 /**
  * SpringBoot方式启动类
@@ -16,16 +18,19 @@
  * @Date 2021/06/06 12:06
  */
 @SpringBootApplication
+//@ComponentScan(
+//        excludeFilters = {@ComponentScan.Filter(
+//                type = FilterType.REGEX,
+//                pattern = {"com.casic.missiles.config.web.ShiroConfig"})})
 @EnableCaching
 @EnableScheduling
 @EnableTransactionManagement(proxyTargetClass = true)
 @EnableAsync
-@ServletComponentScan
 @Slf4j
+//@EnableSwagger2
 public class CasicApplication {
     public static void main(String[] args) {
         SpringApplication.run(CasicApplication.class, args);
         log.info("CasicApplication is success!");
     }
-
 }
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 dd163ba..3106926 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
@@ -12,6 +12,7 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+//import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -32,6 +33,7 @@
  */
 @Controller
 @RequestMapping("/route")
+//@Api(tags = "启动页")
 @Slf4j
 public class MockController extends BaseController {
 
@@ -45,9 +47,6 @@
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
             username = "admin";
-            //  mysql
-//         password = "1q2W3E4R";
-            //postgre
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
@@ -55,7 +54,6 @@
         try {
             Map<String, String> key = RSAUtils.genKeyPair();
             ShiroKit.getSession().setAttribute(PermissionConstants.PRIVATE_KEY, key.get(RSAUtils.RSAPrivateKey));
-
         } catch (NoSuchAlgorithmException e) {
             e.printStackTrace();
         }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 34cf78b..f73a747 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -49,10 +49,10 @@
      */
     @RequestMapping(value = "/alarmNow")
     @ResponseBody
-    public Object alarmNow(String alarmType) {
+    public Object alarmNow(String alarmType,Long deviceType) {
         // 查询当前有效的报警记录（status=1）
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType);
+        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType,deviceType);
         SuccessResponseData successResult = new SuccessResponseData();
         successResult.setData(alarmNowViewList);
         successResult.setMessage("success");
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
index 12a476c..50ab7cf 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
@@ -10,7 +10,7 @@
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author casic123
@@ -18,11 +18,12 @@
  */
 public interface AlarmNowViewMapper extends BaseMapper<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope,@Param("alarmType")String alarmType);
+    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope, @Param("alarmType") String alarmType,
+                                          @Param("deviceType") Long deviceType);
 
     List<AlarmNowView> getAlarmsByWell(@Param("id") Long id);
 
-    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime")String beginTime, @Param("endTime")String endTime, @Param("deptIds")String deptIds);
+    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptIds") String deptIds);
 
-    Map<String, Object> countAlarmsByDay(@Param("date")String date,@Param("deptIds")String deptIds);
+    Map<String, Object> countAlarmsByDay(@Param("date") String date, @Param("deptIds") String deptIds);
 }
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 8bb2bac..0922e75 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
@@ -555,7 +555,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY  aj.CREATE_TIME  DESC
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -793,8 +793,7 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like
-                <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index bc5063d..4edee65 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -22,6 +22,9 @@
         <if test="alarmType!='' and alarmType!=null">
             AND alarmtype = #{alarmType}
         </if>
+        <if test="deviceType!='' and deviceType!=null">
+            AND  devicetype = #{deviceType}
+        </if>
         ORDER BY alarmTimeDate DESC
     </select>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
index 218a145..cec1f9f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
@@ -16,6 +16,6 @@
  */
 public interface IAlarmNowViewService extends IService<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType);
+    List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType,Long deviceType);
     List<AlarmNowView> getAlarmsByWell(Long id);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
index 927dfea..38e6c48 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
@@ -26,8 +26,8 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType) {
-        List<AlarmNowView> alarmNowViewList = this.baseMapper.getNowAlarmRecords(dataScope, alarmType);
+    public List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType,Long deviceType) {
+        List<AlarmNowView> alarmNowViewList = this.baseMapper.getNowAlarmRecords(dataScope, alarmType,deviceType);
         for (AlarmNowView alarmNowView : alarmNowViewList) {
             alarmNowView.setWellTypeName(dictService.getDictNameByCode("sluicewellType", alarmNowView.getWellType()));
         }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index d974fcd..e505933 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -224,7 +224,7 @@
                deptName,
                wellCode,
                POSITION as position,
-              CASE WHEN 	bds.ONLINE_STATE  <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END  AS "onlineState",
+              CASE WHEN 	dov.onlineState  <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END  AS "onlineState",
                coordinateX,
                coordinateY,
                latBaidu,
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 31348f7..cdd13f2 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -72,9 +72,9 @@
         </dependency>
 
         <!--<dependency>-->
-            <!--<groupId>org.postgresql</groupId>-->
-            <!--<artifactId>chgjdbc</artifactId>-->
-            <!--<version>6.0.3-SNAPSHOT</version>-->
+        <!--<groupId>org.postgresql</groupId>-->
+        <!--<artifactId>chgjdbc</artifactId>-->
+        <!--<version>6.0.3-SNAPSHOT</version>-->
         <!--</dependency>-->
 
         <dependency>
@@ -86,12 +86,6 @@
             <groupId>com.casic</groupId>
             <artifactId>casic-admin-core</artifactId>
             <version>${admin.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.springfox</groupId>
-                    <artifactId>springfox-swagger-ui</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
@@ -103,6 +97,8 @@
             <artifactId>casic-server-support</artifactId>
             <version>${pro.version}</version>
         </dependency>
+
+
         <!--        版本问题 nacos starter 支持boot 2.4之前版本　需通过java api方式集成-->
         <!--        <dependency>-->
         <!--            <groupId>com.alibaba.boot</groupId>-->
@@ -160,6 +156,32 @@
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
         </dependency>
+
+        <!--<dependency>-->
+            <!--<groupId>io.springfox</groupId>-->
+            <!--<artifactId>springfox-swagger2</artifactId>-->
+            <!--<version>2.9.2</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>io.springfox</groupId>-->
+            <!--<artifactId>springfox-swagger-ui</artifactId>-->
+            <!--<version>2.9.2</version>-->
+        <!--</dependency>-->
+
+        <!--&lt;!&ndash;&lt;!&ndash;引入Knife4j的官方start包,Swagger2基于Springfox2.10.5项目&ndash;&gt;&ndash;&gt;-->
+        <!--<dependency>-->
+            <!--<groupId>com.github.xiaoymin</groupId>-->
+            <!--&lt;!&ndash;使用Swagger2&ndash;&gt;-->
+            <!--<artifactId>knife4j-spring-boot-starter</artifactId>-->
+            <!--<version>3.0.3</version>-->
+            <!--<exclusions>-->
+                <!--<exclusion>-->
+                    <!--<artifactId>guava</artifactId>-->
+                    <!--<groupId>com.google.guava</groupId>-->
+                <!--</exclusion>-->
+            <!--</exclusions>-->
+        <!--</dependency>-->
+
     </dependencies>
     <build>
         <plugins>
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index 460d4db..6eebb1a 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -3,11 +3,13 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+//import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 /**
  * SpringBoot方式启动类
@@ -16,16 +18,19 @@
  * @Date 2021/06/06 12:06
  */
 @SpringBootApplication
+//@ComponentScan(
+//        excludeFilters = {@ComponentScan.Filter(
+//                type = FilterType.REGEX,
+//                pattern = {"com.casic.missiles.config.web.ShiroConfig"})})
 @EnableCaching
 @EnableScheduling
 @EnableTransactionManagement(proxyTargetClass = true)
 @EnableAsync
-@ServletComponentScan
 @Slf4j
+//@EnableSwagger2
 public class CasicApplication {
     public static void main(String[] args) {
         SpringApplication.run(CasicApplication.class, args);
         log.info("CasicApplication is success!");
     }
-
 }
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 dd163ba..3106926 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
@@ -12,6 +12,7 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+//import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -32,6 +33,7 @@
  */
 @Controller
 @RequestMapping("/route")
+//@Api(tags = "启动页")
 @Slf4j
 public class MockController extends BaseController {
 
@@ -45,9 +47,6 @@
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
             username = "admin";
-            //  mysql
-//         password = "1q2W3E4R";
-            //postgre
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
@@ -55,7 +54,6 @@
         try {
             Map<String, String> key = RSAUtils.genKeyPair();
             ShiroKit.getSession().setAttribute(PermissionConstants.PRIVATE_KEY, key.get(RSAUtils.RSAPrivateKey));
-
         } catch (NoSuchAlgorithmException e) {
             e.printStackTrace();
         }
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index fdabbf2..6e69581 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -4,7 +4,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/smartwell_demo?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
+    url: jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
     username: root
     password: Casic203
   redis:

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 34cf78b..f73a747 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -49,10 +49,10 @@
      */
     @RequestMapping(value = "/alarmNow")
     @ResponseBody
-    public Object alarmNow(String alarmType) {
+    public Object alarmNow(String alarmType,Long deviceType) {
         // 查询当前有效的报警记录（status=1）
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType);
+        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType,deviceType);
         SuccessResponseData successResult = new SuccessResponseData();
         successResult.setData(alarmNowViewList);
         successResult.setMessage("success");
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
index 12a476c..50ab7cf 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
@@ -10,7 +10,7 @@
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author casic123
@@ -18,11 +18,12 @@
  */
 public interface AlarmNowViewMapper extends BaseMapper<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope,@Param("alarmType")String alarmType);
+    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope, @Param("alarmType") String alarmType,
+                                          @Param("deviceType") Long deviceType);
 
     List<AlarmNowView> getAlarmsByWell(@Param("id") Long id);
 
-    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime")String beginTime, @Param("endTime")String endTime, @Param("deptIds")String deptIds);
+    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptIds") String deptIds);
 
-    Map<String, Object> countAlarmsByDay(@Param("date")String date,@Param("deptIds")String deptIds);
+    Map<String, Object> countAlarmsByDay(@Param("date") String date, @Param("deptIds") String deptIds);
 }
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 8bb2bac..0922e75 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
@@ -555,7 +555,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY  aj.CREATE_TIME  DESC
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -793,8 +793,7 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like
-                <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index bc5063d..4edee65 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -22,6 +22,9 @@
         <if test="alarmType!='' and alarmType!=null">
             AND alarmtype = #{alarmType}
         </if>
+        <if test="deviceType!='' and deviceType!=null">
+            AND  devicetype = #{deviceType}
+        </if>
         ORDER BY alarmTimeDate DESC
     </select>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
index 218a145..cec1f9f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
@@ -16,6 +16,6 @@
  */
 public interface IAlarmNowViewService extends IService<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType);
+    List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType,Long deviceType);
     List<AlarmNowView> getAlarmsByWell(Long id);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
index 927dfea..38e6c48 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
@@ -26,8 +26,8 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType) {
-        List<AlarmNowView> alarmNowViewList = this.baseMapper.getNowAlarmRecords(dataScope, alarmType);
+    public List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType,Long deviceType) {
+        List<AlarmNowView> alarmNowViewList = this.baseMapper.getNowAlarmRecords(dataScope, alarmType,deviceType);
         for (AlarmNowView alarmNowView : alarmNowViewList) {
             alarmNowView.setWellTypeName(dictService.getDictNameByCode("sluicewellType", alarmNowView.getWellType()));
         }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index d974fcd..e505933 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -224,7 +224,7 @@
                deptName,
                wellCode,
                POSITION as position,
-              CASE WHEN 	bds.ONLINE_STATE  <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END  AS "onlineState",
+              CASE WHEN 	dov.onlineState  <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END  AS "onlineState",
                coordinateX,
                coordinateY,
                latBaidu,
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 31348f7..cdd13f2 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -72,9 +72,9 @@
         </dependency>
 
         <!--<dependency>-->
-            <!--<groupId>org.postgresql</groupId>-->
-            <!--<artifactId>chgjdbc</artifactId>-->
-            <!--<version>6.0.3-SNAPSHOT</version>-->
+        <!--<groupId>org.postgresql</groupId>-->
+        <!--<artifactId>chgjdbc</artifactId>-->
+        <!--<version>6.0.3-SNAPSHOT</version>-->
         <!--</dependency>-->
 
         <dependency>
@@ -86,12 +86,6 @@
             <groupId>com.casic</groupId>
             <artifactId>casic-admin-core</artifactId>
             <version>${admin.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.springfox</groupId>
-                    <artifactId>springfox-swagger-ui</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
@@ -103,6 +97,8 @@
             <artifactId>casic-server-support</artifactId>
             <version>${pro.version}</version>
         </dependency>
+
+
         <!--        版本问题 nacos starter 支持boot 2.4之前版本　需通过java api方式集成-->
         <!--        <dependency>-->
         <!--            <groupId>com.alibaba.boot</groupId>-->
@@ -160,6 +156,32 @@
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
         </dependency>
+
+        <!--<dependency>-->
+            <!--<groupId>io.springfox</groupId>-->
+            <!--<artifactId>springfox-swagger2</artifactId>-->
+            <!--<version>2.9.2</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>io.springfox</groupId>-->
+            <!--<artifactId>springfox-swagger-ui</artifactId>-->
+            <!--<version>2.9.2</version>-->
+        <!--</dependency>-->
+
+        <!--&lt;!&ndash;&lt;!&ndash;引入Knife4j的官方start包,Swagger2基于Springfox2.10.5项目&ndash;&gt;&ndash;&gt;-->
+        <!--<dependency>-->
+            <!--<groupId>com.github.xiaoymin</groupId>-->
+            <!--&lt;!&ndash;使用Swagger2&ndash;&gt;-->
+            <!--<artifactId>knife4j-spring-boot-starter</artifactId>-->
+            <!--<version>3.0.3</version>-->
+            <!--<exclusions>-->
+                <!--<exclusion>-->
+                    <!--<artifactId>guava</artifactId>-->
+                    <!--<groupId>com.google.guava</groupId>-->
+                <!--</exclusion>-->
+            <!--</exclusions>-->
+        <!--</dependency>-->
+
     </dependencies>
     <build>
         <plugins>
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index 460d4db..6eebb1a 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -3,11 +3,13 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+//import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 /**
  * SpringBoot方式启动类
@@ -16,16 +18,19 @@
  * @Date 2021/06/06 12:06
  */
 @SpringBootApplication
+//@ComponentScan(
+//        excludeFilters = {@ComponentScan.Filter(
+//                type = FilterType.REGEX,
+//                pattern = {"com.casic.missiles.config.web.ShiroConfig"})})
 @EnableCaching
 @EnableScheduling
 @EnableTransactionManagement(proxyTargetClass = true)
 @EnableAsync
-@ServletComponentScan
 @Slf4j
+//@EnableSwagger2
 public class CasicApplication {
     public static void main(String[] args) {
         SpringApplication.run(CasicApplication.class, args);
         log.info("CasicApplication is success!");
     }
-
 }
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 dd163ba..3106926 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
@@ -12,6 +12,7 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+//import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -32,6 +33,7 @@
  */
 @Controller
 @RequestMapping("/route")
+//@Api(tags = "启动页")
 @Slf4j
 public class MockController extends BaseController {
 
@@ -45,9 +47,6 @@
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
             username = "admin";
-            //  mysql
-//         password = "1q2W3E4R";
-            //postgre
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
@@ -55,7 +54,6 @@
         try {
             Map<String, String> key = RSAUtils.genKeyPair();
             ShiroKit.getSession().setAttribute(PermissionConstants.PRIVATE_KEY, key.get(RSAUtils.RSAPrivateKey));
-
         } catch (NoSuchAlgorithmException e) {
             e.printStackTrace();
         }
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index fdabbf2..6e69581 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -4,7 +4,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/smartwell_demo?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
+    url: jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
     username: root
     password: Casic203
   redis:
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 9828b69..8abae38 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
@@ -25,7 +25,7 @@
 flowable:
   checkProcessDefinitions: false #不校验process文件
 casic:
-  swagger-open: false #是否开启swagger (true/false)
+  swagger-open: true #是否开启swagger (true/false)
   kaptcha-open: false #是否开启登录时验证码 (true/false)
   muti-datasource-open: false #是否开启多数据源(true/false)
   spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
@@ -60,4 +60,17 @@
       invalid-time: 86400
       host: localhost
       port: 6379
-  useOverTime: true
\ No newline at end of file
+  useOverTime: true
+swagger:
+  enable: true
+  groupName: "用户服务"
+knife4j:
+  # 开启增强配置
+  enable: true
+  # 开启Swagger的Basic认证功能,默认是false
+  basic:
+    enable: true
+    # Basic认证用户名
+    username: test
+    # Basic认证密码
+    password: 123
\ No newline at end of file

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 34cf78b..f73a747 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -49,10 +49,10 @@
      */
     @RequestMapping(value = "/alarmNow")
     @ResponseBody
-    public Object alarmNow(String alarmType) {
+    public Object alarmNow(String alarmType,Long deviceType) {
         // 查询当前有效的报警记录（status=1）
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType);
+        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType,deviceType);
         SuccessResponseData successResult = new SuccessResponseData();
         successResult.setData(alarmNowViewList);
         successResult.setMessage("success");
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
index 12a476c..50ab7cf 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
@@ -10,7 +10,7 @@
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author casic123
@@ -18,11 +18,12 @@
  */
 public interface AlarmNowViewMapper extends BaseMapper<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope,@Param("alarmType")String alarmType);
+    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope, @Param("alarmType") String alarmType,
+                                          @Param("deviceType") Long deviceType);
 
     List<AlarmNowView> getAlarmsByWell(@Param("id") Long id);
 
-    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime")String beginTime, @Param("endTime")String endTime, @Param("deptIds")String deptIds);
+    List<Map<String, Object>> staticsAlarmsByDay(@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptIds") String deptIds);
 
-    Map<String, Object> countAlarmsByDay(@Param("date")String date,@Param("deptIds")String deptIds);
+    Map<String, Object> countAlarmsByDay(@Param("date") String date, @Param("deptIds") String deptIds);
 }
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 8bb2bac..0922e75 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
@@ -555,7 +555,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY  aj.CREATE_TIME  DESC
+        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -793,8 +793,7 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like
-                <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index bc5063d..4edee65 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -22,6 +22,9 @@
         <if test="alarmType!='' and alarmType!=null">
             AND alarmtype = #{alarmType}
         </if>
+        <if test="deviceType!='' and deviceType!=null">
+            AND  devicetype = #{deviceType}
+        </if>
         ORDER BY alarmTimeDate DESC
     </select>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
index 218a145..cec1f9f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
@@ -16,6 +16,6 @@
  */
 public interface IAlarmNowViewService extends IService<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType);
+    List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType,Long deviceType);
     List<AlarmNowView> getAlarmsByWell(Long id);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
index 927dfea..38e6c48 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
@@ -26,8 +26,8 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType) {
-        List<AlarmNowView> alarmNowViewList = this.baseMapper.getNowAlarmRecords(dataScope, alarmType);
+    public List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType,Long deviceType) {
+        List<AlarmNowView> alarmNowViewList = this.baseMapper.getNowAlarmRecords(dataScope, alarmType,deviceType);
         for (AlarmNowView alarmNowView : alarmNowViewList) {
             alarmNowView.setWellTypeName(dictService.getDictNameByCode("sluicewellType", alarmNowView.getWellType()));
         }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index d974fcd..e505933 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -224,7 +224,7 @@
                deptName,
                wellCode,
                POSITION as position,
-              CASE WHEN 	bds.ONLINE_STATE  <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END  AS "onlineState",
+              CASE WHEN 	dov.onlineState  <![CDATA[ <> ]]> '0' THEN 1 ELSE 0 END  AS "onlineState",
                coordinateX,
                coordinateY,
                latBaidu,
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 31348f7..cdd13f2 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -72,9 +72,9 @@
         </dependency>
 
         <!--<dependency>-->
-            <!--<groupId>org.postgresql</groupId>-->
-            <!--<artifactId>chgjdbc</artifactId>-->
-            <!--<version>6.0.3-SNAPSHOT</version>-->
+        <!--<groupId>org.postgresql</groupId>-->
+        <!--<artifactId>chgjdbc</artifactId>-->
+        <!--<version>6.0.3-SNAPSHOT</version>-->
         <!--</dependency>-->
 
         <dependency>
@@ -86,12 +86,6 @@
             <groupId>com.casic</groupId>
             <artifactId>casic-admin-core</artifactId>
             <version>${admin.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.springfox</groupId>
-                    <artifactId>springfox-swagger-ui</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
@@ -103,6 +97,8 @@
             <artifactId>casic-server-support</artifactId>
             <version>${pro.version}</version>
         </dependency>
+
+
         <!--        版本问题 nacos starter 支持boot 2.4之前版本　需通过java api方式集成-->
         <!--        <dependency>-->
         <!--            <groupId>com.alibaba.boot</groupId>-->
@@ -160,6 +156,32 @@
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
         </dependency>
+
+        <!--<dependency>-->
+            <!--<groupId>io.springfox</groupId>-->
+            <!--<artifactId>springfox-swagger2</artifactId>-->
+            <!--<version>2.9.2</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>io.springfox</groupId>-->
+            <!--<artifactId>springfox-swagger-ui</artifactId>-->
+            <!--<version>2.9.2</version>-->
+        <!--</dependency>-->
+
+        <!--&lt;!&ndash;&lt;!&ndash;引入Knife4j的官方start包,Swagger2基于Springfox2.10.5项目&ndash;&gt;&ndash;&gt;-->
+        <!--<dependency>-->
+            <!--<groupId>com.github.xiaoymin</groupId>-->
+            <!--&lt;!&ndash;使用Swagger2&ndash;&gt;-->
+            <!--<artifactId>knife4j-spring-boot-starter</artifactId>-->
+            <!--<version>3.0.3</version>-->
+            <!--<exclusions>-->
+                <!--<exclusion>-->
+                    <!--<artifactId>guava</artifactId>-->
+                    <!--<groupId>com.google.guava</groupId>-->
+                <!--</exclusion>-->
+            <!--</exclusions>-->
+        <!--</dependency>-->
+
     </dependencies>
     <build>
         <plugins>
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index 460d4db..6eebb1a 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -3,11 +3,13 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+//import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 /**
  * SpringBoot方式启动类
@@ -16,16 +18,19 @@
  * @Date 2021/06/06 12:06
  */
 @SpringBootApplication
+//@ComponentScan(
+//        excludeFilters = {@ComponentScan.Filter(
+//                type = FilterType.REGEX,
+//                pattern = {"com.casic.missiles.config.web.ShiroConfig"})})
 @EnableCaching
 @EnableScheduling
 @EnableTransactionManagement(proxyTargetClass = true)
 @EnableAsync
-@ServletComponentScan
 @Slf4j
+//@EnableSwagger2
 public class CasicApplication {
     public static void main(String[] args) {
         SpringApplication.run(CasicApplication.class, args);
         log.info("CasicApplication is success!");
     }
-
 }
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 dd163ba..3106926 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
@@ -12,6 +12,7 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+//import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -32,6 +33,7 @@
  */
 @Controller
 @RequestMapping("/route")
+//@Api(tags = "启动页")
 @Slf4j
 public class MockController extends BaseController {
 
@@ -45,9 +47,6 @@
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
             username = "admin";
-            //  mysql
-//         password = "1q2W3E4R";
-            //postgre
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
@@ -55,7 +54,6 @@
         try {
             Map<String, String> key = RSAUtils.genKeyPair();
             ShiroKit.getSession().setAttribute(PermissionConstants.PRIVATE_KEY, key.get(RSAUtils.RSAPrivateKey));
-
         } catch (NoSuchAlgorithmException e) {
             e.printStackTrace();
         }
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index fdabbf2..6e69581 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -4,7 +4,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/smartwell_demo?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
+    url: jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
     username: root
     password: Casic203
   redis:
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 9828b69..8abae38 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
@@ -25,7 +25,7 @@
 flowable:
   checkProcessDefinitions: false #不校验process文件
 casic:
-  swagger-open: false #是否开启swagger (true/false)
+  swagger-open: true #是否开启swagger (true/false)
   kaptcha-open: false #是否开启登录时验证码 (true/false)
   muti-datasource-open: false #是否开启多数据源(true/false)
   spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
@@ -60,4 +60,17 @@
       invalid-time: 86400
       host: localhost
       port: 6379
-  useOverTime: true
\ No newline at end of file
+  useOverTime: true
+swagger:
+  enable: true
+  groupName: "用户服务"
+knife4j:
+  # 开启增强配置
+  enable: true
+  # 开启Swagger的Basic认证功能,默认是false
+  basic:
+    enable: true
+    # Basic认证用户名
+    username: test
+    # Basic认证密码
+    password: 123
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a73b599..1591db7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,8 +82,10 @@
                 <artifactId>spring-boot-starter-websocket</artifactId>
                 <version>2.4.5</version>
             </dependency>
+
         </dependencies>
     </dependencyManagement>
+
     <build>
         <pluginManagement>
             <plugins>