diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4db8723..f6dbcb6 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -16,6 +16,7 @@
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     RUN_TIME_FAILED(2502, "此段时间都小于当前时间无法开启"),
     CRUISE_NAME_DUPLICATE(2503, "巡航路径名称重复"),
+    CRUISE_DELETE_FAIL(2506, "该巡航线在任务中正在启用状态，无法删除"),
     CRUISE_DELETE_ERROR(2504, "巡航路径删除过程中对设备操作异常"),
     ALARM_BASE64_ERROR(2505, "算法报警图片base64无效");
 

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4db8723..f6dbcb6 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -16,6 +16,7 @@
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     RUN_TIME_FAILED(2502, "此段时间都小于当前时间无法开启"),
     CRUISE_NAME_DUPLICATE(2503, "巡航路径名称重复"),
+    CRUISE_DELETE_FAIL(2506, "该巡航线在任务中正在启用状态，无法删除"),
     CRUISE_DELETE_ERROR(2504, "巡航路径删除过程中对设备操作异常"),
     ALARM_BASE64_ERROR(2505, "算法报警图片base64无效");
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
index 7e97d2e..6e2cc3f 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
@@ -65,11 +65,12 @@
         <if test="request.endTime!='' and request.endTime!=null">
             AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
         </if>
+        order by ar.ALARM_TIME desc
     </select>
 
     <select id="detail" resultType="com.casic.missiles.modular.system.dto.AlarmRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
+        distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts,
         <include refid="monitor_Column_List"/>,
         bs.STATION_NAME as stationName,
         bo.LINE_NAME as lineName

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4db8723..f6dbcb6 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -16,6 +16,7 @@
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     RUN_TIME_FAILED(2502, "此段时间都小于当前时间无法开启"),
     CRUISE_NAME_DUPLICATE(2503, "巡航路径名称重复"),
+    CRUISE_DELETE_FAIL(2506, "该巡航线在任务中正在启用状态，无法删除"),
     CRUISE_DELETE_ERROR(2504, "巡航路径删除过程中对设备操作异常"),
     ALARM_BASE64_ERROR(2505, "算法报警图片base64无效");
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
index 7e97d2e..6e2cc3f 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
@@ -65,11 +65,12 @@
         <if test="request.endTime!='' and request.endTime!=null">
             AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
         </if>
+        order by ar.ALARM_TIME desc
     </select>
 
     <select id="detail" resultType="com.casic.missiles.modular.system.dto.AlarmRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
+        distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts,
         <include refid="monitor_Column_List"/>,
         bs.STATION_NAME as stationName,
         bo.LINE_NAME as lineName
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index e4aa1eb..d7db028 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -52,9 +52,11 @@
         ElasticSearchQuery elasticSearchQuery = new ElasticSearchQuery();
         if (CollectionUtils.isNotEmpty(obserpoiInfoList)) {
             for (BusObserpoiInfo busObserpoiInfo : obserpoiInfoList) {
-                ElasticSearchQuery mustQuery = new ElasticSearchQuery();
-                elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
-                        .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                if (ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection()) && ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection())) {
+                    ElasticSearchQuery mustQuery = new ElasticSearchQuery();
+                    elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
+                            .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                }
             }
         }
         elasticSearchQuery.endShould();

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4db8723..f6dbcb6 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -16,6 +16,7 @@
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     RUN_TIME_FAILED(2502, "此段时间都小于当前时间无法开启"),
     CRUISE_NAME_DUPLICATE(2503, "巡航路径名称重复"),
+    CRUISE_DELETE_FAIL(2506, "该巡航线在任务中正在启用状态，无法删除"),
     CRUISE_DELETE_ERROR(2504, "巡航路径删除过程中对设备操作异常"),
     ALARM_BASE64_ERROR(2505, "算法报警图片base64无效");
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
index 7e97d2e..6e2cc3f 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
@@ -65,11 +65,12 @@
         <if test="request.endTime!='' and request.endTime!=null">
             AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
         </if>
+        order by ar.ALARM_TIME desc
     </select>
 
     <select id="detail" resultType="com.casic.missiles.modular.system.dto.AlarmRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
+        distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts,
         <include refid="monitor_Column_List"/>,
         bs.STATION_NAME as stationName,
         bo.LINE_NAME as lineName
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index e4aa1eb..d7db028 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -52,9 +52,11 @@
         ElasticSearchQuery elasticSearchQuery = new ElasticSearchQuery();
         if (CollectionUtils.isNotEmpty(obserpoiInfoList)) {
             for (BusObserpoiInfo busObserpoiInfo : obserpoiInfoList) {
-                ElasticSearchQuery mustQuery = new ElasticSearchQuery();
-                elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
-                        .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                if (ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection()) && ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection())) {
+                    ElasticSearchQuery mustQuery = new ElasticSearchQuery();
+                    elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
+                            .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                }
             }
         }
         elasticSearchQuery.endShould();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
index 34fb08a..d2a6cf9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
@@ -270,7 +270,7 @@
      */
     @RequestMapping("/toPosition")
     @ResponseBody
