diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
index a69ac73..328d8e1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
@@ -39,6 +39,7 @@
         Page<PatrolLog> page = PageFactory.defaultPage();
         QueryWrapper<PatrolLog> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(ObjectUtil.isNotEmpty(requestDTO.getRouteInfoId()), "route_info_id", requestDTO.getRouteInfoId());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(requestDTO.getPatrolType()), "patrol_type", requestDTO.getPatrolType());
         queryWrapper.orderByDesc("create_time");
         return ReturnUtil.success(super.packForBT(iPatrolLogService.page(page, queryWrapper)));
     }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
index a69ac73..328d8e1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
@@ -39,6 +39,7 @@
         Page<PatrolLog> page = PageFactory.defaultPage();
         QueryWrapper<PatrolLog> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(ObjectUtil.isNotEmpty(requestDTO.getRouteInfoId()), "route_info_id", requestDTO.getRouteInfoId());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(requestDTO.getPatrolType()), "patrol_type", requestDTO.getPatrolType());
         queryWrapper.orderByDesc("create_time");
         return ReturnUtil.success(super.packForBT(iPatrolLogService.page(page, queryWrapper)));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java
index 004b2bf..85ade11 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java
@@ -43,6 +43,7 @@
         Page<RobotDogInfo> page = PageFactory.defaultPage();
         QueryWrapper<RobotDogInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRobotName()), "robot_name", requestDTO.getRobotName());
+        queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRobotCode()), "robot_code", requestDTO.getRobotCode());
         queryWrapper.eq("valid", "1");
         return ReturnUtil.success(super.packForBT(iRobotDogInfoService.page(page, queryWrapper)));
     }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
index a69ac73..328d8e1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
@@ -39,6 +39,7 @@
         Page<PatrolLog> page = PageFactory.defaultPage();
         QueryWrapper<PatrolLog> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(ObjectUtil.isNotEmpty(requestDTO.getRouteInfoId()), "route_info_id", requestDTO.getRouteInfoId());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(requestDTO.getPatrolType()), "patrol_type", requestDTO.getPatrolType());
         queryWrapper.orderByDesc("create_time");
         return ReturnUtil.success(super.packForBT(iPatrolLogService.page(page, queryWrapper)));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java
index 004b2bf..85ade11 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java
@@ -43,6 +43,7 @@
         Page<RobotDogInfo> page = PageFactory.defaultPage();
         QueryWrapper<RobotDogInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRobotName()), "robot_name", requestDTO.getRobotName());
+        queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRobotCode()), "robot_code", requestDTO.getRobotCode());
         queryWrapper.eq("valid", "1");
         return ReturnUtil.success(super.packForBT(iRobotDogInfoService.page(page, queryWrapper)));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml
index 6e5acda..7a70ff3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml
@@ -38,7 +38,11 @@
             <if test="requestDTO.robotName != null and requestDTO.robotName != ''">
                 and rd.robot_name like concat('%',#{requestDTO.robotName},'%')
             </if>
+            <if test="requestDTO.robotId != null and requestDTO.robotId !='' ">
+                and ri.robot_id =#{requestDTO.robotId}
+            </if>
         </where>
+        order by ri.create_time desc
     </select>
 
 </mapper>

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
index a69ac73..328d8e1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
@@ -39,6 +39,7 @@
         Page<PatrolLog> page = PageFactory.defaultPage();
         QueryWrapper<PatrolLog> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(ObjectUtil.isNotEmpty(requestDTO.getRouteInfoId()), "route_info_id", requestDTO.getRouteInfoId());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(requestDTO.getPatrolType()), "patrol_type", requestDTO.getPatrolType());
         queryWrapper.orderByDesc("create_time");
         return ReturnUtil.success(super.packForBT(iPatrolLogService.page(page, queryWrapper)));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java
index 004b2bf..85ade11 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java
@@ -43,6 +43,7 @@
         Page<RobotDogInfo> page = PageFactory.defaultPage();
         QueryWrapper<RobotDogInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRobotName()), "robot_name", requestDTO.getRobotName());
+        queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRobotCode()), "robot_code", requestDTO.getRobotCode());
         queryWrapper.eq("valid", "1");
         return ReturnUtil.success(super.packForBT(iRobotDogInfoService.page(page, queryWrapper)));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml
index 6e5acda..7a70ff3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml
@@ -38,7 +38,11 @@
             <if test="requestDTO.robotName != null and requestDTO.robotName != ''">
                 and rd.robot_name like concat('%',#{requestDTO.robotName},'%')
             </if>
+            <if test="requestDTO.robotId != null and requestDTO.robotId !='' ">
+                and ri.robot_id =#{requestDTO.robotId}
+            </if>
         </where>
+        order by ri.create_time desc
     </select>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/PatrolLogDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/PatrolLogDTO.java
index 1b7b208..48450ae 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/PatrolLogDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/PatrolLogDTO.java
@@ -12,7 +12,7 @@
 
     private static final long serialVersionUID = 1L;
 
-//    @ApiModelProperty("机器人id")
+    //    @ApiModelProperty("机器人id")
 //    private Long robotId;
     @ApiModelProperty("巡航线id")
     private Long routeInfoId;
@@ -22,4 +22,8 @@
 //    private String communityAddress;
 
 
+    @ApiModelProperty("巡检类型")
+    private String patrolType;
+
+
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
index a69ac73..328d8e1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
@@ -39,6 +39,7 @@
         Page<PatrolLog> page = PageFactory.defaultPage();
         QueryWrapper<PatrolLog> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(ObjectUtil.isNotEmpty(requestDTO.getRouteInfoId()), "route_info_id", requestDTO.getRouteInfoId());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(requestDTO.getPatrolType()), "patrol_type", requestDTO.getPatrolType());
         queryWrapper.orderByDesc("create_time");
         return ReturnUtil.success(super.packForBT(iPatrolLogService.page(page, queryWrapper)));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java
index 004b2bf..85ade11 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java
@@ -43,6 +43,7 @@
         Page<RobotDogInfo> page = PageFactory.defaultPage();
         QueryWrapper<RobotDogInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRobotName()), "robot_name", requestDTO.getRobotName());
+        queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRobotCode()), "robot_code", requestDTO.getRobotCode());
         queryWrapper.eq("valid", "1");
         return ReturnUtil.success(super.packForBT(iRobotDogInfoService.page(page, queryWrapper)));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml
index 6e5acda..7a70ff3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml
@@ -38,7 +38,11 @@
             <if test="requestDTO.robotName != null and requestDTO.robotName != ''">
                 and rd.robot_name like concat('%',#{requestDTO.robotName},'%')
             </if>
+            <if test="requestDTO.robotId != null and requestDTO.robotId !='' ">
+                and ri.robot_id =#{requestDTO.robotId}
+            </if>
         </where>
+        order by ri.create_time desc
     </select>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/PatrolLogDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/PatrolLogDTO.java
index 1b7b208..48450ae 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/PatrolLogDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/PatrolLogDTO.java
@@ -12,7 +12,7 @@
 
     private static final long serialVersionUID = 1L;
 
-//    @ApiModelProperty("机器人id")
+    //    @ApiModelProperty("机器人id")
 //    private Long robotId;
     @ApiModelProperty("巡航线id")
     private Long routeInfoId;
@@ -22,4 +22,8 @@
 //    private String communityAddress;
 
 
+    @ApiModelProperty("巡检类型")
+    private String patrolType;
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/RouteInfoDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/RouteInfoDTO.java
index e4bced2..f9af1e1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/RouteInfoDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/RouteInfoDTO.java
@@ -20,6 +20,8 @@
     private String communityName;
     @ApiModelProperty("小区地址")
     private String communityAddress;
+    @ApiModelProperty("机器人id")
+    private Long robotId;
 
 
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
index a69ac73..328d8e1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
@@ -39,6 +39,7 @@
         Page<PatrolLog> page = PageFactory.defaultPage();
         QueryWrapper<PatrolLog> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(ObjectUtil.isNotEmpty(requestDTO.getRouteInfoId()), "route_info_id", requestDTO.getRouteInfoId());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(requestDTO.getPatrolType()), "patrol_type", requestDTO.getPatrolType());
         queryWrapper.orderByDesc("create_time");
         return ReturnUtil.success(super.packForBT(iPatrolLogService.page(page, queryWrapper)));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java