-    public Object angle(String deviceIp, String horizontalAngle, String verticalAngle) {
+    public Object toPosition(String deviceIp, String horizontalAngle, String verticalAngle) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
             return ResponseData.error("设备注册失败");
@@ -280,6 +280,8 @@
         if (ObjectUtil.isNotEmpty(monipoiInfo) && DeviceTypeEnum.SELF_TYPE.getCode().equals(monipoiInfo.getDeviceType())) {
             res = ihcNetService.setPosition(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         } else {
+            //先停止
+            ihcNetService.stopDevice(userId);
             res = ihcNetService.setPositionNew(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         }
         return res ? ResponseData.success() : ResponseData.error("请求失败");

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4db8723..f6dbcb6 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -16,6 +16,7 @@
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     RUN_TIME_FAILED(2502, "此段时间都小于当前时间无法开启"),
     CRUISE_NAME_DUPLICATE(2503, "巡航路径名称重复"),
+    CRUISE_DELETE_FAIL(2506, "该巡航线在任务中正在启用状态，无法删除"),
     CRUISE_DELETE_ERROR(2504, "巡航路径删除过程中对设备操作异常"),
     ALARM_BASE64_ERROR(2505, "算法报警图片base64无效");
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
index 7e97d2e..6e2cc3f 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
@@ -65,11 +65,12 @@
         <if test="request.endTime!='' and request.endTime!=null">
             AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
         </if>
+        order by ar.ALARM_TIME desc
     </select>
 
     <select id="detail" resultType="com.casic.missiles.modular.system.dto.AlarmRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
+        distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts,
         <include refid="monitor_Column_List"/>,
         bs.STATION_NAME as stationName,
         bo.LINE_NAME as lineName
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index e4aa1eb..d7db028 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -52,9 +52,11 @@
         ElasticSearchQuery elasticSearchQuery = new ElasticSearchQuery();
         if (CollectionUtils.isNotEmpty(obserpoiInfoList)) {
             for (BusObserpoiInfo busObserpoiInfo : obserpoiInfoList) {
-                ElasticSearchQuery mustQuery = new ElasticSearchQuery();
-                elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
-                        .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                if (ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection()) && ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection())) {
+                    ElasticSearchQuery mustQuery = new ElasticSearchQuery();
+                    elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
+                            .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                }
             }
         }
         elasticSearchQuery.endShould();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
index 34fb08a..d2a6cf9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
@@ -270,7 +270,7 @@
      */
     @RequestMapping("/toPosition")
     @ResponseBody
-    public Object angle(String deviceIp, String horizontalAngle, String verticalAngle) {
+    public Object toPosition(String deviceIp, String horizontalAngle, String verticalAngle) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
             return ResponseData.error("设备注册失败");
@@ -280,6 +280,8 @@
         if (ObjectUtil.isNotEmpty(monipoiInfo) && DeviceTypeEnum.SELF_TYPE.getCode().equals(monipoiInfo.getDeviceType())) {
             res = ihcNetService.setPosition(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         } else {
+            //先停止
+            ihcNetService.stopDevice(userId);
             res = ihcNetService.setPositionNew(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         }
         return res ? ResponseData.success() : ResponseData.error("请求失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index c69204f..53f0317 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -25,7 +25,7 @@
         SELECT
         <include refid="Base_Column_List"/>,monitorName,dept_id,lineName
         FROM
-            bus_plan bp
+        bus_plan bp
         JOIN (
             SELECT line_name AS  lineName,monitor_id,LINE_NUM as lineNum
             FROM bus_obserpoi_info

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4db8723..f6dbcb6 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -16,6 +16,7 @@
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     RUN_TIME_FAILED(2502, "此段时间都小于当前时间无法开启"),
     CRUISE_NAME_DUPLICATE(2503, "巡航路径名称重复"),
+    CRUISE_DELETE_FAIL(2506, "该巡航线在任务中正在启用状态，无法删除"),
     CRUISE_DELETE_ERROR(2504, "巡航路径删除过程中对设备操作异常"),
     ALARM_BASE64_ERROR(2505, "算法报警图片base64无效");
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
index 7e97d2e..6e2cc3f 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
@@ -65,11 +65,12 @@
         <if test="request.endTime!='' and request.endTime!=null">
             AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
         </if>
+        order by ar.ALARM_TIME desc
     </select>
 
     <select id="detail" resultType="com.casic.missiles.modular.system.dto.AlarmRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
+        distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts,
         <include refid="monitor_Column_List"/>,
         bs.STATION_NAME as stationName,
         bo.LINE_NAME as lineName
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index e4aa1eb..d7db028 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -52,9 +52,11 @@
         ElasticSearchQuery elasticSearchQuery = new ElasticSearchQuery();
         if (CollectionUtils.isNotEmpty(obserpoiInfoList)) {
             for (BusObserpoiInfo busObserpoiInfo : obserpoiInfoList) {
-                ElasticSearchQuery mustQuery = new ElasticSearchQuery();
-                elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
-                        .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                if (ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection()) && ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection())) {
+                    ElasticSearchQuery mustQuery = new ElasticSearchQuery();
+                    elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
+                            .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                }
             }
         }
         elasticSearchQuery.endShould();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
index 34fb08a..d2a6cf9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
@@ -270,7 +270,7 @@
      */
     @RequestMapping("/toPosition")
     @ResponseBody
-    public Object angle(String deviceIp, String horizontalAngle, String verticalAngle) {
+    public Object toPosition(String deviceIp, String horizontalAngle, String verticalAngle) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
             return ResponseData.error("设备注册失败");
@@ -280,6 +280,8 @@
         if (ObjectUtil.isNotEmpty(monipoiInfo) && DeviceTypeEnum.SELF_TYPE.getCode().equals(monipoiInfo.getDeviceType())) {
             res = ihcNetService.setPosition(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         } else {
+            //先停止
+            ihcNetService.stopDevice(userId);
             res = ihcNetService.setPositionNew(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         }
         return res ? ResponseData.success() : ResponseData.error("请求失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index c69204f..53f0317 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -25,7 +25,7 @@
         SELECT
         <include refid="Base_Column_List"/>,monitorName,dept_id,lineName
         FROM
-            bus_plan bp
+        bus_plan bp
         JOIN (
             SELECT line_name AS  lineName,monitor_id,LINE_NUM as lineNum
             FROM bus_obserpoi_info
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
index 5b9638c..31ae19a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
@@ -25,4 +25,8 @@
 
     List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan);
 
+    boolean getTaskOnByMonitorIdAndLine(Long monitorId, int  lineNum);
+
+    boolean deleteTaskByMonitorIdAndLine(Long monitorId, int  lineNum);
+
 }

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4db8723..f6dbcb6 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -16,6 +16,7 @@
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     RUN_TIME_FAILED(2502, "此段时间都小于当前时间无法开启"),
     CRUISE_NAME_DUPLICATE(2503, "巡航路径名称重复"),
+    CRUISE_DELETE_FAIL(2506, "该巡航线在任务中正在启用状态，无法删除"),
     CRUISE_DELETE_ERROR(2504, "巡航路径删除过程中对设备操作异常"),
     ALARM_BASE64_ERROR(2505, "算法报警图片base64无效");
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
index 7e97d2e..6e2cc3f 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
@@ -65,11 +65,12 @@
         <if test="request.endTime!='' and request.endTime!=null">
             AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
         </if>
+        order by ar.ALARM_TIME desc
     </select>
 
     <select id="detail" resultType="com.casic.missiles.modular.system.dto.AlarmRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
+        distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts,
         <include refid="monitor_Column_List"/>,
         bs.STATION_NAME as stationName,
         bo.LINE_NAME as lineName
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index e4aa1eb..d7db028 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -52,9 +52,11 @@
         ElasticSearchQuery elasticSearchQuery = new ElasticSearchQuery();
         if (CollectionUtils.isNotEmpty(obserpoiInfoList)) {
             for (BusObserpoiInfo busObserpoiInfo : obserpoiInfoList) {
-                ElasticSearchQuery mustQuery = new ElasticSearchQuery();
-                elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
-                        .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                if (ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection()) && ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection())) {
+                    ElasticSearchQuery mustQuery = new ElasticSearchQuery();
+                    elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
+                            .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                }
             }
         }
         elasticSearchQuery.endShould();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
index 34fb08a..d2a6cf9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
@@ -270,7 +270,7 @@
      */
     @RequestMapping("/toPosition")
     @ResponseBody
-    public Object angle(String deviceIp, String horizontalAngle, String verticalAngle) {
+    public Object toPosition(String deviceIp, String horizontalAngle, String verticalAngle) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
             return ResponseData.error("设备注册失败");
@@ -280,6 +280,8 @@
         if (ObjectUtil.isNotEmpty(monipoiInfo) && DeviceTypeEnum.SELF_TYPE.getCode().equals(monipoiInfo.getDeviceType())) {
             res = ihcNetService.setPosition(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         } else {
+            //先停止
+            ihcNetService.stopDevice(userId);
             res = ihcNetService.setPositionNew(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         }
         return res ? ResponseData.success() : ResponseData.error("请求失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index c69204f..53f0317 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -25,7 +25,7 @@
         SELECT
         <include refid="Base_Column_List"/>,monitorName,dept_id,lineName
         FROM
-            bus_plan bp
+        bus_plan bp
         JOIN (
             SELECT line_name AS  lineName,monitor_id,LINE_NUM as lineNum
             FROM bus_obserpoi_info
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
index 5b9638c..31ae19a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
@@ -25,4 +25,8 @@
 
     List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan);
 
+    boolean getTaskOnByMonitorIdAndLine(Long monitorId, int  lineNum);
+
+    boolean deleteTaskByMonitorIdAndLine(Long monitorId, int  lineNum);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
index 61262eb..178ee90 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
@@ -54,6 +54,8 @@
 
     boolean interruptStart(String deviceIp) ;
 
+    boolean stopDevice(Long userId) ;
+
     Long getUserIdByIp(String deviceIp);
 
     void globalSet(GlobalParamsDTO globalParamsDTO);

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4db8723..f6dbcb6 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -16,6 +16,7 @@
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     RUN_TIME_FAILED(2502, "此段时间都小于当前时间无法开启"),
     CRUISE_NAME_DUPLICATE(2503, "巡航路径名称重复"),
+    CRUISE_DELETE_FAIL(2506, "该巡航线在任务中正在启用状态，无法删除"),
     CRUISE_DELETE_ERROR(2504, "巡航路径删除过程中对设备操作异常"),
     ALARM_BASE64_ERROR(2505, "算法报警图片base64无效");
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
index 7e97d2e..6e2cc3f 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
@@ -65,11 +65,12 @@
         <if test="request.endTime!='' and request.endTime!=null">
             AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
         </if>
+        order by ar.ALARM_TIME desc
     </select>
 
     <select id="detail" resultType="com.casic.missiles.modular.system.dto.AlarmRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
+        distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts,
         <include refid="monitor_Column_List"/>,
         bs.STATION_NAME as stationName,
         bo.LINE_NAME as lineName
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index e4aa1eb..d7db028 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -52,9 +52,11 @@
         ElasticSearchQuery elasticSearchQuery = new ElasticSearchQuery();
         if (CollectionUtils.isNotEmpty(obserpoiInfoList)) {
             for (BusObserpoiInfo busObserpoiInfo : obserpoiInfoList) {
-                ElasticSearchQuery mustQuery = new ElasticSearchQuery();
-                elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
-                        .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                if (ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection()) && ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection())) {
+                    ElasticSearchQuery mustQuery = new ElasticSearchQuery();
+                    elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
+                            .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                }
             }
         }
         elasticSearchQuery.endShould();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
index 34fb08a..d2a6cf9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
@@ -270,7 +270,7 @@
      */
     @RequestMapping("/toPosition")
     @ResponseBody
-    public Object angle(String deviceIp, String horizontalAngle, String verticalAngle) {
+    public Object toPosition(String deviceIp, String horizontalAngle, String verticalAngle) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
             return ResponseData.error("设备注册失败");
@@ -280,6 +280,8 @@
         if (ObjectUtil.isNotEmpty(monipoiInfo) && DeviceTypeEnum.SELF_TYPE.getCode().equals(monipoiInfo.getDeviceType())) {
             res = ihcNetService.setPosition(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         } else {
+            //先停止
+            ihcNetService.stopDevice(userId);
             res = ihcNetService.setPositionNew(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         }
         return res ? ResponseData.success() : ResponseData.error("请求失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index c69204f..53f0317 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -25,7 +25,7 @@
         SELECT
         <include refid="Base_Column_List"/>,monitorName,dept_id,lineName
         FROM
-            bus_plan bp
+        bus_plan bp
         JOIN (
             SELECT line_name AS  lineName,monitor_id,LINE_NUM as lineNum
             FROM bus_obserpoi_info
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
index 5b9638c..31ae19a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
@@ -25,4 +25,8 @@
 
     List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan);
 
+    boolean getTaskOnByMonitorIdAndLine(Long monitorId, int  lineNum);
+
+    boolean deleteTaskByMonitorIdAndLine(Long monitorId, int  lineNum);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
index 61262eb..178ee90 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
@@ -54,6 +54,8 @@
 
     boolean interruptStart(String deviceIp) ;
 
+    boolean stopDevice(Long userId) ;
+
     Long getUserIdByIp(String deviceIp);
 
     void globalSet(GlobalParamsDTO globalParamsDTO);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
index 6df5d0c..870559a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -213,4 +214,21 @@
         return false;
     }
 
+
+    @Override
+    public boolean getTaskOnByMonitorIdAndLine(Long monitorId, int lineNum) {
+        QueryWrapper<BusPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("MONITOR_ID", monitorId);
+        queryWrapper.eq("LINE_NUM", lineNum);
+        queryWrapper.eq("STATUS", StatusEnum.STATUS_OPEN);
+        return ObjectUtil.isNotEmpty(this.list(queryWrapper)) ? true : false;
+    }
+
+    @Override
+    public boolean deleteTaskByMonitorIdAndLine(Long monitorId, int lineNum) {
+        QueryWrapper<BusPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("MONITOR_ID", monitorId);
+        queryWrapper.eq("LINE_NUM", lineNum);
+        return this.baseMapper.delete(queryWrapper)>0?true:false;
+    }
 }

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4db8723..f6dbcb6 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -16,6 +16,7 @@
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     RUN_TIME_FAILED(2502, "此段时间都小于当前时间无法开启"),
     CRUISE_NAME_DUPLICATE(2503, "巡航路径名称重复"),
+    CRUISE_DELETE_FAIL(2506, "该巡航线在任务中正在启用状态，无法删除"),
     CRUISE_DELETE_ERROR(2504, "巡航路径删除过程中对设备操作异常"),
     ALARM_BASE64_ERROR(2505, "算法报警图片base64无效");
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
index 7e97d2e..6e2cc3f 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
@@ -65,11 +65,12 @@
         <if test="request.endTime!='' and request.endTime!=null">
             AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
         </if>
+        order by ar.ALARM_TIME desc
     </select>
 
     <select id="detail" resultType="com.casic.missiles.modular.system.dto.AlarmRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
+        distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts,
         <include refid="monitor_Column_List"/>,
         bs.STATION_NAME as stationName,
         bo.LINE_NAME as lineName
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index e4aa1eb..d7db028 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -52,9 +52,11 @@
         ElasticSearchQuery elasticSearchQuery = new ElasticSearchQuery();
         if (CollectionUtils.isNotEmpty(obserpoiInfoList)) {
             for (BusObserpoiInfo busObserpoiInfo : obserpoiInfoList) {
-                ElasticSearchQuery mustQuery = new ElasticSearchQuery();
-                elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
-                        .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                if (ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection()) && ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection())) {
+                    ElasticSearchQuery mustQuery = new ElasticSearchQuery();
+                    elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
+                            .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                }
             }
         }
         elasticSearchQuery.endShould();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
index 34fb08a..d2a6cf9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
@@ -270,7 +270,7 @@
      */
     @RequestMapping("/toPosition")
     @ResponseBody
-    public Object angle(String deviceIp, String horizontalAngle, String verticalAngle) {
+    public Object toPosition(String deviceIp, String horizontalAngle, String verticalAngle) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
             return ResponseData.error("设备注册失败");
@@ -280,6 +280,8 @@
         if (ObjectUtil.isNotEmpty(monipoiInfo) && DeviceTypeEnum.SELF_TYPE.getCode().equals(monipoiInfo.getDeviceType())) {
             res = ihcNetService.setPosition(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         } else {
+            //先停止
+            ihcNetService.stopDevice(userId);
             res = ihcNetService.setPositionNew(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         }
         return res ? ResponseData.success() : ResponseData.error("请求失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index c69204f..53f0317 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -25,7 +25,7 @@
         SELECT
         <include refid="Base_Column_List"/>,monitorName,dept_id,lineName
         FROM
-            bus_plan bp
+        bus_plan bp
         JOIN (
             SELECT line_name AS  lineName,monitor_id,LINE_NUM as lineNum
             FROM bus_obserpoi_info
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
index 5b9638c..31ae19a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
@@ -25,4 +25,8 @@
 
     List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan);
 
+    boolean getTaskOnByMonitorIdAndLine(Long monitorId, int  lineNum);
+
+    boolean deleteTaskByMonitorIdAndLine(Long monitorId, int  lineNum);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
index 61262eb..178ee90 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
@@ -54,6 +54,8 @@
 
     boolean interruptStart(String deviceIp) ;
 
+    boolean stopDevice(Long userId) ;
+
     Long getUserIdByIp(String deviceIp);
 
     void globalSet(GlobalParamsDTO globalParamsDTO);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
index 6df5d0c..870559a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -213,4 +214,21 @@
         return false;
     }
 
+
+    @Override
+    public boolean getTaskOnByMonitorIdAndLine(Long monitorId, int lineNum) {
+        QueryWrapper<BusPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("MONITOR_ID", monitorId);
+        queryWrapper.eq("LINE_NUM", lineNum);
+        queryWrapper.eq("STATUS", StatusEnum.STATUS_OPEN);
+        return ObjectUtil.isNotEmpty(this.list(queryWrapper)) ? true : false;
+    }
+
+    @Override
+    public boolean deleteTaskByMonitorIdAndLine(Long monitorId, int lineNum) {
+        QueryWrapper<BusPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("MONITOR_ID", monitorId);
+        queryWrapper.eq("LINE_NUM", lineNum);
+        return this.baseMapper.delete(queryWrapper)>0?true:false;
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
index af08323..2f62c1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
@@ -49,7 +49,7 @@
     private static final Integer delayTime = 7200;
 
     //特殊预置点号数组
-    private static final Integer[] presets = {65,67,68,69,70,72,73,82,87,88,90,92,114,121,122,129};
+    private static final Integer[] presets = {65, 67, 68, 69, 70, 72, 73, 82, 87, 88, 90, 92, 114, 121, 122, 129};
 
     public Long getTimestampCollcect() {
         return timestampCollcect;
@@ -70,6 +70,8 @@
     @Autowired
     private IAlarmRecordService alarmRecordService;
     @Autowired
+    private IBusPlanService busPlanService;
+    @Autowired
     private WebSocket webSocket;
     @Value("${casic.panTilt.defaultStoptime:5}")
     private String defaultStoptime;
@@ -514,6 +516,18 @@
     }
 
     @Override
+    public boolean stopDevice(Long userId) {
+        try {
+            Long serialHandle = serialHandle(Long.valueOf(userId));
+            Thread.sleep(300);
+            return sendStopCommand(serialHandle);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    @Override
     public boolean interruptStart(String deviceIp) {
 
         BusMonipoiInfo monipoiInfo = monipoiInfoService.selectByDeviceIp(deviceIp);
@@ -683,7 +697,7 @@
                 res = cruiseEdit(cruiseName, deviceIp, cruiseValue);
                 break;
             case "cruiseDelete":
-                res = cruiseDelete( deviceIp, cruiseName, cruiseValue);
+                res = cruiseDelete(deviceIp, cruiseName, cruiseValue);
                 break;
             default:
                 break;
@@ -714,7 +728,7 @@
     private boolean cruiseDelete(String deviceIp, String cruiseName, Integer cruiseValue) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
-             throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
+            throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
         }
         Long serialHandle = serialHandle(Long.valueOf(userId));
         List<BusObserpoiInfo> busObserpoiInfoList = obserpoiInfoService.selectByMonitor(deviceIp, cruiseValue);
@@ -725,6 +739,10 @@
         }
         try {
             BusMonipoiInfo busMonipoiInfo = monipoiInfoService.selectByDeviceIp(deviceIp);
+            //先查询是否有巡航任务正在执行
+            if (busPlanService.getTaskOnByMonitorIdAndLine(busMonipoiInfo.getId(), cruiseValue)) {
+                throw new BusinessException(BusinessExceptionEnum.CRUISE_DELETE_FAIL);
+            }
             //先停止巡航
             if (DeviceTypeEnum.XST_TYPE.getCode().equals(busMonipoiInfo.getDeviceType())) {
                 sendStopCommand(serialHandle);
@@ -743,7 +761,8 @@
                     }
                 });
             }
-            return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue);
+            return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue) &&
+                    busPlanService.deleteTaskByMonitorIdAndLine(busMonipoiInfo.getId(), cruiseValue);
         } catch (Exception e) {
             throw new BusinessException(BusinessExceptionEnum.CRUISE_DELETE_ERROR);
         }
@@ -923,7 +942,10 @@
                     //给解码板设置预置位
                     Long serialHandle = serialHandle(Long.valueOf(userId));
                     Thread.sleep(300);
-                    flag = paramsSet(userId, serialHandle, presetIndex, stopTime, speed, alarmValue);
+                    if (setPreset(serialHandle, presetIndex)) {
+                        Thread.sleep(300);
+                        flag = paramsSet(userId, serialHandle, presetIndex, stopTime, speed, alarmValue);
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                     flag = false;
@@ -1351,6 +1373,8 @@
 
     @Override
     public void sendDeviceStatusData(String deviceIp, String deviceStatus) {
+        System.out.println(new Date() + ":" + deviceIp.concat("+ 设备状态-->").concat(deviceStatus));
+
         JSONObject msg = new JSONObject();
         msg.put("deviceIp", deviceIp);
         msg.put("time", DateUtil.formatDateTime(new Date()));
@@ -2012,6 +2036,8 @@
                 throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
             }
             Long serialHandle = serialHandle(Long.valueOf(userId));
+            //先停止设备
+            this.stopDevice(serialHandle);
             //设置全局报警值
             if (ObjectUtil.isNotEmpty(globalParamsDTO.getHigh())) {
                 this.setWholeAlarmValue(userId.intValue(), serialHandle, globalParamsDTO.getHigh());

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4db8723..f6dbcb6 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -16,6 +16,7 @@
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     RUN_TIME_FAILED(2502, "此段时间都小于当前时间无法开启"),
     CRUISE_NAME_DUPLICATE(2503, "巡航路径名称重复"),
+    CRUISE_DELETE_FAIL(2506, "该巡航线在任务中正在启用状态，无法删除"),
     CRUISE_DELETE_ERROR(2504, "巡航路径删除过程中对设备操作异常"),
     ALARM_BASE64_ERROR(2505, "算法报警图片base64无效");
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
index 7e97d2e..6e2cc3f 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
@@ -65,11 +65,12 @@
         <if test="request.endTime!='' and request.endTime!=null">
             AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
         </if>
+        order by ar.ALARM_TIME desc
     </select>
 
     <select id="detail" resultType="com.casic.missiles.modular.system.dto.AlarmRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
+        distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts,
         <include refid="monitor_Column_List"/>,
         bs.STATION_NAME as stationName,
         bo.LINE_NAME as lineName
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index e4aa1eb..d7db028 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -52,9 +52,11 @@
         ElasticSearchQuery elasticSearchQuery = new ElasticSearchQuery();
         if (CollectionUtils.isNotEmpty(obserpoiInfoList)) {
             for (BusObserpoiInfo busObserpoiInfo : obserpoiInfoList) {
-                ElasticSearchQuery mustQuery = new ElasticSearchQuery();
-                elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
-                        .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                if (ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection()) && ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection())) {
+                    ElasticSearchQuery mustQuery = new ElasticSearchQuery();
+                    elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
+                            .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                }
             }
         }
         elasticSearchQuery.endShould();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
index 34fb08a..d2a6cf9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
@@ -270,7 +270,7 @@
      */
     @RequestMapping("/toPosition")
     @ResponseBody
-    public Object angle(String deviceIp, String horizontalAngle, String verticalAngle) {
+    public Object toPosition(String deviceIp, String horizontalAngle, String verticalAngle) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
             return ResponseData.error("设备注册失败");
@@ -280,6 +280,8 @@
         if (ObjectUtil.isNotEmpty(monipoiInfo) && DeviceTypeEnum.SELF_TYPE.getCode().equals(monipoiInfo.getDeviceType())) {
             res = ihcNetService.setPosition(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         } else {
+            //先停止
+            ihcNetService.stopDevice(userId);
             res = ihcNetService.setPositionNew(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         }
         return res ? ResponseData.success() : ResponseData.error("请求失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index c69204f..53f0317 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -25,7 +25,7 @@
         SELECT
         <include refid="Base_Column_List"/>,monitorName,dept_id,lineName
         FROM
-            bus_plan bp
+        bus_plan bp
         JOIN (
             SELECT line_name AS  lineName,monitor_id,LINE_NUM as lineNum
             FROM bus_obserpoi_info
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
index 5b9638c..31ae19a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
@@ -25,4 +25,8 @@
 
     List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan);
 
+    boolean getTaskOnByMonitorIdAndLine(Long monitorId, int  lineNum);
+
+    boolean deleteTaskByMonitorIdAndLine(Long monitorId, int  lineNum);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
index 61262eb..178ee90 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
@@ -54,6 +54,8 @@
 
     boolean interruptStart(String deviceIp) ;
 
+    boolean stopDevice(Long userId) ;
+
     Long getUserIdByIp(String deviceIp);
 
     void globalSet(GlobalParamsDTO globalParamsDTO);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
index 6df5d0c..870559a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -213,4 +214,21 @@
         return false;
     }
 
+
+    @Override
+    public boolean getTaskOnByMonitorIdAndLine(Long monitorId, int lineNum) {
+        QueryWrapper<BusPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("MONITOR_ID", monitorId);
+        queryWrapper.eq("LINE_NUM", lineNum);
+        queryWrapper.eq("STATUS", StatusEnum.STATUS_OPEN);
+        return ObjectUtil.isNotEmpty(this.list(queryWrapper)) ? true : false;
+    }
+
+    @Override
+    public boolean deleteTaskByMonitorIdAndLine(Long monitorId, int lineNum) {
+        QueryWrapper<BusPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("MONITOR_ID", monitorId);
+        queryWrapper.eq("LINE_NUM", lineNum);
+        return this.baseMapper.delete(queryWrapper)>0?true:false;
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
index af08323..2f62c1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
@@ -49,7 +49,7 @@
     private static final Integer delayTime = 7200;
 
     //特殊预置点号数组
-    private static final Integer[] presets = {65,67,68,69,70,72,73,82,87,88,90,92,114,121,122,129};
+    private static final Integer[] presets = {65, 67, 68, 69, 70, 72, 73, 82, 87, 88, 90, 92, 114, 121, 122, 129};
 
     public Long getTimestampCollcect() {
         return timestampCollcect;
@@ -70,6 +70,8 @@
     @Autowired
     private IAlarmRecordService alarmRecordService;
     @Autowired
+    private IBusPlanService busPlanService;
+    @Autowired
     private WebSocket webSocket;
     @Value("${casic.panTilt.defaultStoptime:5}")
     private String defaultStoptime;
@@ -514,6 +516,18 @@
     }
 
     @Override
+    public boolean stopDevice(Long userId) {
+        try {
+            Long serialHandle = serialHandle(Long.valueOf(userId));
+            Thread.sleep(300);
+            return sendStopCommand(serialHandle);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    @Override
     public boolean interruptStart(String deviceIp) {
 
         BusMonipoiInfo monipoiInfo = monipoiInfoService.selectByDeviceIp(deviceIp);
@@ -683,7 +697,7 @@
                 res = cruiseEdit(cruiseName, deviceIp, cruiseValue);
                 break;
             case "cruiseDelete":
-                res = cruiseDelete( deviceIp, cruiseName, cruiseValue);
+                res = cruiseDelete(deviceIp, cruiseName, cruiseValue);
                 break;
             default:
                 break;
@@ -714,7 +728,7 @@
     private boolean cruiseDelete(String deviceIp, String cruiseName, Integer cruiseValue) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
-             throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
+            throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
         }
         Long serialHandle = serialHandle(Long.valueOf(userId));
         List<BusObserpoiInfo> busObserpoiInfoList = obserpoiInfoService.selectByMonitor(deviceIp, cruiseValue);
@@ -725,6 +739,10 @@
         }
         try {
             BusMonipoiInfo busMonipoiInfo = monipoiInfoService.selectByDeviceIp(deviceIp);
+            //先查询是否有巡航任务正在执行
+            if (busPlanService.getTaskOnByMonitorIdAndLine(busMonipoiInfo.getId(), cruiseValue)) {
+                throw new BusinessException(BusinessExceptionEnum.CRUISE_DELETE_FAIL);
+            }
             //先停止巡航
             if (DeviceTypeEnum.XST_TYPE.getCode().equals(busMonipoiInfo.getDeviceType())) {
                 sendStopCommand(serialHandle);
@@ -743,7 +761,8 @@
                     }
                 });
             }
-            return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue);
+            return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue) &&
+                    busPlanService.deleteTaskByMonitorIdAndLine(busMonipoiInfo.getId(), cruiseValue);
         } catch (Exception e) {
             throw new BusinessException(BusinessExceptionEnum.CRUISE_DELETE_ERROR);
         }
@@ -923,7 +942,10 @@
                     //给解码板设置预置位
                     Long serialHandle = serialHandle(Long.valueOf(userId));
                     Thread.sleep(300);
-                    flag = paramsSet(userId, serialHandle, presetIndex, stopTime, speed, alarmValue);
+                    if (setPreset(serialHandle, presetIndex)) {
+                        Thread.sleep(300);
+                        flag = paramsSet(userId, serialHandle, presetIndex, stopTime, speed, alarmValue);
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                     flag = false;
@@ -1351,6 +1373,8 @@
 
     @Override
     public void sendDeviceStatusData(String deviceIp, String deviceStatus) {
+        System.out.println(new Date() + ":" + deviceIp.concat("+ 设备状态-->").concat(deviceStatus));
+
         JSONObject msg = new JSONObject();
         msg.put("deviceIp", deviceIp);
         msg.put("time", DateUtil.formatDateTime(new Date()));
@@ -2012,6 +2036,8 @@
                 throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
             }
             Long serialHandle = serialHandle(Long.valueOf(userId));
+            //先停止设备
+            this.stopDevice(serialHandle);
             //设置全局报警值
             if (ObjectUtil.isNotEmpty(globalParamsDTO.getHigh())) {
                 this.setWholeAlarmValue(userId.intValue(), serialHandle, globalParamsDTO.getHigh());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
index 944370f..14e0055 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
@@ -63,6 +63,7 @@
             alarmRecord.setAlarmStatus(StatusEnum.ALARM_ON);
             alarmRecord.setAlarmType(alarmAIDTO.getAlarmType());
             alarmRecord.setAlarmTime(DateUtil.parseDateTime(alarmAIDTO.getAlarmTime()));
+            alarmRecord.setAlarmValue(ObjectUtil.isNotEmpty(alarmAIDTO.getSimilarity())?Double.valueOf(alarmAIDTO.getSimilarity()):99);
             //保存照片
             if (ObjectUtil.isNotEmpty(alarmAIDTO.getPhoto()) && alarmAIDTO.getPhoto().startsWith("data:image")) {
                 alarmRecord.setPhoto(commonFileService.saveFileBase64Image(alarmAIDTO.getPhoto()));
@@ -78,6 +79,7 @@
             msg.put("alarmId", alarmRecord.getId());
             msg.put("alarmTime", alarmRecord.getAlarmTime());
             msg.put("alarmType", alarmRecord.getAlarmType());
+            msg.put("similarity", alarmRecord.getAlarmValue());
             msg.put("alarmTypeName", dictService.getDictNameByCode(DictEnum.ALARM_TYPE,alarmRecord.getAlarmType()));
             msg.put("alarmPhoto", alarmRecord.getPhoto());
             webSocket.sendAllMessage(msg.toJSONString());

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4db8723..f6dbcb6 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -16,6 +16,7 @@
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     RUN_TIME_FAILED(2502, "此段时间都小于当前时间无法开启"),
     CRUISE_NAME_DUPLICATE(2503, "巡航路径名称重复"),
+    CRUISE_DELETE_FAIL(2506, "该巡航线在任务中正在启用状态，无法删除"),
     CRUISE_DELETE_ERROR(2504, "巡航路径删除过程中对设备操作异常"),
     ALARM_BASE64_ERROR(2505, "算法报警图片base64无效");
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
index 7e97d2e..6e2cc3f 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
@@ -65,11 +65,12 @@
         <if test="request.endTime!='' and request.endTime!=null">
             AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
         </if>
+        order by ar.ALARM_TIME desc
     </select>
 
     <select id="detail" resultType="com.casic.missiles.modular.system.dto.AlarmRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
+        distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts,
         <include refid="monitor_Column_List"/>,
         bs.STATION_NAME as stationName,
         bo.LINE_NAME as lineName
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index e4aa1eb..d7db028 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -52,9 +52,11 @@
         ElasticSearchQuery elasticSearchQuery = new ElasticSearchQuery();
         if (CollectionUtils.isNotEmpty(obserpoiInfoList)) {
             for (BusObserpoiInfo busObserpoiInfo : obserpoiInfoList) {
-                ElasticSearchQuery mustQuery = new ElasticSearchQuery();
-                elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
-                        .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                if (ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection()) && ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection())) {
+                    ElasticSearchQuery mustQuery = new ElasticSearchQuery();
+                    elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
+                            .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                }
             }
         }
         elasticSearchQuery.endShould();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
index 34fb08a..d2a6cf9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
@@ -270,7 +270,7 @@
      */
     @RequestMapping("/toPosition")
     @ResponseBody
-    public Object angle(String deviceIp, String horizontalAngle, String verticalAngle) {
+    public Object toPosition(String deviceIp, String horizontalAngle, String verticalAngle) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
             return ResponseData.error("设备注册失败");
@@ -280,6 +280,8 @@
         if (ObjectUtil.isNotEmpty(monipoiInfo) && DeviceTypeEnum.SELF_TYPE.getCode().equals(monipoiInfo.getDeviceType())) {
             res = ihcNetService.setPosition(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         } else {
+            //先停止
+            ihcNetService.stopDevice(userId);
             res = ihcNetService.setPositionNew(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         }
         return res ? ResponseData.success() : ResponseData.error("请求失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index c69204f..53f0317 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -25,7 +25,7 @@
         SELECT
         <include refid="Base_Column_List"/>,monitorName,dept_id,lineName
         FROM
-            bus_plan bp
+        bus_plan bp
         JOIN (
             SELECT line_name AS  lineName,monitor_id,LINE_NUM as lineNum
             FROM bus_obserpoi_info
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
index 5b9638c..31ae19a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
@@ -25,4 +25,8 @@
 
     List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan);
 
+    boolean getTaskOnByMonitorIdAndLine(Long monitorId, int  lineNum);
+
+    boolean deleteTaskByMonitorIdAndLine(Long monitorId, int  lineNum);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
index 61262eb..178ee90 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
@@ -54,6 +54,8 @@
 
     boolean interruptStart(String deviceIp) ;
 
+    boolean stopDevice(Long userId) ;
+
     Long getUserIdByIp(String deviceIp);
 
     void globalSet(GlobalParamsDTO globalParamsDTO);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
index 6df5d0c..870559a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -213,4 +214,21 @@
         return false;
     }
 
+
+    @Override
+    public boolean getTaskOnByMonitorIdAndLine(Long monitorId, int lineNum) {
+        QueryWrapper<BusPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("MONITOR_ID", monitorId);
+        queryWrapper.eq("LINE_NUM", lineNum);
+        queryWrapper.eq("STATUS", StatusEnum.STATUS_OPEN);
+        return ObjectUtil.isNotEmpty(this.list(queryWrapper)) ? true : false;
+    }
+
+    @Override
+    public boolean deleteTaskByMonitorIdAndLine(Long monitorId, int lineNum) {
+        QueryWrapper<BusPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("MONITOR_ID", monitorId);
+        queryWrapper.eq("LINE_NUM", lineNum);
+        return this.baseMapper.delete(queryWrapper)>0?true:false;
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
index af08323..2f62c1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
@@ -49,7 +49,7 @@
     private static final Integer delayTime = 7200;
 
     //特殊预置点号数组
-    private static final Integer[] presets = {65,67,68,69,70,72,73,82,87,88,90,92,114,121,122,129};
+    private static final Integer[] presets = {65, 67, 68, 69, 70, 72, 73, 82, 87, 88, 90, 92, 114, 121, 122, 129};
 
     public Long getTimestampCollcect() {
         return timestampCollcect;
@@ -70,6 +70,8 @@
     @Autowired
     private IAlarmRecordService alarmRecordService;
     @Autowired
+    private IBusPlanService busPlanService;
+    @Autowired
     private WebSocket webSocket;
     @Value("${casic.panTilt.defaultStoptime:5}")
     private String defaultStoptime;
@@ -514,6 +516,18 @@
     }
 
     @Override
+    public boolean stopDevice(Long userId) {
+        try {
+            Long serialHandle = serialHandle(Long.valueOf(userId));
+            Thread.sleep(300);
+            return sendStopCommand(serialHandle);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    @Override
     public boolean interruptStart(String deviceIp) {
 
         BusMonipoiInfo monipoiInfo = monipoiInfoService.selectByDeviceIp(deviceIp);
@@ -683,7 +697,7 @@
                 res = cruiseEdit(cruiseName, deviceIp, cruiseValue);
                 break;
             case "cruiseDelete":
-                res = cruiseDelete( deviceIp, cruiseName, cruiseValue);
+                res = cruiseDelete(deviceIp, cruiseName, cruiseValue);
                 break;
             default:
                 break;
@@ -714,7 +728,7 @@
     private boolean cruiseDelete(String deviceIp, String cruiseName, Integer cruiseValue) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
-             throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
+            throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
         }
         Long serialHandle = serialHandle(Long.valueOf(userId));
         List<BusObserpoiInfo> busObserpoiInfoList = obserpoiInfoService.selectByMonitor(deviceIp, cruiseValue);
@@ -725,6 +739,10 @@
         }
         try {
             BusMonipoiInfo busMonipoiInfo = monipoiInfoService.selectByDeviceIp(deviceIp);
+            //先查询是否有巡航任务正在执行
+            if (busPlanService.getTaskOnByMonitorIdAndLine(busMonipoiInfo.getId(), cruiseValue)) {
+                throw new BusinessException(BusinessExceptionEnum.CRUISE_DELETE_FAIL);
+            }
             //先停止巡航
             if (DeviceTypeEnum.XST_TYPE.getCode().equals(busMonipoiInfo.getDeviceType())) {
                 sendStopCommand(serialHandle);
@@ -743,7 +761,8 @@
                     }
                 });
             }
-            return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue);
+            return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue) &&
+                    busPlanService.deleteTaskByMonitorIdAndLine(busMonipoiInfo.getId(), cruiseValue);
         } catch (Exception e) {
             throw new BusinessException(BusinessExceptionEnum.CRUISE_DELETE_ERROR);
         }
@@ -923,7 +942,10 @@
                     //给解码板设置预置位
                     Long serialHandle = serialHandle(Long.valueOf(userId));
                     Thread.sleep(300);
-                    flag = paramsSet(userId, serialHandle, presetIndex, stopTime, speed, alarmValue);
+                    if (setPreset(serialHandle, presetIndex)) {
+                        Thread.sleep(300);
+                        flag = paramsSet(userId, serialHandle, presetIndex, stopTime, speed, alarmValue);
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                     flag = false;
@@ -1351,6 +1373,8 @@
 
     @Override
     public void sendDeviceStatusData(String deviceIp, String deviceStatus) {
+        System.out.println(new Date() + ":" + deviceIp.concat("+ 设备状态-->").concat(deviceStatus));
+
         JSONObject msg = new JSONObject();
         msg.put("deviceIp", deviceIp);
         msg.put("time", DateUtil.formatDateTime(new Date()));
@@ -2012,6 +2036,8 @@
                 throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
             }
             Long serialHandle = serialHandle(Long.valueOf(userId));
+            //先停止设备
+            this.stopDevice(serialHandle);
             //设置全局报警值
             if (ObjectUtil.isNotEmpty(globalParamsDTO.getHigh())) {
                 this.setWholeAlarmValue(userId.intValue(), serialHandle, globalParamsDTO.getHigh());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
index 944370f..14e0055 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
@@ -63,6 +63,7 @@
             alarmRecord.setAlarmStatus(StatusEnum.ALARM_ON);
             alarmRecord.setAlarmType(alarmAIDTO.getAlarmType());
             alarmRecord.setAlarmTime(DateUtil.parseDateTime(alarmAIDTO.getAlarmTime()));
+            alarmRecord.setAlarmValue(ObjectUtil.isNotEmpty(alarmAIDTO.getSimilarity())?Double.valueOf(alarmAIDTO.getSimilarity()):99);
             //保存照片
             if (ObjectUtil.isNotEmpty(alarmAIDTO.getPhoto()) && alarmAIDTO.getPhoto().startsWith("data:image")) {
                 alarmRecord.setPhoto(commonFileService.saveFileBase64Image(alarmAIDTO.getPhoto()));
@@ -78,6 +79,7 @@
             msg.put("alarmId", alarmRecord.getId());
             msg.put("alarmTime", alarmRecord.getAlarmTime());
             msg.put("alarmType", alarmRecord.getAlarmType());
+            msg.put("similarity", alarmRecord.getAlarmValue());
             msg.put("alarmTypeName", dictService.getDictNameByCode(DictEnum.ALARM_TYPE,alarmRecord.getAlarmType()));
             msg.put("alarmPhoto", alarmRecord.getPhoto());
             webSocket.sendAllMessage(msg.toJSONString());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
index b27830a..79a753b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.StatusEnum;
 import com.casic.missiles.modular.system.dto.DeviceCommom;
 import com.casic.missiles.modular.system.dto.DeviceInfo;
@@ -54,7 +55,10 @@
         QueryWrapper query = new QueryWrapper();
         query.eq("VALID", "0");
         List<BusMonipoiInfo> deviceList = monipoiInfoService.list(query);
+
         if (deviceList != null && deviceList.size() > 0) {
+            //初始化设备状态
+            monipoiInfoService.updateDeviceStatus(StatusEnum.STATUS_OFFLINE);
             // 创建线程池，每个设备一个线程
             ThreadPoolExecutor executor = new ThreadPoolExecutor(deviceList.size(), deviceList.size(), 10, TimeUnit.SECONDS,
                     new ArrayBlockingQueue<>(20), new ThreadPoolExecutor.CallerRunsPolicy());
@@ -122,7 +126,7 @@
                 if (isOpen == 1) {
                     if (map.get(this.deviceIp) != null) {
                         map.put(this.deviceIp, map.get(this.deviceIp) + 1);
-                        if (map.get(this.deviceIp) % 300L == 0) {
+                        if (map.get(this.deviceIp) % 50L == 0) {
                             //若在线，更新设备离线
                             if (deviceStatus) {
                                 if (monipoiInfoService.updateStatus(this.deviceIp, StatusEnum.STATUS_OFFLINE)) {

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4db8723..f6dbcb6 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -16,6 +16,7 @@
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     RUN_TIME_FAILED(2502, "此段时间都小于当前时间无法开启"),
     CRUISE_NAME_DUPLICATE(2503, "巡航路径名称重复"),
+    CRUISE_DELETE_FAIL(2506, "该巡航线在任务中正在启用状态，无法删除"),
     CRUISE_DELETE_ERROR(2504, "巡航路径删除过程中对设备操作异常"),
     ALARM_BASE64_ERROR(2505, "算法报警图片base64无效");
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
index 7e97d2e..6e2cc3f 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
@@ -65,11 +65,12 @@
         <if test="request.endTime!='' and request.endTime!=null">
             AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
         </if>
+        order by ar.ALARM_TIME desc
     </select>
 
     <select id="detail" resultType="com.casic.missiles.modular.system.dto.AlarmRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
+        distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts,
         <include refid="monitor_Column_List"/>,
         bs.STATION_NAME as stationName,
         bo.LINE_NAME as lineName
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index e4aa1eb..d7db028 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -52,9 +52,11 @@
         ElasticSearchQuery elasticSearchQuery = new ElasticSearchQuery();
         if (CollectionUtils.isNotEmpty(obserpoiInfoList)) {
             for (BusObserpoiInfo busObserpoiInfo : obserpoiInfoList) {
-                ElasticSearchQuery mustQuery = new ElasticSearchQuery();
-                elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
-                        .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                if (ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection()) && ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection())) {
+                    ElasticSearchQuery mustQuery = new ElasticSearchQuery();
+                    elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
+                            .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                }
             }
         }
         elasticSearchQuery.endShould();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
index 34fb08a..d2a6cf9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
@@ -270,7 +270,7 @@
      */
     @RequestMapping("/toPosition")
     @ResponseBody
-    public Object angle(String deviceIp, String horizontalAngle, String verticalAngle) {
+    public Object toPosition(String deviceIp, String horizontalAngle, String verticalAngle) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
             return ResponseData.error("设备注册失败");
@@ -280,6 +280,8 @@
         if (ObjectUtil.isNotEmpty(monipoiInfo) && DeviceTypeEnum.SELF_TYPE.getCode().equals(monipoiInfo.getDeviceType())) {
             res = ihcNetService.setPosition(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         } else {
+            //先停止
+            ihcNetService.stopDevice(userId);
             res = ihcNetService.setPositionNew(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         }
         return res ? ResponseData.success() : ResponseData.error("请求失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index c69204f..53f0317 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -25,7 +25,7 @@
         SELECT
         <include refid="Base_Column_List"/>,monitorName,dept_id,lineName
         FROM
-            bus_plan bp
+        bus_plan bp
         JOIN (
             SELECT line_name AS  lineName,monitor_id,LINE_NUM as lineNum
             FROM bus_obserpoi_info
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
index 5b9638c..31ae19a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
@@ -25,4 +25,8 @@
 
     List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan);
 
+    boolean getTaskOnByMonitorIdAndLine(Long monitorId, int  lineNum);
+
+    boolean deleteTaskByMonitorIdAndLine(Long monitorId, int  lineNum);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
index 61262eb..178ee90 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
@@ -54,6 +54,8 @@
 
     boolean interruptStart(String deviceIp) ;
 
+    boolean stopDevice(Long userId) ;
+
     Long getUserIdByIp(String deviceIp);
 
     void globalSet(GlobalParamsDTO globalParamsDTO);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
index 6df5d0c..870559a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -213,4 +214,21 @@
         return false;
     }
 
+
+    @Override
+    public boolean getTaskOnByMonitorIdAndLine(Long monitorId, int lineNum) {
+        QueryWrapper<BusPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("MONITOR_ID", monitorId);
+        queryWrapper.eq("LINE_NUM", lineNum);
+        queryWrapper.eq("STATUS", StatusEnum.STATUS_OPEN);
+        return ObjectUtil.isNotEmpty(this.list(queryWrapper)) ? true : false;
+    }
+
+    @Override
+    public boolean deleteTaskByMonitorIdAndLine(Long monitorId, int lineNum) {
+        QueryWrapper<BusPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("MONITOR_ID", monitorId);
+        queryWrapper.eq("LINE_NUM", lineNum);
+        return this.baseMapper.delete(queryWrapper)>0?true:false;
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
index af08323..2f62c1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
@@ -49,7 +49,7 @@
     private static final Integer delayTime = 7200;
 
     //特殊预置点号数组
-    private static final Integer[] presets = {65,67,68,69,70,72,73,82,87,88,90,92,114,121,122,129};
+    private static final Integer[] presets = {65, 67, 68, 69, 70, 72, 73, 82, 87, 88, 90, 92, 114, 121, 122, 129};
 
     public Long getTimestampCollcect() {
         return timestampCollcect;
@@ -70,6 +70,8 @@
     @Autowired
     private IAlarmRecordService alarmRecordService;
     @Autowired
+    private IBusPlanService busPlanService;
+    @Autowired
     private WebSocket webSocket;
     @Value("${casic.panTilt.defaultStoptime:5}")
     private String defaultStoptime;
@@ -514,6 +516,18 @@
     }
 
     @Override
+    public boolean stopDevice(Long userId) {
+        try {
+            Long serialHandle = serialHandle(Long.valueOf(userId));
+            Thread.sleep(300);
+            return sendStopCommand(serialHandle);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    @Override
     public boolean interruptStart(String deviceIp) {
 
         BusMonipoiInfo monipoiInfo = monipoiInfoService.selectByDeviceIp(deviceIp);
@@ -683,7 +697,7 @@
                 res = cruiseEdit(cruiseName, deviceIp, cruiseValue);
                 break;
             case "cruiseDelete":
-                res = cruiseDelete( deviceIp, cruiseName, cruiseValue);
+                res = cruiseDelete(deviceIp, cruiseName, cruiseValue);
                 break;
             default:
                 break;
@@ -714,7 +728,7 @@
     private boolean cruiseDelete(String deviceIp, String cruiseName, Integer cruiseValue) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
-             throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
+            throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
         }
         Long serialHandle = serialHandle(Long.valueOf(userId));
         List<BusObserpoiInfo> busObserpoiInfoList = obserpoiInfoService.selectByMonitor(deviceIp, cruiseValue);
@@ -725,6 +739,10 @@
         }
         try {
             BusMonipoiInfo busMonipoiInfo = monipoiInfoService.selectByDeviceIp(deviceIp);
+            //先查询是否有巡航任务正在执行
+            if (busPlanService.getTaskOnByMonitorIdAndLine(busMonipoiInfo.getId(), cruiseValue)) {
+                throw new BusinessException(BusinessExceptionEnum.CRUISE_DELETE_FAIL);
+            }
             //先停止巡航
             if (DeviceTypeEnum.XST_TYPE.getCode().equals(busMonipoiInfo.getDeviceType())) {
                 sendStopCommand(serialHandle);
@@ -743,7 +761,8 @@
                     }
                 });
             }
-            return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue);
+            return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue) &&
+                    busPlanService.deleteTaskByMonitorIdAndLine(busMonipoiInfo.getId(), cruiseValue);
         } catch (Exception e) {
             throw new BusinessException(BusinessExceptionEnum.CRUISE_DELETE_ERROR);
         }
@@ -923,7 +942,10 @@
                     //给解码板设置预置位
                     Long serialHandle = serialHandle(Long.valueOf(userId));
                     Thread.sleep(300);
-                    flag = paramsSet(userId, serialHandle, presetIndex, stopTime, speed, alarmValue);
+                    if (setPreset(serialHandle, presetIndex)) {
+                        Thread.sleep(300);
+                        flag = paramsSet(userId, serialHandle, presetIndex, stopTime, speed, alarmValue);
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                     flag = false;
@@ -1351,6 +1373,8 @@
 
     @Override
     public void sendDeviceStatusData(String deviceIp, String deviceStatus) {
+        System.out.println(new Date() + ":" + deviceIp.concat("+ 设备状态-->").concat(deviceStatus));
+
         JSONObject msg = new JSONObject();
         msg.put("deviceIp", deviceIp);
         msg.put("time", DateUtil.formatDateTime(new Date()));
@@ -2012,6 +2036,8 @@
                 throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
             }
             Long serialHandle = serialHandle(Long.valueOf(userId));
+            //先停止设备
+            this.stopDevice(serialHandle);
             //设置全局报警值
             if (ObjectUtil.isNotEmpty(globalParamsDTO.getHigh())) {
                 this.setWholeAlarmValue(userId.intValue(), serialHandle, globalParamsDTO.getHigh());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
index 944370f..14e0055 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
@@ -63,6 +63,7 @@
             alarmRecord.setAlarmStatus(StatusEnum.ALARM_ON);
             alarmRecord.setAlarmType(alarmAIDTO.getAlarmType());
             alarmRecord.setAlarmTime(DateUtil.parseDateTime(alarmAIDTO.getAlarmTime()));
+            alarmRecord.setAlarmValue(ObjectUtil.isNotEmpty(alarmAIDTO.getSimilarity())?Double.valueOf(alarmAIDTO.getSimilarity()):99);
             //保存照片
             if (ObjectUtil.isNotEmpty(alarmAIDTO.getPhoto()) && alarmAIDTO.getPhoto().startsWith("data:image")) {
                 alarmRecord.setPhoto(commonFileService.saveFileBase64Image(alarmAIDTO.getPhoto()));
@@ -78,6 +79,7 @@
             msg.put("alarmId", alarmRecord.getId());
             msg.put("alarmTime", alarmRecord.getAlarmTime());
             msg.put("alarmType", alarmRecord.getAlarmType());
+            msg.put("similarity", alarmRecord.getAlarmValue());
             msg.put("alarmTypeName", dictService.getDictNameByCode(DictEnum.ALARM_TYPE,alarmRecord.getAlarmType()));
             msg.put("alarmPhoto", alarmRecord.getPhoto());
             webSocket.sendAllMessage(msg.toJSONString());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
index b27830a..79a753b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.StatusEnum;
 import com.casic.missiles.modular.system.dto.DeviceCommom;
 import com.casic.missiles.modular.system.dto.DeviceInfo;
@@ -54,7 +55,10 @@
         QueryWrapper query = new QueryWrapper();
         query.eq("VALID", "0");
         List<BusMonipoiInfo> deviceList = monipoiInfoService.list(query);
+
         if (deviceList != null && deviceList.size() > 0) {
+            //初始化设备状态
+            monipoiInfoService.updateDeviceStatus(StatusEnum.STATUS_OFFLINE);
             // 创建线程池，每个设备一个线程
             ThreadPoolExecutor executor = new ThreadPoolExecutor(deviceList.size(), deviceList.size(), 10, TimeUnit.SECONDS,
                     new ArrayBlockingQueue<>(20), new ThreadPoolExecutor.CallerRunsPolicy());
@@ -122,7 +126,7 @@
                 if (isOpen == 1) {
                     if (map.get(this.deviceIp) != null) {
                         map.put(this.deviceIp, map.get(this.deviceIp) + 1);
-                        if (map.get(this.deviceIp) % 300L == 0) {
+                        if (map.get(this.deviceIp) % 50L == 0) {
                             //若在线，更新设备离线
                             if (deviceStatus) {
                                 if (monipoiInfoService.updateStatus(this.deviceIp, StatusEnum.STATUS_OFFLINE)) {
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
index 5249831..35646ac 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
@@ -109,4 +109,16 @@
         return ResponseData.success(busMonipoiInfoService.overviewMap(keywordDTO.getKeyword()));
     }
 
+
+
+
+    /**
+     * 获取监测点/设备信息列表供算法调用
+     */
+    @RequestMapping(value = "/AIlistPage")
+    public Object AIlistPage(@RequestBody @Valid MonitorListDTO monitorListDTO) throws Exception {
+        return ResponseData.success(busMonipoiInfoService.AIlistPage( monitorListDTO.getStationId(), monitorListDTO.getKeyword()));
+    }
+
+
 }

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4db8723..f6dbcb6 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -16,6 +16,7 @@
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     RUN_TIME_FAILED(2502, "此段时间都小于当前时间无法开启"),
     CRUISE_NAME_DUPLICATE(2503, "巡航路径名称重复"),
+    CRUISE_DELETE_FAIL(2506, "该巡航线在任务中正在启用状态，无法删除"),
     CRUISE_DELETE_ERROR(2504, "巡航路径删除过程中对设备操作异常"),
     ALARM_BASE64_ERROR(2505, "算法报警图片base64无效");
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
index 7e97d2e..6e2cc3f 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
@@ -65,11 +65,12 @@
         <if test="request.endTime!='' and request.endTime!=null">
             AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
         </if>
+        order by ar.ALARM_TIME desc
     </select>
 
     <select id="detail" resultType="com.casic.missiles.modular.system.dto.AlarmRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
+        distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts,
         <include refid="monitor_Column_List"/>,
         bs.STATION_NAME as stationName,
         bo.LINE_NAME as lineName
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index e4aa1eb..d7db028 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -52,9 +52,11 @@
         ElasticSearchQuery elasticSearchQuery = new ElasticSearchQuery();
         if (CollectionUtils.isNotEmpty(obserpoiInfoList)) {
             for (BusObserpoiInfo busObserpoiInfo : obserpoiInfoList) {
-                ElasticSearchQuery mustQuery = new ElasticSearchQuery();
-                elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
-                        .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                if (ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection()) && ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection())) {
+                    ElasticSearchQuery mustQuery = new ElasticSearchQuery();
+                    elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
+                            .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                }
             }
         }
         elasticSearchQuery.endShould();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
index 34fb08a..d2a6cf9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
@@ -270,7 +270,7 @@
      */
     @RequestMapping("/toPosition")
     @ResponseBody
-    public Object angle(String deviceIp, String horizontalAngle, String verticalAngle) {
+    public Object toPosition(String deviceIp, String horizontalAngle, String verticalAngle) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
             return ResponseData.error("设备注册失败");
@@ -280,6 +280,8 @@
         if (ObjectUtil.isNotEmpty(monipoiInfo) && DeviceTypeEnum.SELF_TYPE.getCode().equals(monipoiInfo.getDeviceType())) {
             res = ihcNetService.setPosition(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         } else {
+            //先停止
+            ihcNetService.stopDevice(userId);
             res = ihcNetService.setPositionNew(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         }
         return res ? ResponseData.success() : ResponseData.error("请求失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index c69204f..53f0317 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -25,7 +25,7 @@
         SELECT
         <include refid="Base_Column_List"/>,monitorName,dept_id,lineName
         FROM
-            bus_plan bp
+        bus_plan bp
         JOIN (
             SELECT line_name AS  lineName,monitor_id,LINE_NUM as lineNum
             FROM bus_obserpoi_info
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
index 5b9638c..31ae19a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
@@ -25,4 +25,8 @@
 
     List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan);
 
+    boolean getTaskOnByMonitorIdAndLine(Long monitorId, int  lineNum);
+
+    boolean deleteTaskByMonitorIdAndLine(Long monitorId, int  lineNum);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
index 61262eb..178ee90 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
@@ -54,6 +54,8 @@
 
     boolean interruptStart(String deviceIp) ;
 
+    boolean stopDevice(Long userId) ;
+
     Long getUserIdByIp(String deviceIp);
 
     void globalSet(GlobalParamsDTO globalParamsDTO);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
index 6df5d0c..870559a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -213,4 +214,21 @@
         return false;
     }
 
+
+    @Override
+    public boolean getTaskOnByMonitorIdAndLine(Long monitorId, int lineNum) {
+        QueryWrapper<BusPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("MONITOR_ID", monitorId);
+        queryWrapper.eq("LINE_NUM", lineNum);
+        queryWrapper.eq("STATUS", StatusEnum.STATUS_OPEN);
+        return ObjectUtil.isNotEmpty(this.list(queryWrapper)) ? true : false;
+    }
+
+    @Override
+    public boolean deleteTaskByMonitorIdAndLine(Long monitorId, int lineNum) {
+        QueryWrapper<BusPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("MONITOR_ID", monitorId);
+        queryWrapper.eq("LINE_NUM", lineNum);
+        return this.baseMapper.delete(queryWrapper)>0?true:false;
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
index af08323..2f62c1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
@@ -49,7 +49,7 @@
     private static final Integer delayTime = 7200;
 
     //特殊预置点号数组
-    private static final Integer[] presets = {65,67,68,69,70,72,73,82,87,88,90,92,114,121,122,129};
+    private static final Integer[] presets = {65, 67, 68, 69, 70, 72, 73, 82, 87, 88, 90, 92, 114, 121, 122, 129};
 
     public Long getTimestampCollcect() {
         return timestampCollcect;
@@ -70,6 +70,8 @@
     @Autowired
     private IAlarmRecordService alarmRecordService;
     @Autowired
+    private IBusPlanService busPlanService;
+    @Autowired
     private WebSocket webSocket;
     @Value("${casic.panTilt.defaultStoptime:5}")
     private String defaultStoptime;
@@ -514,6 +516,18 @@
     }
 
     @Override
+    public boolean stopDevice(Long userId) {
+        try {
+            Long serialHandle = serialHandle(Long.valueOf(userId));
+            Thread.sleep(300);
+            return sendStopCommand(serialHandle);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    @Override
     public boolean interruptStart(String deviceIp) {
 
         BusMonipoiInfo monipoiInfo = monipoiInfoService.selectByDeviceIp(deviceIp);
@@ -683,7 +697,7 @@
                 res = cruiseEdit(cruiseName, deviceIp, cruiseValue);
                 break;
             case "cruiseDelete":
-                res = cruiseDelete( deviceIp, cruiseName, cruiseValue);
+                res = cruiseDelete(deviceIp, cruiseName, cruiseValue);
                 break;
             default:
                 break;
@@ -714,7 +728,7 @@
     private boolean cruiseDelete(String deviceIp, String cruiseName, Integer cruiseValue) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
-             throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
+            throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
         }
         Long serialHandle = serialHandle(Long.valueOf(userId));
         List<BusObserpoiInfo> busObserpoiInfoList = obserpoiInfoService.selectByMonitor(deviceIp, cruiseValue);
@@ -725,6 +739,10 @@
         }
         try {
             BusMonipoiInfo busMonipoiInfo = monipoiInfoService.selectByDeviceIp(deviceIp);
+            //先查询是否有巡航任务正在执行
+            if (busPlanService.getTaskOnByMonitorIdAndLine(busMonipoiInfo.getId(), cruiseValue)) {
+                throw new BusinessException(BusinessExceptionEnum.CRUISE_DELETE_FAIL);
+            }
             //先停止巡航
             if (DeviceTypeEnum.XST_TYPE.getCode().equals(busMonipoiInfo.getDeviceType())) {
                 sendStopCommand(serialHandle);
@@ -743,7 +761,8 @@
                     }
                 });
             }
-            return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue);
+            return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue) &&
+                    busPlanService.deleteTaskByMonitorIdAndLine(busMonipoiInfo.getId(), cruiseValue);
         } catch (Exception e) {
             throw new BusinessException(BusinessExceptionEnum.CRUISE_DELETE_ERROR);
         }
@@ -923,7 +942,10 @@
                     //给解码板设置预置位
                     Long serialHandle = serialHandle(Long.valueOf(userId));
                     Thread.sleep(300);
-                    flag = paramsSet(userId, serialHandle, presetIndex, stopTime, speed, alarmValue);
+                    if (setPreset(serialHandle, presetIndex)) {
+                        Thread.sleep(300);
+                        flag = paramsSet(userId, serialHandle, presetIndex, stopTime, speed, alarmValue);
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                     flag = false;
@@ -1351,6 +1373,8 @@
 
     @Override
     public void sendDeviceStatusData(String deviceIp, String deviceStatus) {
+        System.out.println(new Date() + ":" + deviceIp.concat("+ 设备状态-->").concat(deviceStatus));
+
         JSONObject msg = new JSONObject();
         msg.put("deviceIp", deviceIp);
         msg.put("time", DateUtil.formatDateTime(new Date()));
@@ -2012,6 +2036,8 @@
                 throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
             }
             Long serialHandle = serialHandle(Long.valueOf(userId));
+            //先停止设备
+            this.stopDevice(serialHandle);
             //设置全局报警值
             if (ObjectUtil.isNotEmpty(globalParamsDTO.getHigh())) {
                 this.setWholeAlarmValue(userId.intValue(), serialHandle, globalParamsDTO.getHigh());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
index 944370f..14e0055 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
@@ -63,6 +63,7 @@
             alarmRecord.setAlarmStatus(StatusEnum.ALARM_ON);
             alarmRecord.setAlarmType(alarmAIDTO.getAlarmType());
             alarmRecord.setAlarmTime(DateUtil.parseDateTime(alarmAIDTO.getAlarmTime()));
+            alarmRecord.setAlarmValue(ObjectUtil.isNotEmpty(alarmAIDTO.getSimilarity())?Double.valueOf(alarmAIDTO.getSimilarity()):99);
             //保存照片
             if (ObjectUtil.isNotEmpty(alarmAIDTO.getPhoto()) && alarmAIDTO.getPhoto().startsWith("data:image")) {
                 alarmRecord.setPhoto(commonFileService.saveFileBase64Image(alarmAIDTO.getPhoto()));
@@ -78,6 +79,7 @@
             msg.put("alarmId", alarmRecord.getId());
             msg.put("alarmTime", alarmRecord.getAlarmTime());
             msg.put("alarmType", alarmRecord.getAlarmType());
+            msg.put("similarity", alarmRecord.getAlarmValue());
             msg.put("alarmTypeName", dictService.getDictNameByCode(DictEnum.ALARM_TYPE,alarmRecord.getAlarmType()));
             msg.put("alarmPhoto", alarmRecord.getPhoto());
             webSocket.sendAllMessage(msg.toJSONString());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
index b27830a..79a753b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.StatusEnum;
 import com.casic.missiles.modular.system.dto.DeviceCommom;
 import com.casic.missiles.modular.system.dto.DeviceInfo;
@@ -54,7 +55,10 @@
         QueryWrapper query = new QueryWrapper();
         query.eq("VALID", "0");
         List<BusMonipoiInfo> deviceList = monipoiInfoService.list(query);
+
         if (deviceList != null && deviceList.size() > 0) {
+            //初始化设备状态
+            monipoiInfoService.updateDeviceStatus(StatusEnum.STATUS_OFFLINE);
             // 创建线程池，每个设备一个线程
             ThreadPoolExecutor executor = new ThreadPoolExecutor(deviceList.size(), deviceList.size(), 10, TimeUnit.SECONDS,
                     new ArrayBlockingQueue<>(20), new ThreadPoolExecutor.CallerRunsPolicy());
@@ -122,7 +126,7 @@
                 if (isOpen == 1) {
                     if (map.get(this.deviceIp) != null) {
                         map.put(this.deviceIp, map.get(this.deviceIp) + 1);
-                        if (map.get(this.deviceIp) % 300L == 0) {
+                        if (map.get(this.deviceIp) % 50L == 0) {
                             //若在线，更新设备离线
                             if (deviceStatus) {
                                 if (monipoiInfoService.updateStatus(this.deviceIp, StatusEnum.STATUS_OFFLINE)) {
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
index 5249831..35646ac 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
@@ -109,4 +109,16 @@
         return ResponseData.success(busMonipoiInfoService.overviewMap(keywordDTO.getKeyword()));
     }
 
+
+
+
+    /**
+     * 获取监测点/设备信息列表供算法调用
+     */
+    @RequestMapping(value = "/AIlistPage")
+    public Object AIlistPage(@RequestBody @Valid MonitorListDTO monitorListDTO) throws Exception {
+        return ResponseData.success(busMonipoiInfoService.AIlistPage( monitorListDTO.getStationId(), monitorListDTO.getKeyword()));
+    }
+
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
index 92d8264..9ab2622 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
@@ -26,6 +26,8 @@
 
     List<BusMonipoiInfo> monitorListPage(@Param("page") Page<BusMonipoiInfo> page,@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword);
 
+    List<BusMonipoiInfo> AIlistPage( @Param("stationId")Long stationId,@Param("keyword")String keyword);
+
     MonitorBaseInfo selectInfoByDeviceIp(@Param("deviceIp") String deviceIp);
 
     BusMonipoiInfoResponse monitorDetail(@Param("id") Long id);

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4db8723..f6dbcb6 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -16,6 +16,7 @@
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     RUN_TIME_FAILED(2502, "此段时间都小于当前时间无法开启"),
     CRUISE_NAME_DUPLICATE(2503, "巡航路径名称重复"),
+    CRUISE_DELETE_FAIL(2506, "该巡航线在任务中正在启用状态，无法删除"),
     CRUISE_DELETE_ERROR(2504, "巡航路径删除过程中对设备操作异常"),
     ALARM_BASE64_ERROR(2505, "算法报警图片base64无效");
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
index 7e97d2e..6e2cc3f 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
@@ -65,11 +65,12 @@
         <if test="request.endTime!='' and request.endTime!=null">
             AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
         </if>
+        order by ar.ALARM_TIME desc
     </select>
 
     <select id="detail" resultType="com.casic.missiles.modular.system.dto.AlarmRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
+        distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts,
         <include refid="monitor_Column_List"/>,
         bs.STATION_NAME as stationName,
         bo.LINE_NAME as lineName
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index e4aa1eb..d7db028 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -52,9 +52,11 @@
         ElasticSearchQuery elasticSearchQuery = new ElasticSearchQuery();
         if (CollectionUtils.isNotEmpty(obserpoiInfoList)) {
             for (BusObserpoiInfo busObserpoiInfo : obserpoiInfoList) {
-                ElasticSearchQuery mustQuery = new ElasticSearchQuery();
-                elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
-                        .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                if (ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection()) && ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection())) {
+                    ElasticSearchQuery mustQuery = new ElasticSearchQuery();
+                    elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
+                            .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                }
             }
         }
         elasticSearchQuery.endShould();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
index 34fb08a..d2a6cf9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
@@ -270,7 +270,7 @@
      */
     @RequestMapping("/toPosition")
     @ResponseBody
-    public Object angle(String deviceIp, String horizontalAngle, String verticalAngle) {
+    public Object toPosition(String deviceIp, String horizontalAngle, String verticalAngle) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
             return ResponseData.error("设备注册失败");
@@ -280,6 +280,8 @@
         if (ObjectUtil.isNotEmpty(monipoiInfo) && DeviceTypeEnum.SELF_TYPE.getCode().equals(monipoiInfo.getDeviceType())) {
             res = ihcNetService.setPosition(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         } else {
+            //先停止
+            ihcNetService.stopDevice(userId);
             res = ihcNetService.setPositionNew(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         }
         return res ? ResponseData.success() : ResponseData.error("请求失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index c69204f..53f0317 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -25,7 +25,7 @@
         SELECT
         <include refid="Base_Column_List"/>,monitorName,dept_id,lineName
         FROM
-            bus_plan bp
+        bus_plan bp
         JOIN (
             SELECT line_name AS  lineName,monitor_id,LINE_NUM as lineNum
             FROM bus_obserpoi_info
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
index 5b9638c..31ae19a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
@@ -25,4 +25,8 @@
 
     List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan);
 
+    boolean getTaskOnByMonitorIdAndLine(Long monitorId, int  lineNum);
+
+    boolean deleteTaskByMonitorIdAndLine(Long monitorId, int  lineNum);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
index 61262eb..178ee90 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
@@ -54,6 +54,8 @@
 
     boolean interruptStart(String deviceIp) ;
 
+    boolean stopDevice(Long userId) ;
+
     Long getUserIdByIp(String deviceIp);
 
     void globalSet(GlobalParamsDTO globalParamsDTO);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
index 6df5d0c..870559a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -213,4 +214,21 @@
         return false;
     }
 
+
+    @Override
+    public boolean getTaskOnByMonitorIdAndLine(Long monitorId, int lineNum) {
+        QueryWrapper<BusPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("MONITOR_ID", monitorId);
+        queryWrapper.eq("LINE_NUM", lineNum);
+        queryWrapper.eq("STATUS", StatusEnum.STATUS_OPEN);
+        return ObjectUtil.isNotEmpty(this.list(queryWrapper)) ? true : false;
+    }
+
+    @Override
+    public boolean deleteTaskByMonitorIdAndLine(Long monitorId, int lineNum) {
+        QueryWrapper<BusPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("MONITOR_ID", monitorId);
+        queryWrapper.eq("LINE_NUM", lineNum);
+        return this.baseMapper.delete(queryWrapper)>0?true:false;
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
index af08323..2f62c1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
@@ -49,7 +49,7 @@
     private static final Integer delayTime = 7200;
 
     //特殊预置点号数组
-    private static final Integer[] presets = {65,67,68,69,70,72,73,82,87,88,90,92,114,121,122,129};
+    private static final Integer[] presets = {65, 67, 68, 69, 70, 72, 73, 82, 87, 88, 90, 92, 114, 121, 122, 129};
 
     public Long getTimestampCollcect() {
         return timestampCollcect;
@@ -70,6 +70,8 @@
     @Autowired
     private IAlarmRecordService alarmRecordService;
     @Autowired
+    private IBusPlanService busPlanService;
+    @Autowired
     private WebSocket webSocket;
     @Value("${casic.panTilt.defaultStoptime:5}")
     private String defaultStoptime;
@@ -514,6 +516,18 @@
     }
 
     @Override
+    public boolean stopDevice(Long userId) {
+        try {
+            Long serialHandle = serialHandle(Long.valueOf(userId));
+            Thread.sleep(300);
+            return sendStopCommand(serialHandle);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    @Override
     public boolean interruptStart(String deviceIp) {
 
         BusMonipoiInfo monipoiInfo = monipoiInfoService.selectByDeviceIp(deviceIp);
@@ -683,7 +697,7 @@
                 res = cruiseEdit(cruiseName, deviceIp, cruiseValue);
                 break;
             case "cruiseDelete":
-                res = cruiseDelete( deviceIp, cruiseName, cruiseValue);
+                res = cruiseDelete(deviceIp, cruiseName, cruiseValue);
                 break;
             default:
                 break;
@@ -714,7 +728,7 @@
     private boolean cruiseDelete(String deviceIp, String cruiseName, Integer cruiseValue) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
-             throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
+            throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
         }
         Long serialHandle = serialHandle(Long.valueOf(userId));
         List<BusObserpoiInfo> busObserpoiInfoList = obserpoiInfoService.selectByMonitor(deviceIp, cruiseValue);
@@ -725,6 +739,10 @@
         }
         try {
             BusMonipoiInfo busMonipoiInfo = monipoiInfoService.selectByDeviceIp(deviceIp);
+            //先查询是否有巡航任务正在执行
+            if (busPlanService.getTaskOnByMonitorIdAndLine(busMonipoiInfo.getId(), cruiseValue)) {
+                throw new BusinessException(BusinessExceptionEnum.CRUISE_DELETE_FAIL);
+            }
             //先停止巡航
             if (DeviceTypeEnum.XST_TYPE.getCode().equals(busMonipoiInfo.getDeviceType())) {
                 sendStopCommand(serialHandle);
@@ -743,7 +761,8 @@
                     }
                 });
             }
-            return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue);
+            return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue) &&
+                    busPlanService.deleteTaskByMonitorIdAndLine(busMonipoiInfo.getId(), cruiseValue);
         } catch (Exception e) {
             throw new BusinessException(BusinessExceptionEnum.CRUISE_DELETE_ERROR);
         }
@@ -923,7 +942,10 @@
                     //给解码板设置预置位
                     Long serialHandle = serialHandle(Long.valueOf(userId));
                     Thread.sleep(300);
-                    flag = paramsSet(userId, serialHandle, presetIndex, stopTime, speed, alarmValue);
+                    if (setPreset(serialHandle, presetIndex)) {
+                        Thread.sleep(300);
+                        flag = paramsSet(userId, serialHandle, presetIndex, stopTime, speed, alarmValue);
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                     flag = false;
@@ -1351,6 +1373,8 @@
 
     @Override
     public void sendDeviceStatusData(String deviceIp, String deviceStatus) {
+        System.out.println(new Date() + ":" + deviceIp.concat("+ 设备状态-->").concat(deviceStatus));
+
         JSONObject msg = new JSONObject();
         msg.put("deviceIp", deviceIp);
         msg.put("time", DateUtil.formatDateTime(new Date()));
@@ -2012,6 +2036,8 @@
                 throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
             }
             Long serialHandle = serialHandle(Long.valueOf(userId));
+            //先停止设备
+            this.stopDevice(serialHandle);
             //设置全局报警值
             if (ObjectUtil.isNotEmpty(globalParamsDTO.getHigh())) {
                 this.setWholeAlarmValue(userId.intValue(), serialHandle, globalParamsDTO.getHigh());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
index 944370f..14e0055 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
@@ -63,6 +63,7 @@
             alarmRecord.setAlarmStatus(StatusEnum.ALARM_ON);
             alarmRecord.setAlarmType(alarmAIDTO.getAlarmType());
             alarmRecord.setAlarmTime(DateUtil.parseDateTime(alarmAIDTO.getAlarmTime()));
+            alarmRecord.setAlarmValue(ObjectUtil.isNotEmpty(alarmAIDTO.getSimilarity())?Double.valueOf(alarmAIDTO.getSimilarity()):99);
             //保存照片
             if (ObjectUtil.isNotEmpty(alarmAIDTO.getPhoto()) && alarmAIDTO.getPhoto().startsWith("data:image")) {
                 alarmRecord.setPhoto(commonFileService.saveFileBase64Image(alarmAIDTO.getPhoto()));
@@ -78,6 +79,7 @@
             msg.put("alarmId", alarmRecord.getId());
             msg.put("alarmTime", alarmRecord.getAlarmTime());
             msg.put("alarmType", alarmRecord.getAlarmType());
+            msg.put("similarity", alarmRecord.getAlarmValue());
             msg.put("alarmTypeName", dictService.getDictNameByCode(DictEnum.ALARM_TYPE,alarmRecord.getAlarmType()));
             msg.put("alarmPhoto", alarmRecord.getPhoto());
             webSocket.sendAllMessage(msg.toJSONString());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
index b27830a..79a753b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.StatusEnum;
 import com.casic.missiles.modular.system.dto.DeviceCommom;
 import com.casic.missiles.modular.system.dto.DeviceInfo;
@@ -54,7 +55,10 @@
         QueryWrapper query = new QueryWrapper();
         query.eq("VALID", "0");
         List<BusMonipoiInfo> deviceList = monipoiInfoService.list(query);
+
         if (deviceList != null && deviceList.size() > 0) {
+            //初始化设备状态
+            monipoiInfoService.updateDeviceStatus(StatusEnum.STATUS_OFFLINE);
             // 创建线程池，每个设备一个线程
             ThreadPoolExecutor executor = new ThreadPoolExecutor(deviceList.size(), deviceList.size(), 10, TimeUnit.SECONDS,
                     new ArrayBlockingQueue<>(20), new ThreadPoolExecutor.CallerRunsPolicy());
@@ -122,7 +126,7 @@
                 if (isOpen == 1) {
                     if (map.get(this.deviceIp) != null) {
                         map.put(this.deviceIp, map.get(this.deviceIp) + 1);
-                        if (map.get(this.deviceIp) % 300L == 0) {
+                        if (map.get(this.deviceIp) % 50L == 0) {
                             //若在线，更新设备离线
                             if (deviceStatus) {
                                 if (monipoiInfoService.updateStatus(this.deviceIp, StatusEnum.STATUS_OFFLINE)) {
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
index 5249831..35646ac 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
@@ -109,4 +109,16 @@
         return ResponseData.success(busMonipoiInfoService.overviewMap(keywordDTO.getKeyword()));
     }
 
+
+
+
+    /**
+     * 获取监测点/设备信息列表供算法调用
+     */
+    @RequestMapping(value = "/AIlistPage")
+    public Object AIlistPage(@RequestBody @Valid MonitorListDTO monitorListDTO) throws Exception {
+        return ResponseData.success(busMonipoiInfoService.AIlistPage( monitorListDTO.getStationId(), monitorListDTO.getKeyword()));
+    }
+
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
index 92d8264..9ab2622 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
@@ -26,6 +26,8 @@
 
     List<BusMonipoiInfo> monitorListPage(@Param("page") Page<BusMonipoiInfo> page,@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword);
 
+    List<BusMonipoiInfo> AIlistPage( @Param("stationId")Long stationId,@Param("keyword")String keyword);
+
     MonitorBaseInfo selectInfoByDeviceIp(@Param("deviceIp") String deviceIp);
 
     BusMonipoiInfoResponse monitorDetail(@Param("id") Long id);
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
index 22777d5..de44bbe 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
@@ -35,7 +35,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID
-        AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS type, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts
+        AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS deviceType, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts
     </sql>
 
     <select id="monitorList" resultType="com.casic.missiles.modular.system.dto.monitor.MonitorPointList">
@@ -70,6 +70,25 @@
         </if>
     </select>
 
+
+    <select id="AIlistPage" resultType="com.casic.missiles.modular.system.model.BusMonipoiInfo">
+        SELECT
+        <include refid="Base_Column_List"/>,stationName
+        FROM bus_monipoi_info
+        JOIN (
+        SELECT id as idd,DEPT_ID,STATION_NAME AS stationName
+        FROM bus_station_info
+        WHERE valid=0
+        )bsi ON bsi.idd=station_id
+        where valid=0
+        <if test="stationId!= null and stationId !=''">
+            and station_id =#{stationId}
+        </if>
+        <if test="keyword!= null and keyword !=''">
+            and monitor_name like concat('%',#{keyword},'%')
+        </if>
+    </select>
+
     <select id="selectInfoByDeviceIp" resultType="com.casic.missiles.modular.system.dto.monitor.MonitorBaseInfo">
         SELECT a.STATION_ID   as stationId,
                b.STATION_NAME as stationName,

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4db8723..f6dbcb6 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -16,6 +16,7 @@
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     RUN_TIME_FAILED(2502, "此段时间都小于当前时间无法开启"),
     CRUISE_NAME_DUPLICATE(2503, "巡航路径名称重复"),
+    CRUISE_DELETE_FAIL(2506, "该巡航线在任务中正在启用状态，无法删除"),
     CRUISE_DELETE_ERROR(2504, "巡航路径删除过程中对设备操作异常"),
     ALARM_BASE64_ERROR(2505, "算法报警图片base64无效");
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
index 7e97d2e..6e2cc3f 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
@@ -65,11 +65,12 @@
         <if test="request.endTime!='' and request.endTime!=null">
             AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
         </if>
+        order by ar.ALARM_TIME desc
     </select>
 
     <select id="detail" resultType="com.casic.missiles.modular.system.dto.AlarmRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
+        distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts,
         <include refid="monitor_Column_List"/>,
         bs.STATION_NAME as stationName,
         bo.LINE_NAME as lineName
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index e4aa1eb..d7db028 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -52,9 +52,11 @@
         ElasticSearchQuery elasticSearchQuery = new ElasticSearchQuery();
         if (CollectionUtils.isNotEmpty(obserpoiInfoList)) {
             for (BusObserpoiInfo busObserpoiInfo : obserpoiInfoList) {
-                ElasticSearchQuery mustQuery = new ElasticSearchQuery();
-                elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
-                        .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                if (ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection()) && ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection())) {
+                    ElasticSearchQuery mustQuery = new ElasticSearchQuery();
+                    elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
+                            .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                }
             }
         }
         elasticSearchQuery.endShould();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
index 34fb08a..d2a6cf9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
@@ -270,7 +270,7 @@
      */
     @RequestMapping("/toPosition")
     @ResponseBody
-    public Object angle(String deviceIp, String horizontalAngle, String verticalAngle) {
+    public Object toPosition(String deviceIp, String horizontalAngle, String verticalAngle) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
             return ResponseData.error("设备注册失败");
@@ -280,6 +280,8 @@
         if (ObjectUtil.isNotEmpty(monipoiInfo) && DeviceTypeEnum.SELF_TYPE.getCode().equals(monipoiInfo.getDeviceType())) {
             res = ihcNetService.setPosition(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         } else {
+            //先停止
+            ihcNetService.stopDevice(userId);
             res = ihcNetService.setPositionNew(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         }
         return res ? ResponseData.success() : ResponseData.error("请求失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index c69204f..53f0317 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -25,7 +25,7 @@
         SELECT
         <include refid="Base_Column_List"/>,monitorName,dept_id,lineName
         FROM
-            bus_plan bp
+        bus_plan bp
         JOIN (
             SELECT line_name AS  lineName,monitor_id,LINE_NUM as lineNum
             FROM bus_obserpoi_info
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
index 5b9638c..31ae19a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
@@ -25,4 +25,8 @@
 
     List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan);
 
+    boolean getTaskOnByMonitorIdAndLine(Long monitorId, int  lineNum);
+
+    boolean deleteTaskByMonitorIdAndLine(Long monitorId, int  lineNum);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
index 61262eb..178ee90 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
@@ -54,6 +54,8 @@
 
     boolean interruptStart(String deviceIp) ;
 
+    boolean stopDevice(Long userId) ;
+
     Long getUserIdByIp(String deviceIp);
 
     void globalSet(GlobalParamsDTO globalParamsDTO);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
index 6df5d0c..870559a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -213,4 +214,21 @@
         return false;
     }
 
+
+    @Override
+    public boolean getTaskOnByMonitorIdAndLine(Long monitorId, int lineNum) {
+        QueryWrapper<BusPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("MONITOR_ID", monitorId);
+        queryWrapper.eq("LINE_NUM", lineNum);
+        queryWrapper.eq("STATUS", StatusEnum.STATUS_OPEN);
+        return ObjectUtil.isNotEmpty(this.list(queryWrapper)) ? true : false;
+    }
+
+    @Override
+    public boolean deleteTaskByMonitorIdAndLine(Long monitorId, int lineNum) {
+        QueryWrapper<BusPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("MONITOR_ID", monitorId);
+        queryWrapper.eq("LINE_NUM", lineNum);
+        return this.baseMapper.delete(queryWrapper)>0?true:false;
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
index af08323..2f62c1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
@@ -49,7 +49,7 @@
     private static final Integer delayTime = 7200;
 
     //特殊预置点号数组
-    private static final Integer[] presets = {65,67,68,69,70,72,73,82,87,88,90,92,114,121,122,129};
+    private static final Integer[] presets = {65, 67, 68, 69, 70, 72, 73, 82, 87, 88, 90, 92, 114, 121, 122, 129};
 
     public Long getTimestampCollcect() {
         return timestampCollcect;
@@ -70,6 +70,8 @@
     @Autowired
     private IAlarmRecordService alarmRecordService;
     @Autowired
+    private IBusPlanService busPlanService;
+    @Autowired
     private WebSocket webSocket;
     @Value("${casic.panTilt.defaultStoptime:5}")
     private String defaultStoptime;
@@ -514,6 +516,18 @@
     }
 
     @Override
+    public boolean stopDevice(Long userId) {
+        try {
+            Long serialHandle = serialHandle(Long.valueOf(userId));
+            Thread.sleep(300);
+            return sendStopCommand(serialHandle);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    @Override
     public boolean interruptStart(String deviceIp) {
 
         BusMonipoiInfo monipoiInfo = monipoiInfoService.selectByDeviceIp(deviceIp);
@@ -683,7 +697,7 @@
                 res = cruiseEdit(cruiseName, deviceIp, cruiseValue);
                 break;
             case "cruiseDelete":
-                res = cruiseDelete( deviceIp, cruiseName, cruiseValue);
+                res = cruiseDelete(deviceIp, cruiseName, cruiseValue);
                 break;
             default:
                 break;
@@ -714,7 +728,7 @@
     private boolean cruiseDelete(String deviceIp, String cruiseName, Integer cruiseValue) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
-             throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
+            throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
         }
         Long serialHandle = serialHandle(Long.valueOf(userId));
         List<BusObserpoiInfo> busObserpoiInfoList = obserpoiInfoService.selectByMonitor(deviceIp, cruiseValue);
@@ -725,6 +739,10 @@
         }
         try {
             BusMonipoiInfo busMonipoiInfo = monipoiInfoService.selectByDeviceIp(deviceIp);
+            //先查询是否有巡航任务正在执行
+            if (busPlanService.getTaskOnByMonitorIdAndLine(busMonipoiInfo.getId(), cruiseValue)) {
+                throw new BusinessException(BusinessExceptionEnum.CRUISE_DELETE_FAIL);
+            }
             //先停止巡航
             if (DeviceTypeEnum.XST_TYPE.getCode().equals(busMonipoiInfo.getDeviceType())) {
                 sendStopCommand(serialHandle);
@@ -743,7 +761,8 @@
                     }
                 });
             }
-            return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue);
+            return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue) &&
+                    busPlanService.deleteTaskByMonitorIdAndLine(busMonipoiInfo.getId(), cruiseValue);
         } catch (Exception e) {
             throw new BusinessException(BusinessExceptionEnum.CRUISE_DELETE_ERROR);
         }
@@ -923,7 +942,10 @@
                     //给解码板设置预置位
                     Long serialHandle = serialHandle(Long.valueOf(userId));
                     Thread.sleep(300);
-                    flag = paramsSet(userId, serialHandle, presetIndex, stopTime, speed, alarmValue);
+                    if (setPreset(serialHandle, presetIndex)) {
+                        Thread.sleep(300);
+                        flag = paramsSet(userId, serialHandle, presetIndex, stopTime, speed, alarmValue);
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                     flag = false;
@@ -1351,6 +1373,8 @@
 
     @Override
     public void sendDeviceStatusData(String deviceIp, String deviceStatus) {
+        System.out.println(new Date() + ":" + deviceIp.concat("+ 设备状态-->").concat(deviceStatus));
+
         JSONObject msg = new JSONObject();
         msg.put("deviceIp", deviceIp);
         msg.put("time", DateUtil.formatDateTime(new Date()));
@@ -2012,6 +2036,8 @@
                 throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
             }
             Long serialHandle = serialHandle(Long.valueOf(userId));
+            //先停止设备
+            this.stopDevice(serialHandle);
             //设置全局报警值
             if (ObjectUtil.isNotEmpty(globalParamsDTO.getHigh())) {
                 this.setWholeAlarmValue(userId.intValue(), serialHandle, globalParamsDTO.getHigh());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
index 944370f..14e0055 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
@@ -63,6 +63,7 @@
             alarmRecord.setAlarmStatus(StatusEnum.ALARM_ON);
             alarmRecord.setAlarmType(alarmAIDTO.getAlarmType());
             alarmRecord.setAlarmTime(DateUtil.parseDateTime(alarmAIDTO.getAlarmTime()));
+            alarmRecord.setAlarmValue(ObjectUtil.isNotEmpty(alarmAIDTO.getSimilarity())?Double.valueOf(alarmAIDTO.getSimilarity()):99);
             //保存照片
             if (ObjectUtil.isNotEmpty(alarmAIDTO.getPhoto()) && alarmAIDTO.getPhoto().startsWith("data:image")) {
                 alarmRecord.setPhoto(commonFileService.saveFileBase64Image(alarmAIDTO.getPhoto()));
@@ -78,6 +79,7 @@
             msg.put("alarmId", alarmRecord.getId());
             msg.put("alarmTime", alarmRecord.getAlarmTime());
             msg.put("alarmType", alarmRecord.getAlarmType());
+            msg.put("similarity", alarmRecord.getAlarmValue());
             msg.put("alarmTypeName", dictService.getDictNameByCode(DictEnum.ALARM_TYPE,alarmRecord.getAlarmType()));
             msg.put("alarmPhoto", alarmRecord.getPhoto());
             webSocket.sendAllMessage(msg.toJSONString());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
index b27830a..79a753b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.StatusEnum;
 import com.casic.missiles.modular.system.dto.DeviceCommom;
 import com.casic.missiles.modular.system.dto.DeviceInfo;
@@ -54,7 +55,10 @@
         QueryWrapper query = new QueryWrapper();
         query.eq("VALID", "0");
         List<BusMonipoiInfo> deviceList = monipoiInfoService.list(query);
+
         if (deviceList != null && deviceList.size() > 0) {
+            //初始化设备状态
+            monipoiInfoService.updateDeviceStatus(StatusEnum.STATUS_OFFLINE);
             // 创建线程池，每个设备一个线程
             ThreadPoolExecutor executor = new ThreadPoolExecutor(deviceList.size(), deviceList.size(), 10, TimeUnit.SECONDS,
                     new ArrayBlockingQueue<>(20), new ThreadPoolExecutor.CallerRunsPolicy());
@@ -122,7 +126,7 @@
                 if (isOpen == 1) {
                     if (map.get(this.deviceIp) != null) {
                         map.put(this.deviceIp, map.get(this.deviceIp) + 1);
-                        if (map.get(this.deviceIp) % 300L == 0) {
+                        if (map.get(this.deviceIp) % 50L == 0) {
                             //若在线，更新设备离线
                             if (deviceStatus) {
                                 if (monipoiInfoService.updateStatus(this.deviceIp, StatusEnum.STATUS_OFFLINE)) {
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
index 5249831..35646ac 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
@@ -109,4 +109,16 @@
         return ResponseData.success(busMonipoiInfoService.overviewMap(keywordDTO.getKeyword()));
     }
 
+
+
+
+    /**
+     * 获取监测点/设备信息列表供算法调用
+     */
+    @RequestMapping(value = "/AIlistPage")
+    public Object AIlistPage(@RequestBody @Valid MonitorListDTO monitorListDTO) throws Exception {
+        return ResponseData.success(busMonipoiInfoService.AIlistPage( monitorListDTO.getStationId(), monitorListDTO.getKeyword()));
+    }
+
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
index 92d8264..9ab2622 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
@@ -26,6 +26,8 @@
 
     List<BusMonipoiInfo> monitorListPage(@Param("page") Page<BusMonipoiInfo> page,@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword);
 
+    List<BusMonipoiInfo> AIlistPage( @Param("stationId")Long stationId,@Param("keyword")String keyword);
+
     MonitorBaseInfo selectInfoByDeviceIp(@Param("deviceIp") String deviceIp);
 
     BusMonipoiInfoResponse monitorDetail(@Param("id") Long id);
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
index 22777d5..de44bbe 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
@@ -35,7 +35,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID
-        AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS type, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts
+        AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS deviceType, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts
     </sql>
 
     <select id="monitorList" resultType="com.casic.missiles.modular.system.dto.monitor.MonitorPointList">
@@ -70,6 +70,25 @@
         </if>
     </select>
 
+
+    <select id="AIlistPage" resultType="com.casic.missiles.modular.system.model.BusMonipoiInfo">
+        SELECT
+        <include refid="Base_Column_List"/>,stationName
+        FROM bus_monipoi_info
+        JOIN (
+        SELECT id as idd,DEPT_ID,STATION_NAME AS stationName
+        FROM bus_station_info
+        WHERE valid=0
+        )bsi ON bsi.idd=station_id
+        where valid=0
+        <if test="stationId!= null and stationId !=''">
+            and station_id =#{stationId}
+        </if>
+        <if test="keyword!= null and keyword !=''">
+            and monitor_name like concat('%',#{keyword},'%')
+        </if>
+    </select>
+
     <select id="selectInfoByDeviceIp" resultType="com.casic.missiles.modular.system.dto.monitor.MonitorBaseInfo">
         SELECT a.STATION_ID   as stationId,
                b.STATION_NAME as stationName,
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java
index a0ad8e5..30a38fb 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java
@@ -24,6 +24,8 @@
 
     Page<BusMonipoiInfo> monitorListPage(Page<BusMonipoiInfo> page, Long stationId, String keyword)throws Exception;
 
+    List<BusMonipoiInfo> AIlistPage( Long stationId, String keyword)throws Exception;
+
     ResponseData addMonitor(BusMonipoiInfo busMonipoiInfo);
 
     ResponseData updateMonitor(BusMonipoiInfo busMonipoiInfo);
@@ -43,4 +45,6 @@
     void updateBusMonipoiInfo(String deviceIp,int lineNum);
 
     boolean updateStatus(String deviceIp,String status);
+
+    boolean updateDeviceStatus(String status);
 }

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4db8723..f6dbcb6 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -16,6 +16,7 @@
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     RUN_TIME_FAILED(2502, "此段时间都小于当前时间无法开启"),
     CRUISE_NAME_DUPLICATE(2503, "巡航路径名称重复"),
+    CRUISE_DELETE_FAIL(2506, "该巡航线在任务中正在启用状态，无法删除"),
     CRUISE_DELETE_ERROR(2504, "巡航路径删除过程中对设备操作异常"),
     ALARM_BASE64_ERROR(2505, "算法报警图片base64无效");
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
index 7e97d2e..6e2cc3f 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
@@ -65,11 +65,12 @@
         <if test="request.endTime!='' and request.endTime!=null">
             AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
         </if>
+        order by ar.ALARM_TIME desc
     </select>
 
     <select id="detail" resultType="com.casic.missiles.modular.system.dto.AlarmRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
+        distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts,
         <include refid="monitor_Column_List"/>,
         bs.STATION_NAME as stationName,
         bo.LINE_NAME as lineName
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index e4aa1eb..d7db028 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -52,9 +52,11 @@
         ElasticSearchQuery elasticSearchQuery = new ElasticSearchQuery();
         if (CollectionUtils.isNotEmpty(obserpoiInfoList)) {
             for (BusObserpoiInfo busObserpoiInfo : obserpoiInfoList) {
-                ElasticSearchQuery mustQuery = new ElasticSearchQuery();
-                elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
-                        .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                if (ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection()) && ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection())) {
+                    ElasticSearchQuery mustQuery = new ElasticSearchQuery();
+                    elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
+                            .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                }
             }
         }
         elasticSearchQuery.endShould();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
index 34fb08a..d2a6cf9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
@@ -270,7 +270,7 @@
      */
     @RequestMapping("/toPosition")
     @ResponseBody
-    public Object angle(String deviceIp, String horizontalAngle, String verticalAngle) {
+    public Object toPosition(String deviceIp, String horizontalAngle, String verticalAngle) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
             return ResponseData.error("设备注册失败");
@@ -280,6 +280,8 @@
         if (ObjectUtil.isNotEmpty(monipoiInfo) && DeviceTypeEnum.SELF_TYPE.getCode().equals(monipoiInfo.getDeviceType())) {
             res = ihcNetService.setPosition(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         } else {
+            //先停止
+            ihcNetService.stopDevice(userId);
             res = ihcNetService.setPositionNew(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         }
         return res ? ResponseData.success() : ResponseData.error("请求失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index c69204f..53f0317 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -25,7 +25,7 @@
         SELECT
         <include refid="Base_Column_List"/>,monitorName,dept_id,lineName
         FROM
-            bus_plan bp
+        bus_plan bp
         JOIN (
             SELECT line_name AS  lineName,monitor_id,LINE_NUM as lineNum
             FROM bus_obserpoi_info
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
index 5b9638c..31ae19a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
@@ -25,4 +25,8 @@
 
     List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan);
 
+    boolean getTaskOnByMonitorIdAndLine(Long monitorId, int  lineNum);
+
+    boolean deleteTaskByMonitorIdAndLine(Long monitorId, int  lineNum);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
index 61262eb..178ee90 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
@@ -54,6 +54,8 @@
 
     boolean interruptStart(String deviceIp) ;
 
+    boolean stopDevice(Long userId) ;
+
     Long getUserIdByIp(String deviceIp);
 
     void globalSet(GlobalParamsDTO globalParamsDTO);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
index 6df5d0c..870559a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -213,4 +214,21 @@
         return false;
     }
 
+
+    @Override
+    public boolean getTaskOnByMonitorIdAndLine(Long monitorId, int lineNum) {
+        QueryWrapper<BusPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("MONITOR_ID", monitorId);
+        queryWrapper.eq("LINE_NUM", lineNum);
+        queryWrapper.eq("STATUS", StatusEnum.STATUS_OPEN);
+        return ObjectUtil.isNotEmpty(this.list(queryWrapper)) ? true : false;
+    }
+
+    @Override
+    public boolean deleteTaskByMonitorIdAndLine(Long monitorId, int lineNum) {
+        QueryWrapper<BusPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("MONITOR_ID", monitorId);
+        queryWrapper.eq("LINE_NUM", lineNum);
+        return this.baseMapper.delete(queryWrapper)>0?true:false;
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
index af08323..2f62c1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
@@ -49,7 +49,7 @@
     private static final Integer delayTime = 7200;
 
     //特殊预置点号数组
-    private static final Integer[] presets = {65,67,68,69,70,72,73,82,87,88,90,92,114,121,122,129};
+    private static final Integer[] presets = {65, 67, 68, 69, 70, 72, 73, 82, 87, 88, 90, 92, 114, 121, 122, 129};
 
     public Long getTimestampCollcect() {
         return timestampCollcect;
@@ -70,6 +70,8 @@
     @Autowired
     private IAlarmRecordService alarmRecordService;
     @Autowired
+    private IBusPlanService busPlanService;
+    @Autowired
     private WebSocket webSocket;
     @Value("${casic.panTilt.defaultStoptime:5}")
     private String defaultStoptime;
@@ -514,6 +516,18 @@
     }
 
     @Override
+    public boolean stopDevice(Long userId) {
+        try {
+            Long serialHandle = serialHandle(Long.valueOf(userId));
+            Thread.sleep(300);
+            return sendStopCommand(serialHandle);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    @Override
     public boolean interruptStart(String deviceIp) {
 
         BusMonipoiInfo monipoiInfo = monipoiInfoService.selectByDeviceIp(deviceIp);
@@ -683,7 +697,7 @@
                 res = cruiseEdit(cruiseName, deviceIp, cruiseValue);
                 break;
             case "cruiseDelete":
-                res = cruiseDelete( deviceIp, cruiseName, cruiseValue);
+                res = cruiseDelete(deviceIp, cruiseName, cruiseValue);
                 break;
             default:
                 break;
@@ -714,7 +728,7 @@
     private boolean cruiseDelete(String deviceIp, String cruiseName, Integer cruiseValue) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
-             throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
+            throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
         }
         Long serialHandle = serialHandle(Long.valueOf(userId));
         List<BusObserpoiInfo> busObserpoiInfoList = obserpoiInfoService.selectByMonitor(deviceIp, cruiseValue);
@@ -725,6 +739,10 @@
         }
         try {
             BusMonipoiInfo busMonipoiInfo = monipoiInfoService.selectByDeviceIp(deviceIp);
+            //先查询是否有巡航任务正在执行
+            if (busPlanService.getTaskOnByMonitorIdAndLine(busMonipoiInfo.getId(), cruiseValue)) {
+                throw new BusinessException(BusinessExceptionEnum.CRUISE_DELETE_FAIL);
+            }
             //先停止巡航
             if (DeviceTypeEnum.XST_TYPE.getCode().equals(busMonipoiInfo.getDeviceType())) {
                 sendStopCommand(serialHandle);
@@ -743,7 +761,8 @@
                     }
                 });
             }
-            return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue);
+            return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue) &&
+                    busPlanService.deleteTaskByMonitorIdAndLine(busMonipoiInfo.getId(), cruiseValue);
         } catch (Exception e) {
             throw new BusinessException(BusinessExceptionEnum.CRUISE_DELETE_ERROR);
         }
@@ -923,7 +942,10 @@
                     //给解码板设置预置位
                     Long serialHandle = serialHandle(Long.valueOf(userId));
                     Thread.sleep(300);
-                    flag = paramsSet(userId, serialHandle, presetIndex, stopTime, speed, alarmValue);
+                    if (setPreset(serialHandle, presetIndex)) {
+                        Thread.sleep(300);
+                        flag = paramsSet(userId, serialHandle, presetIndex, stopTime, speed, alarmValue);
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                     flag = false;
@@ -1351,6 +1373,8 @@
 
     @Override
     public void sendDeviceStatusData(String deviceIp, String deviceStatus) {
+        System.out.println(new Date() + ":" + deviceIp.concat("+ 设备状态-->").concat(deviceStatus));
+
         JSONObject msg = new JSONObject();
         msg.put("deviceIp", deviceIp);
         msg.put("time", DateUtil.formatDateTime(new Date()));
@@ -2012,6 +2036,8 @@
                 throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
             }
             Long serialHandle = serialHandle(Long.valueOf(userId));
+            //先停止设备
+            this.stopDevice(serialHandle);
             //设置全局报警值
             if (ObjectUtil.isNotEmpty(globalParamsDTO.getHigh())) {
                 this.setWholeAlarmValue(userId.intValue(), serialHandle, globalParamsDTO.getHigh());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
index 944370f..14e0055 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
@@ -63,6 +63,7 @@
             alarmRecord.setAlarmStatus(StatusEnum.ALARM_ON);
             alarmRecord.setAlarmType(alarmAIDTO.getAlarmType());
             alarmRecord.setAlarmTime(DateUtil.parseDateTime(alarmAIDTO.getAlarmTime()));
+            alarmRecord.setAlarmValue(ObjectUtil.isNotEmpty(alarmAIDTO.getSimilarity())?Double.valueOf(alarmAIDTO.getSimilarity()):99);
             //保存照片
             if (ObjectUtil.isNotEmpty(alarmAIDTO.getPhoto()) && alarmAIDTO.getPhoto().startsWith("data:image")) {
                 alarmRecord.setPhoto(commonFileService.saveFileBase64Image(alarmAIDTO.getPhoto()));
@@ -78,6 +79,7 @@
             msg.put("alarmId", alarmRecord.getId());
             msg.put("alarmTime", alarmRecord.getAlarmTime());
             msg.put("alarmType", alarmRecord.getAlarmType());
+            msg.put("similarity", alarmRecord.getAlarmValue());
             msg.put("alarmTypeName", dictService.getDictNameByCode(DictEnum.ALARM_TYPE,alarmRecord.getAlarmType()));
             msg.put("alarmPhoto", alarmRecord.getPhoto());
             webSocket.sendAllMessage(msg.toJSONString());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
index b27830a..79a753b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.StatusEnum;
 import com.casic.missiles.modular.system.dto.DeviceCommom;
 import com.casic.missiles.modular.system.dto.DeviceInfo;
@@ -54,7 +55,10 @@
         QueryWrapper query = new QueryWrapper();
         query.eq("VALID", "0");
         List<BusMonipoiInfo> deviceList = monipoiInfoService.list(query);
+
         if (deviceList != null && deviceList.size() > 0) {
+            //初始化设备状态
+            monipoiInfoService.updateDeviceStatus(StatusEnum.STATUS_OFFLINE);
             // 创建线程池，每个设备一个线程
             ThreadPoolExecutor executor = new ThreadPoolExecutor(deviceList.size(), deviceList.size(), 10, TimeUnit.SECONDS,
                     new ArrayBlockingQueue<>(20), new ThreadPoolExecutor.CallerRunsPolicy());
@@ -122,7 +126,7 @@
                 if (isOpen == 1) {
                     if (map.get(this.deviceIp) != null) {
                         map.put(this.deviceIp, map.get(this.deviceIp) + 1);
-                        if (map.get(this.deviceIp) % 300L == 0) {
+                        if (map.get(this.deviceIp) % 50L == 0) {
                             //若在线，更新设备离线
                             if (deviceStatus) {
                                 if (monipoiInfoService.updateStatus(this.deviceIp, StatusEnum.STATUS_OFFLINE)) {
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
index 5249831..35646ac 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
@@ -109,4 +109,16 @@
         return ResponseData.success(busMonipoiInfoService.overviewMap(keywordDTO.getKeyword()));
     }
 
+
+
+
+    /**
+     * 获取监测点/设备信息列表供算法调用
+     */
+    @RequestMapping(value = "/AIlistPage")
+    public Object AIlistPage(@RequestBody @Valid MonitorListDTO monitorListDTO) throws Exception {
+        return ResponseData.success(busMonipoiInfoService.AIlistPage( monitorListDTO.getStationId(), monitorListDTO.getKeyword()));
+    }
+
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
index 92d8264..9ab2622 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
@@ -26,6 +26,8 @@
 
     List<BusMonipoiInfo> monitorListPage(@Param("page") Page<BusMonipoiInfo> page,@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword);
 
+    List<BusMonipoiInfo> AIlistPage( @Param("stationId")Long stationId,@Param("keyword")String keyword);
+
     MonitorBaseInfo selectInfoByDeviceIp(@Param("deviceIp") String deviceIp);
 
     BusMonipoiInfoResponse monitorDetail(@Param("id") Long id);
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
index 22777d5..de44bbe 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
@@ -35,7 +35,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID
-        AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS type, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts
+        AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS deviceType, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts
     </sql>
 
     <select id="monitorList" resultType="com.casic.missiles.modular.system.dto.monitor.MonitorPointList">
@@ -70,6 +70,25 @@
         </if>
     </select>
 
+
+    <select id="AIlistPage" resultType="com.casic.missiles.modular.system.model.BusMonipoiInfo">
+        SELECT
+        <include refid="Base_Column_List"/>,stationName
+        FROM bus_monipoi_info
+        JOIN (
+        SELECT id as idd,DEPT_ID,STATION_NAME AS stationName
+        FROM bus_station_info
+        WHERE valid=0
+        )bsi ON bsi.idd=station_id
+        where valid=0
+        <if test="stationId!= null and stationId !=''">
+            and station_id =#{stationId}
+        </if>
+        <if test="keyword!= null and keyword !=''">
+            and monitor_name like concat('%',#{keyword},'%')
+        </if>
+    </select>
+
     <select id="selectInfoByDeviceIp" resultType="com.casic.missiles.modular.system.dto.monitor.MonitorBaseInfo">
         SELECT a.STATION_ID   as stationId,
                b.STATION_NAME as stationName,
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java
index a0ad8e5..30a38fb 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java
@@ -24,6 +24,8 @@
 
     Page<BusMonipoiInfo> monitorListPage(Page<BusMonipoiInfo> page, Long stationId, String keyword)throws Exception;
 
+    List<BusMonipoiInfo> AIlistPage( Long stationId, String keyword)throws Exception;
+
     ResponseData addMonitor(BusMonipoiInfo busMonipoiInfo);
 
     ResponseData updateMonitor(BusMonipoiInfo busMonipoiInfo);
@@ -43,4 +45,6 @@
     void updateBusMonipoiInfo(String deviceIp,int lineNum);
 
     boolean updateStatus(String deviceIp,String status);
+
+    boolean updateDeviceStatus(String status);
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java
index 6fd83ca..a94ea14 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -63,6 +64,16 @@
         return page;
     }
 
+
+    @Override
+    public List<BusMonipoiInfo> AIlistPage(Long stationId, String keyword) throws Exception {
+        List<BusMonipoiInfo> busMonipoiInfoList = this.baseMapper.AIlistPage( stationId, keyword);
+        for (BusMonipoiInfo busMonipoiInfo : busMonipoiInfoList) {
+            DictCodeUtils.convertDictCodeToName(busMonipoiInfo);
+        }
+        return busMonipoiInfoList;
+    }
+
     @Override
     public ResponseData addMonitor(BusMonipoiInfo busMonipoiInfo) {
         checkIsExist(busMonipoiInfo);
@@ -157,6 +168,13 @@
         return false;
     }
 
+    @Override
+    public boolean updateDeviceStatus(String status) {
+        UpdateWrapper<BusMonipoiInfo>  updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("VALID", "0");
+        updateWrapper.set("DEVICE_STATUS",status);
+        return this.update(updateWrapper);
+    }
 
     @Override
     public BusMonipoiInfo selectByNvr(String nvrIp, String channel) {

diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4db8723..f6dbcb6 100644
--- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -16,6 +16,7 @@
     RUN_TASK_FAILED(2501, "此段时间有任务正在执行"),
     RUN_TIME_FAILED(2502, "此段时间都小于当前时间无法开启"),
     CRUISE_NAME_DUPLICATE(2503, "巡航路径名称重复"),
+    CRUISE_DELETE_FAIL(2506, "该巡航线在任务中正在启用状态，无法删除"),
     CRUISE_DELETE_ERROR(2504, "巡航路径删除过程中对设备操作异常"),
     ALARM_BASE64_ERROR(2505, "算法报警图片base64无效");
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
index 7e97d2e..6e2cc3f 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
@@ -65,11 +65,12 @@
         <if test="request.endTime!='' and request.endTime!=null">
             AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
         </if>
+        order by ar.ALARM_TIME desc
     </select>
 
     <select id="detail" resultType="com.casic.missiles.modular.system.dto.AlarmRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
+        distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts,
         <include refid="monitor_Column_List"/>,
         bs.STATION_NAME as stationName,
         bo.LINE_NAME as lineName
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
index e4aa1eb..d7db028 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
@@ -52,9 +52,11 @@
         ElasticSearchQuery elasticSearchQuery = new ElasticSearchQuery();
         if (CollectionUtils.isNotEmpty(obserpoiInfoList)) {
             for (BusObserpoiInfo busObserpoiInfo : obserpoiInfoList) {
-                ElasticSearchQuery mustQuery = new ElasticSearchQuery();
-                elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
-                        .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                if (ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection()) && ObjectUtils.isNotEmpty(busObserpoiInfo.getDirection())) {
+                    ElasticSearchQuery mustQuery = new ElasticSearchQuery();
+                    elasticSearchQuery.should(mustQuery.build().rangeBool("direction", busObserpoiInfo.getDirection() - endpoint, busObserpoiInfo.getDirection() + endpoint)
+                            .rangeBool("pitch", busObserpoiInfo.getPitch() - endpoint, busObserpoiInfo.getPitch() + endpoint).builder());
+                }
             }
         }
         elasticSearchQuery.endShould();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
index 34fb08a..d2a6cf9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
@@ -270,7 +270,7 @@
      */
     @RequestMapping("/toPosition")
     @ResponseBody
-    public Object angle(String deviceIp, String horizontalAngle, String verticalAngle) {
+    public Object toPosition(String deviceIp, String horizontalAngle, String verticalAngle) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
             return ResponseData.error("设备注册失败");
@@ -280,6 +280,8 @@
         if (ObjectUtil.isNotEmpty(monipoiInfo) && DeviceTypeEnum.SELF_TYPE.getCode().equals(monipoiInfo.getDeviceType())) {
             res = ihcNetService.setPosition(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         } else {
+            //先停止
+            ihcNetService.stopDevice(userId);
             res = ihcNetService.setPositionNew(userId, Double.valueOf(horizontalAngle), Double.valueOf(verticalAngle));
         }
         return res ? ResponseData.success() : ResponseData.error("请求失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index c69204f..53f0317 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -25,7 +25,7 @@
         SELECT
         <include refid="Base_Column_List"/>,monitorName,dept_id,lineName
         FROM
-            bus_plan bp
+        bus_plan bp
         JOIN (
             SELECT line_name AS  lineName,monitor_id,LINE_NUM as lineNum
             FROM bus_obserpoi_info
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
index 5b9638c..31ae19a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
@@ -25,4 +25,8 @@
 
     List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan);
 
+    boolean getTaskOnByMonitorIdAndLine(Long monitorId, int  lineNum);
+
+    boolean deleteTaskByMonitorIdAndLine(Long monitorId, int  lineNum);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
index 61262eb..178ee90 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
@@ -54,6 +54,8 @@
 
     boolean interruptStart(String deviceIp) ;
 
+    boolean stopDevice(Long userId) ;
+
     Long getUserIdByIp(String deviceIp);
 
     void globalSet(GlobalParamsDTO globalParamsDTO);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
index 6df5d0c..870559a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -213,4 +214,21 @@
         return false;
     }
 
+
+    @Override
+    public boolean getTaskOnByMonitorIdAndLine(Long monitorId, int lineNum) {
+        QueryWrapper<BusPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("MONITOR_ID", monitorId);
+        queryWrapper.eq("LINE_NUM", lineNum);
+        queryWrapper.eq("STATUS", StatusEnum.STATUS_OPEN);
+        return ObjectUtil.isNotEmpty(this.list(queryWrapper)) ? true : false;
+    }
+
+    @Override
+    public boolean deleteTaskByMonitorIdAndLine(Long monitorId, int lineNum) {
+        QueryWrapper<BusPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("MONITOR_ID", monitorId);
+        queryWrapper.eq("LINE_NUM", lineNum);
+        return this.baseMapper.delete(queryWrapper)>0?true:false;
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
index af08323..2f62c1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
@@ -49,7 +49,7 @@
     private static final Integer delayTime = 7200;
 
     //特殊预置点号数组
-    private static final Integer[] presets = {65,67,68,69,70,72,73,82,87,88,90,92,114,121,122,129};
+    private static final Integer[] presets = {65, 67, 68, 69, 70, 72, 73, 82, 87, 88, 90, 92, 114, 121, 122, 129};
 
     public Long getTimestampCollcect() {
         return timestampCollcect;
@@ -70,6 +70,8 @@
     @Autowired
     private IAlarmRecordService alarmRecordService;
     @Autowired
+    private IBusPlanService busPlanService;
+    @Autowired
     private WebSocket webSocket;
     @Value("${casic.panTilt.defaultStoptime:5}")
     private String defaultStoptime;
@@ -514,6 +516,18 @@
     }
 
     @Override
+    public boolean stopDevice(Long userId) {
+        try {
+            Long serialHandle = serialHandle(Long.valueOf(userId));
+            Thread.sleep(300);
+            return sendStopCommand(serialHandle);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    @Override
     public boolean interruptStart(String deviceIp) {
 
         BusMonipoiInfo monipoiInfo = monipoiInfoService.selectByDeviceIp(deviceIp);
@@ -683,7 +697,7 @@
                 res = cruiseEdit(cruiseName, deviceIp, cruiseValue);
                 break;
             case "cruiseDelete":
-                res = cruiseDelete( deviceIp, cruiseName, cruiseValue);
+                res = cruiseDelete(deviceIp, cruiseName, cruiseValue);
                 break;
             default:
                 break;
@@ -714,7 +728,7 @@
     private boolean cruiseDelete(String deviceIp, String cruiseName, Integer cruiseValue) {
         Long userId = getUserIdByIp(deviceIp);
         if (ObjectUtil.isEmpty(userId) || userId < 0) {
-             throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
+            throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
         }
         Long serialHandle = serialHandle(Long.valueOf(userId));
         List<BusObserpoiInfo> busObserpoiInfoList = obserpoiInfoService.selectByMonitor(deviceIp, cruiseValue);
@@ -725,6 +739,10 @@
         }
         try {
             BusMonipoiInfo busMonipoiInfo = monipoiInfoService.selectByDeviceIp(deviceIp);
+            //先查询是否有巡航任务正在执行
+            if (busPlanService.getTaskOnByMonitorIdAndLine(busMonipoiInfo.getId(), cruiseValue)) {
+                throw new BusinessException(BusinessExceptionEnum.CRUISE_DELETE_FAIL);
+            }
             //先停止巡航
             if (DeviceTypeEnum.XST_TYPE.getCode().equals(busMonipoiInfo.getDeviceType())) {
                 sendStopCommand(serialHandle);
@@ -743,7 +761,8 @@
                     }
                 });
             }
-            return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue);
+            return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue) &&
+                    busPlanService.deleteTaskByMonitorIdAndLine(busMonipoiInfo.getId(), cruiseValue);
         } catch (Exception e) {
             throw new BusinessException(BusinessExceptionEnum.CRUISE_DELETE_ERROR);
         }
@@ -923,7 +942,10 @@
                     //给解码板设置预置位
                     Long serialHandle = serialHandle(Long.valueOf(userId));
                     Thread.sleep(300);
-                    flag = paramsSet(userId, serialHandle, presetIndex, stopTime, speed, alarmValue);
+                    if (setPreset(serialHandle, presetIndex)) {
+                        Thread.sleep(300);
+                        flag = paramsSet(userId, serialHandle, presetIndex, stopTime, speed, alarmValue);
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                     flag = false;
@@ -1351,6 +1373,8 @@
 
     @Override
     public void sendDeviceStatusData(String deviceIp, String deviceStatus) {
+        System.out.println(new Date() + ":" + deviceIp.concat("+ 设备状态-->").concat(deviceStatus));
+
         JSONObject msg = new JSONObject();
         msg.put("deviceIp", deviceIp);
         msg.put("time", DateUtil.formatDateTime(new Date()));
@@ -2012,6 +2036,8 @@
                 throw new BusinessException(BusinessExceptionEnum.DEVICE_REGISTER_FAILED);
             }
             Long serialHandle = serialHandle(Long.valueOf(userId));
+            //先停止设备
+            this.stopDevice(serialHandle);
             //设置全局报警值
             if (ObjectUtil.isNotEmpty(globalParamsDTO.getHigh())) {
                 this.setWholeAlarmValue(userId.intValue(), serialHandle, globalParamsDTO.getHigh());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
index 944370f..14e0055 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java
@@ -63,6 +63,7 @@
             alarmRecord.setAlarmStatus(StatusEnum.ALARM_ON);
             alarmRecord.setAlarmType(alarmAIDTO.getAlarmType());
             alarmRecord.setAlarmTime(DateUtil.parseDateTime(alarmAIDTO.getAlarmTime()));
+            alarmRecord.setAlarmValue(ObjectUtil.isNotEmpty(alarmAIDTO.getSimilarity())?Double.valueOf(alarmAIDTO.getSimilarity()):99);
             //保存照片
             if (ObjectUtil.isNotEmpty(alarmAIDTO.getPhoto()) && alarmAIDTO.getPhoto().startsWith("data:image")) {
                 alarmRecord.setPhoto(commonFileService.saveFileBase64Image(alarmAIDTO.getPhoto()));
@@ -78,6 +79,7 @@
             msg.put("alarmId", alarmRecord.getId());
             msg.put("alarmTime", alarmRecord.getAlarmTime());
             msg.put("alarmType", alarmRecord.getAlarmType());
+            msg.put("similarity", alarmRecord.getAlarmValue());
             msg.put("alarmTypeName", dictService.getDictNameByCode(DictEnum.ALARM_TYPE,alarmRecord.getAlarmType()));
             msg.put("alarmPhoto", alarmRecord.getPhoto());
             webSocket.sendAllMessage(msg.toJSONString());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
index b27830a..79a753b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.StatusEnum;
 import com.casic.missiles.modular.system.dto.DeviceCommom;
 import com.casic.missiles.modular.system.dto.DeviceInfo;
@@ -54,7 +55,10 @@
         QueryWrapper query = new QueryWrapper();
         query.eq("VALID", "0");
         List<BusMonipoiInfo> deviceList = monipoiInfoService.list(query);
+
         if (deviceList != null && deviceList.size() > 0) {
+            //初始化设备状态
+            monipoiInfoService.updateDeviceStatus(StatusEnum.STATUS_OFFLINE);
             // 创建线程池，每个设备一个线程
             ThreadPoolExecutor executor = new ThreadPoolExecutor(deviceList.size(), deviceList.size(), 10, TimeUnit.SECONDS,
                     new ArrayBlockingQueue<>(20), new ThreadPoolExecutor.CallerRunsPolicy());
@@ -122,7 +126,7 @@
                 if (isOpen == 1) {
                     if (map.get(this.deviceIp) != null) {
                         map.put(this.deviceIp, map.get(this.deviceIp) + 1);
-                        if (map.get(this.deviceIp) % 300L == 0) {
+                        if (map.get(this.deviceIp) % 50L == 0) {
                             //若在线，更新设备离线
                             if (deviceStatus) {
                                 if (monipoiInfoService.updateStatus(this.deviceIp, StatusEnum.STATUS_OFFLINE)) {
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
index 5249831..35646ac 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
@@ -109,4 +109,16 @@
         return ResponseData.success(busMonipoiInfoService.overviewMap(keywordDTO.getKeyword()));
     }
 
+
+
+
+    /**
+     * 获取监测点/设备信息列表供算法调用
+     */
+    @RequestMapping(value = "/AIlistPage")
+    public Object AIlistPage(@RequestBody @Valid MonitorListDTO monitorListDTO) throws Exception {
+        return ResponseData.success(busMonipoiInfoService.AIlistPage( monitorListDTO.getStationId(), monitorListDTO.getKeyword()));
+    }
+
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
index 92d8264..9ab2622 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
@@ -26,6 +26,8 @@
 
     List<BusMonipoiInfo> monitorListPage(@Param("page") Page<BusMonipoiInfo> page,@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword);
 
+    List<BusMonipoiInfo> AIlistPage( @Param("stationId")Long stationId,@Param("keyword")String keyword);
+
     MonitorBaseInfo selectInfoByDeviceIp(@Param("deviceIp") String deviceIp);
 
     BusMonipoiInfoResponse monitorDetail(@Param("id") Long id);
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
index 22777d5..de44bbe 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
@@ -35,7 +35,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID
-        AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS type, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts
+        AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS deviceType, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts
     </sql>
 
     <select id="monitorList" resultType="com.casic.missiles.modular.system.dto.monitor.MonitorPointList">
@@ -70,6 +70,25 @@
         </if>
     </select>
 
+
+    <select id="AIlistPage" resultType="com.casic.missiles.modular.system.model.BusMonipoiInfo">
+        SELECT
+        <include refid="Base_Column_List"/>,stationName
+        FROM bus_monipoi_info
+        JOIN (
+        SELECT id as idd,DEPT_ID,STATION_NAME AS stationName
+        FROM bus_station_info
+        WHERE valid=0
+        )bsi ON bsi.idd=station_id
+        where valid=0
+        <if test="stationId!= null and stationId !=''">
+            and station_id =#{stationId}
+        </if>
+        <if test="keyword!= null and keyword !=''">
+            and monitor_name like concat('%',#{keyword},'%')
+        </if>
+    </select>
+
     <select id="selectInfoByDeviceIp" resultType="com.casic.missiles.modular.system.dto.monitor.MonitorBaseInfo">
         SELECT a.STATION_ID   as stationId,
                b.STATION_NAME as stationName,
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java
index a0ad8e5..30a38fb 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java
@@ -24,6 +24,8 @@
 
     Page<BusMonipoiInfo> monitorListPage(Page<BusMonipoiInfo> page, Long stationId, String keyword)throws Exception;
 
+    List<BusMonipoiInfo> AIlistPage( Long stationId, String keyword)throws Exception;
+
     ResponseData addMonitor(BusMonipoiInfo busMonipoiInfo);
 
     ResponseData updateMonitor(BusMonipoiInfo busMonipoiInfo);
@@ -43,4 +45,6 @@
     void updateBusMonipoiInfo(String deviceIp,int lineNum);
 
     boolean updateStatus(String deviceIp,String status);
+
+    boolean updateDeviceStatus(String status);
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java
index 6fd83ca..a94ea14 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -63,6 +64,16 @@
         return page;
     }
 
+
+    @Override
+    public List<BusMonipoiInfo> AIlistPage(Long stationId, String keyword) throws Exception {
+        List<BusMonipoiInfo> busMonipoiInfoList = this.baseMapper.AIlistPage( stationId, keyword);
+        for (BusMonipoiInfo busMonipoiInfo : busMonipoiInfoList) {
+            DictCodeUtils.convertDictCodeToName(busMonipoiInfo);
+        }
+        return busMonipoiInfoList;
+    }
+
     @Override
     public ResponseData addMonitor(BusMonipoiInfo busMonipoiInfo) {
         checkIsExist(busMonipoiInfo);
@@ -157,6 +168,13 @@
         return false;
     }
 
+    @Override
+    public boolean updateDeviceStatus(String status) {
+        UpdateWrapper<BusMonipoiInfo>  updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("VALID", "0");
+        updateWrapper.set("DEVICE_STATUS",status);
+        return this.update(updateWrapper);
+    }
 
     @Override
     public BusMonipoiInfo selectByNvr(String nvrIp, String channel) {
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index fedbd25..ea5a3f5 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -21,7 +21,7 @@
 #   redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
 casic:
   #kaptcha-open: false #是否开启登录时验证码 (true/false)
-  no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/alarm/getAIRecords,/websocket/*
+  no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/alarm/getAIRecords,/monitor/AIlistPage,/websocket/*
   file:
     uploadPath: C:\casic\tmp\
     downloadPath: D:\tmp\
@@ -56,5 +56,5 @@
 mybatis-plus:
   configuration:
     # 配置结果集属性为空时 是否映射返回结果
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+  log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
 #    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
\ No newline at end of file