index 004b2bf..85ade11 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java
@@ -43,6 +43,7 @@
         Page<RobotDogInfo> page = PageFactory.defaultPage();
         QueryWrapper<RobotDogInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRobotName()), "robot_name", requestDTO.getRobotName());
+        queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRobotCode()), "robot_code", requestDTO.getRobotCode());
         queryWrapper.eq("valid", "1");
         return ReturnUtil.success(super.packForBT(iRobotDogInfoService.page(page, queryWrapper)));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml
index 6e5acda..7a70ff3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml
@@ -38,7 +38,11 @@
             <if test="requestDTO.robotName != null and requestDTO.robotName != ''">
                 and rd.robot_name like concat('%',#{requestDTO.robotName},'%')
             </if>
+            <if test="requestDTO.robotId != null and requestDTO.robotId !='' ">
+                and ri.robot_id =#{requestDTO.robotId}
+            </if>
         </where>
+        order by ri.create_time desc
     </select>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/PatrolLogDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/PatrolLogDTO.java
index 1b7b208..48450ae 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/PatrolLogDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/PatrolLogDTO.java
@@ -12,7 +12,7 @@
 
     private static final long serialVersionUID = 1L;
 
-//    @ApiModelProperty("机器人id")
+    //    @ApiModelProperty("机器人id")
 //    private Long robotId;
     @ApiModelProperty("巡航线id")
     private Long routeInfoId;
@@ -22,4 +22,8 @@
 //    private String communityAddress;
 
 
+    @ApiModelProperty("巡检类型")
+    private String patrolType;
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/RouteInfoDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/RouteInfoDTO.java
index e4bced2..f9af1e1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/RouteInfoDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/RouteInfoDTO.java
@@ -20,6 +20,8 @@
     private String communityName;
     @ApiModelProperty("小区地址")
     private String communityAddress;
+    @ApiModelProperty("机器人id")
+    private Long robotId;
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
new file mode 100644
index 0000000..8328001
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.system.enums;
+
+/**
+ * @Description: 字典名枚举
+ * @Author: zt
+ * @Date: 2023/4/20 10:41
+ */
+public interface DictEnum {
+
+
+    //10006 第三方施工监测
+    //10007 闸井监测
+    //10008 引入口监测
+    //10009 调压箱监测
+    //10010 实时数据上传
+    //10010 燃气泄漏
+    String REPORT_TYPE_1 = "10006";
+    String REPORT_TYPE_2 = "10007";
+    String REPORT_TYPE_3 = "10008";
+    String REPORT_TYPE_4 = "10009";
+    String REPORT_TYPE_5 = "10010";
+    String REPORT_TYPE_6 = "10011";
+    //是否报警0:正常，1：报警
+    String IS_ALARM_0 = "0";
+    String IS_ALARM_1 = "1";
+}

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
index a69ac73..328d8e1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
@@ -39,6 +39,7 @@
         Page<PatrolLog> page = PageFactory.defaultPage();
         QueryWrapper<PatrolLog> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(ObjectUtil.isNotEmpty(requestDTO.getRouteInfoId()), "route_info_id", requestDTO.getRouteInfoId());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(requestDTO.getPatrolType()), "patrol_type", requestDTO.getPatrolType());
         queryWrapper.orderByDesc("create_time");
         return ReturnUtil.success(super.packForBT(iPatrolLogService.page(page, queryWrapper)));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java
index 004b2bf..85ade11 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java
@@ -43,6 +43,7 @@
         Page<RobotDogInfo> page = PageFactory.defaultPage();
         QueryWrapper<RobotDogInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRobotName()), "robot_name", requestDTO.getRobotName());
+        queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRobotCode()), "robot_code", requestDTO.getRobotCode());
         queryWrapper.eq("valid", "1");
         return ReturnUtil.success(super.packForBT(iRobotDogInfoService.page(page, queryWrapper)));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml
index 6e5acda..7a70ff3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml
@@ -38,7 +38,11 @@
             <if test="requestDTO.robotName != null and requestDTO.robotName != ''">
                 and rd.robot_name like concat('%',#{requestDTO.robotName},'%')
             </if>
+            <if test="requestDTO.robotId != null and requestDTO.robotId !='' ">
+                and ri.robot_id =#{requestDTO.robotId}
+            </if>
         </where>
+        order by ri.create_time desc
     </select>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/PatrolLogDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/PatrolLogDTO.java
index 1b7b208..48450ae 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/PatrolLogDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/PatrolLogDTO.java
@@ -12,7 +12,7 @@
 
     private static final long serialVersionUID = 1L;
 
-//    @ApiModelProperty("机器人id")
+    //    @ApiModelProperty("机器人id")
 //    private Long robotId;
     @ApiModelProperty("巡航线id")
     private Long routeInfoId;
@@ -22,4 +22,8 @@
 //    private String communityAddress;
 
 
+    @ApiModelProperty("巡检类型")
+    private String patrolType;
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/RouteInfoDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/RouteInfoDTO.java
index e4bced2..f9af1e1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/RouteInfoDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/RouteInfoDTO.java
@@ -20,6 +20,8 @@
     private String communityName;
     @ApiModelProperty("小区地址")
     private String communityAddress;
+    @ApiModelProperty("机器人id")
+    private Long robotId;
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
new file mode 100644
index 0000000..8328001
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.system.enums;
+
+/**
+ * @Description: 字典名枚举
+ * @Author: zt
+ * @Date: 2023/4/20 10:41
+ */
+public interface DictEnum {
+
+
+    //10006 第三方施工监测
+    //10007 闸井监测
+    //10008 引入口监测
+    //10009 调压箱监测
+    //10010 实时数据上传
+    //10010 燃气泄漏
+    String REPORT_TYPE_1 = "10006";
+    String REPORT_TYPE_2 = "10007";
+    String REPORT_TYPE_3 = "10008";
+    String REPORT_TYPE_4 = "10009";
+    String REPORT_TYPE_5 = "10010";
+    String REPORT_TYPE_6 = "10011";
+    //是否报警0:正常，1：报警
+    String IS_ALARM_0 = "0";
+    String IS_ALARM_1 = "1";
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/PatrolLogServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/PatrolLogServiceImpl.java
index 13ef474..5be8a05 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/PatrolLogServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/PatrolLogServiceImpl.java
@@ -4,10 +4,12 @@
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.common.service.ICommonFileService;
 import com.casic.missiles.modular.system.dao.PatrolLogMapper;
 import com.casic.missiles.modular.system.entity.PatrolLog;
+import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.service.IPatrolLogService;
 import com.casic.missiles.modular.system.util.CommonUtil;
 import com.casic.missiles.modular.system.util.HttpClientUtils;
@@ -43,6 +45,9 @@
     @Value("${casic.brPushUrl}")
     private String brPushUrl;
 
+
+    private volatile static Boolean leakFlag = false;
+
     /**
      * 存储算法上报的消息
      *
@@ -59,16 +64,37 @@
                     picturePath = commonFileService.saveFileBase64Image("data:image/png;base64," + picture);
                 }
                 String points = CommonUtil.getString(map, "gpsPoints");
-                patrolLogList.add(new PatrolLog(1L, CommonUtil.getString(map, "reportType"),
+                String reportType = CommonUtil.getString(map, "reportType");
+                String isAlarm = CommonUtil.getString(map, "isAlarm");
+                //若为燃气泄漏，报警只推送一次
+                if (DictEnum.REPORT_TYPE_6.equals(reportType)) {
+                    if (DictEnum.IS_ALARM_1.equals(isAlarm)) {
+                        if (leakFlag) return;
+                        leakFlag = true;
+                    } else if (DictEnum.IS_ALARM_0.equals(isAlarm)) {
+                        leakFlag = false;
+                    }
+                }
+
+                patrolLogList.add(new PatrolLog(1L, reportType,
                         CommonUtil.getString(map, "reportContent"),
                         picturePath,
                         CommonUtil.getString(map, "routeNumber"),
-                        CommonUtil.getString(map, "isAlarm"),
+                        isAlarm,
                         ObjectUtil.isNotEmpty(points) ? points.split(",")[0] : "",
                         ObjectUtil.isNotEmpty(points) ? points.split(",")[1] : "",
                         CommonUtil.getString(map, "reportValue")));
             }
-            this.saveBatch(patrolLogList);
+            //过滤掉燃气泄漏报警监测正常值
+            for (PatrolLog patrolLog : patrolLogList) {
+                if (DictEnum.REPORT_TYPE_6.equals(patrolLog.getPatrolType()) &&
+                        DictEnum.IS_ALARM_0.equals(patrolLog.getIsAlarm())) {
+                    updateGasLeakAlarm();
+
+                } else {
+                    this.save(patrolLog);
+                }
+            }
 
 
             CompletableFuture.runAsync(() -> {
@@ -83,16 +109,20 @@
                                 jsonObject.put("patrolTime", patrolLog.getCreateTime());
                                 jsonObject.put("picture", patrolLog.getPatrolPicture());
                                 jsonObject.put("isAlarm", patrolLog.getIsAlarm());
+                                jsonObject.put("gas", patrolLog.getGas());
                                 jsonObject.put("gps_x", patrolLog.getGpsX());
                                 jsonObject.put("gps_y", patrolLog.getGpsY());
                                 jsonObject.put("routeNumber", patrolLog.getRouteNumber());
                                 jsonObject.put("type", "AI");
+                                jsonObject.put("devcode", "B42D4000OCAD3N82");
                                 webSocket.sendAllMessage(jsonObject.toJSONString());
                             }
                         }
                         //推送第三方
                         if (patrolLogList.size() > 0) {
                             for (PatrolLog patrolLog : patrolLogList) {
+                                String patrolType = patrolLog.getPatrolType();
+                                if (DictEnum.REPORT_TYPE_6.equals(patrolType)) continue;
                                 Map<String, Object> parasMap = new HashMap<>();
                                 parasMap.put("alarmType", patrolLog.getPatrolType());
                                 parasMap.put("busNoChar", "B42D4000OCAD3N82");
@@ -114,4 +144,13 @@
         }
 
     }
+
+    public boolean updateGasLeakAlarm() {
+        UpdateWrapper<PatrolLog> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("patrol_type", DictEnum.REPORT_TYPE_6);
+        updateWrapper.eq("is_alarm", DictEnum.IS_ALARM_1);
+        updateWrapper.set("is_alarm", DictEnum.IS_ALARM_0);
+        updateWrapper.set("patrol_content", "燃气泄漏已恢复正常");
+        return this.update(updateWrapper);
+    }
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
index a69ac73..328d8e1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/PatrolLogController.java
@@ -39,6 +39,7 @@
         Page<PatrolLog> page = PageFactory.defaultPage();
         QueryWrapper<PatrolLog> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(ObjectUtil.isNotEmpty(requestDTO.getRouteInfoId()), "route_info_id", requestDTO.getRouteInfoId());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(requestDTO.getPatrolType()), "patrol_type", requestDTO.getPatrolType());
         queryWrapper.orderByDesc("create_time");
         return ReturnUtil.success(super.packForBT(iPatrolLogService.page(page, queryWrapper)));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java
index 004b2bf..85ade11 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RobotDogInfoController.java
@@ -43,6 +43,7 @@
         Page<RobotDogInfo> page = PageFactory.defaultPage();
         QueryWrapper<RobotDogInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRobotName()), "robot_name", requestDTO.getRobotName());
+        queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRobotCode()), "robot_code", requestDTO.getRobotCode());
         queryWrapper.eq("valid", "1");
         return ReturnUtil.success(super.packForBT(iRobotDogInfoService.page(page, queryWrapper)));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml
index 6e5acda..7a70ff3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RouteInfoMapper.xml
@@ -38,7 +38,11 @@
             <if test="requestDTO.robotName != null and requestDTO.robotName != ''">
                 and rd.robot_name like concat('%',#{requestDTO.robotName},'%')
             </if>
+            <if test="requestDTO.robotId != null and requestDTO.robotId !='' ">
+                and ri.robot_id =#{requestDTO.robotId}
+            </if>
         </where>
+        order by ri.create_time desc
     </select>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/PatrolLogDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/PatrolLogDTO.java
index 1b7b208..48450ae 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/PatrolLogDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/PatrolLogDTO.java
@@ -12,7 +12,7 @@
 
     private static final long serialVersionUID = 1L;
 
-//    @ApiModelProperty("机器人id")
+    //    @ApiModelProperty("机器人id")
 //    private Long robotId;
     @ApiModelProperty("巡航线id")
     private Long routeInfoId;
@@ -22,4 +22,8 @@
 //    private String communityAddress;
 
 
+    @ApiModelProperty("巡检类型")
+    private String patrolType;
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/RouteInfoDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/RouteInfoDTO.java
index e4bced2..f9af1e1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/RouteInfoDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/RouteInfoDTO.java
@@ -20,6 +20,8 @@
     private String communityName;
     @ApiModelProperty("小区地址")
     private String communityAddress;
+    @ApiModelProperty("机器人id")
+    private Long robotId;
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
new file mode 100644
index 0000000..8328001
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.system.enums;
+
+/**
+ * @Description: 字典名枚举
+ * @Author: zt
+ * @Date: 2023/4/20 10:41
+ */
+public interface DictEnum {
+
+
+    //10006 第三方施工监测
+    //10007 闸井监测
+    //10008 引入口监测
+    //10009 调压箱监测
+    //10010 实时数据上传
+    //10010 燃气泄漏
+    String REPORT_TYPE_1 = "10006";
+    String REPORT_TYPE_2 = "10007";
+    String REPORT_TYPE_3 = "10008";
+    String REPORT_TYPE_4 = "10009";
+    String REPORT_TYPE_5 = "10010";
+    String REPORT_TYPE_6 = "10011";
+    //是否报警0:正常，1：报警
+    String IS_ALARM_0 = "0";
+    String IS_ALARM_1 = "1";
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/PatrolLogServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/PatrolLogServiceImpl.java
index 13ef474..5be8a05 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/PatrolLogServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/PatrolLogServiceImpl.java
@@ -4,10 +4,12 @@
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.common.service.ICommonFileService;
 import com.casic.missiles.modular.system.dao.PatrolLogMapper;
 import com.casic.missiles.modular.system.entity.PatrolLog;
+import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.service.IPatrolLogService;
 import com.casic.missiles.modular.system.util.CommonUtil;
 import com.casic.missiles.modular.system.util.HttpClientUtils;
@@ -43,6 +45,9 @@
     @Value("${casic.brPushUrl}")
     private String brPushUrl;
 
+
+    private volatile static Boolean leakFlag = false;
+
     /**
      * 存储算法上报的消息
      *
@@ -59,16 +64,37 @@
                     picturePath = commonFileService.saveFileBase64Image("data:image/png;base64," + picture);
                 }
                 String points = CommonUtil.getString(map, "gpsPoints");
-                patrolLogList.add(new PatrolLog(1L, CommonUtil.getString(map, "reportType"),
+                String reportType = CommonUtil.getString(map, "reportType");
+                String isAlarm = CommonUtil.getString(map, "isAlarm");
+                //若为燃气泄漏，报警只推送一次
+                if (DictEnum.REPORT_TYPE_6.equals(reportType)) {
+                    if (DictEnum.IS_ALARM_1.equals(isAlarm)) {
+                        if (leakFlag) return;
+                        leakFlag = true;
+                    } else if (DictEnum.IS_ALARM_0.equals(isAlarm)) {
+                        leakFlag = false;
+                    }
+                }
+
+                patrolLogList.add(new PatrolLog(1L, reportType,
                         CommonUtil.getString(map, "reportContent"),
                         picturePath,
                         CommonUtil.getString(map, "routeNumber"),
-                        CommonUtil.getString(map, "isAlarm"),
+                        isAlarm,
                         ObjectUtil.isNotEmpty(points) ? points.split(",")[0] : "",
                         ObjectUtil.isNotEmpty(points) ? points.split(",")[1] : "",
                         CommonUtil.getString(map, "reportValue")));
             }
-            this.saveBatch(patrolLogList);
+            //过滤掉燃气泄漏报警监测正常值
+            for (PatrolLog patrolLog : patrolLogList) {
+                if (DictEnum.REPORT_TYPE_6.equals(patrolLog.getPatrolType()) &&
+                        DictEnum.IS_ALARM_0.equals(patrolLog.getIsAlarm())) {
+                    updateGasLeakAlarm();
+
+                } else {
+                    this.save(patrolLog);
+                }
+            }
 
 
             CompletableFuture.runAsync(() -> {
@@ -83,16 +109,20 @@
                                 jsonObject.put("patrolTime", patrolLog.getCreateTime());
                                 jsonObject.put("picture", patrolLog.getPatrolPicture());
                                 jsonObject.put("isAlarm", patrolLog.getIsAlarm());
+                                jsonObject.put("gas", patrolLog.getGas());
                                 jsonObject.put("gps_x", patrolLog.getGpsX());
                                 jsonObject.put("gps_y", patrolLog.getGpsY());
                                 jsonObject.put("routeNumber", patrolLog.getRouteNumber());
                                 jsonObject.put("type", "AI");
+                                jsonObject.put("devcode", "B42D4000OCAD3N82");
                                 webSocket.sendAllMessage(jsonObject.toJSONString());
                             }
                         }
                         //推送第三方
                         if (patrolLogList.size() > 0) {
                             for (PatrolLog patrolLog : patrolLogList) {
+                                String patrolType = patrolLog.getPatrolType();
+                                if (DictEnum.REPORT_TYPE_6.equals(patrolType)) continue;
                                 Map<String, Object> parasMap = new HashMap<>();
                                 parasMap.put("alarmType", patrolLog.getPatrolType());
                                 parasMap.put("busNoChar", "B42D4000OCAD3N82");
@@ -114,4 +144,13 @@
         }
 
     }
+
+    public boolean updateGasLeakAlarm() {
+        UpdateWrapper<PatrolLog> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("patrol_type", DictEnum.REPORT_TYPE_6);
+        updateWrapper.eq("is_alarm", DictEnum.IS_ALARM_1);
+        updateWrapper.set("is_alarm", DictEnum.IS_ALARM_0);
+        updateWrapper.set("patrol_content", "燃气泄漏已恢复正常");
+        return this.update(updateWrapper);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RouteInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RouteInfoServiceImpl.java
index c42bafa..0958aed 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RouteInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RouteInfoServiceImpl.java
@@ -60,6 +60,8 @@
         }
         //由于机器人只能有一条有效的巡航线，其他已录入的更新成无效
         deleteRouteInfo(routeInfo.getRobotId());
+        //更新机器人绑定的巡航线
+        iRobotDogInfoService.updateRobotDogLine(iRobotDogInfoService.getById(routeInfo.getRobotId()).getRobotCode(), routeInfoId);
         return true;
     }