执法记录仪告警

src/main/java/com/sooka/sponest/monitor/dahua/controller/EquipmentStatusTaskController.java

@@ -23,6 +23,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.*;
 
@@ -57,18 +58,18 @@ public class EquipmentStatusTaskController {
     private CentermonitorTRecorderMapper centermonitorTRecorderMapper;
     @Autowired
     private DeviceMonitorManager deviceMonitorManager;
-    //    @Value("${sooka.dahua_interface_server.loginIp}")
-//    private String loginIp;
-//    @Value("${sooka.dahua_interface_server.loginPort}")
-//    private String loginPort;
-//    @Value("${sooka.dahua_interface_server.userName}")
-//    private String userName;
-//    @Value("${sooka.dahua_interface_server.userPwd}")
-//    private String userPwd;
-    private String loginIp = "10.53.0.35";
-    private String loginPort = "7901";
-    private String userName = "system";
-    private String userPwd = "Admin123";
+    @Value("${sooka.dahua_interface_server.loginIp}")
+    private String loginIp;
+    @Value("${sooka.dahua_interface_server.loginPort}")
+    private String loginPort;
+    @Value("${sooka.dahua_interface_server.userName}")
+    private String userName;
+    @Value("${sooka.dahua_interface_server.userPwd}")
+    private String userPwd;
+//    private String loginIp = "10.53.0.35";
+//    private String loginPort = "7901";
+//    private String userName = "system";
+//    private String userPwd = "Admin123";
     //按组织获取设备详细信息
     public static final String ACTION = "/videoService/devicesManager/devicesInfo";
     private List<String> orgCodes = Arrays.asList("11033445593778368", "11248668755298496");
@@ -156,16 +157,14 @@ public class EquipmentStatusTaskController {
                 }
             } else {
                 //向执法中心推送设备状态
-//                R result = remoteLawenforcementBaseService.deviceOpenOrClose(arr);
-//                if (result.getCode() != 200) {
-//                    log.info("向执法中心推送设备状态失败:{}", result.getMsg());
-//                }
-
+                R result = remoteLawenforcementBaseService.deviceOpenOrClose(arr);
+                if (result.getCode() != 200) {
+                    log.info("向执法中心推送设备状态失败:{}", result.getMsg());
+                }
+                //更新执法仪在离线状态
+                centermonitorTCameraMapper.updateBatchLawEnforcementInstrumentState(arr);
                 //误操作开机，导致设备状态非正常使用，进行告警处理
                 saveOrUpdateRecorderStatus(arr);
-
-                //更新执法仪在离线状态
-//                centermonitorTCameraMapper.updateBatchLawEnforcementInstrumentState(arr);
             }
         }
     }

src/main/java/com/sooka/sponest/monitor/dahua/utils/DeviceMonitorManager.java

@@ -9,6 +9,7 @@ import com.sooka.sponest.monitor.camera.mapper.CentermonitorTCamerachannelMapper
 import com.sooka.sponest.monitor.camera.mapper.CentermonitorTRecorderAlarmMapper;
 import com.sooka.sponest.monitor.camera.mapper.CentermonitorTRecorderMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PreDestroy;
@@ -33,18 +34,18 @@ public class DeviceMonitorManager {
     private CentermonitorTRecorderAlarmMapper centermonitorTRecorderAlarmMapper;
     @Resource
     private CentermonitorTCamerachannelMapper centermonitorTCamerachannelMapper;
-    //    @Value("${sooka.dahua_interface_server.loginIp}")
-//    private String loginIp;
-//    @Value("${sooka.dahua_interface_server.loginPort}")
-//    private String loginPort;
-//    @Value("${sooka.dahua_interface_server.userName}")
-//    private String userName;
-//    @Value("${sooka.dahua_interface_server.userPwd}")
-//    private String userPwd;
-    private String loginIp = "10.53.0.35";
-    private String loginPort = "7901";
-    private String userName = "system";
-    private String userPwd = "Admin123";
+    @Value("${sooka.dahua_interface_server.loginIp}")
+    private String loginIp;
+    @Value("${sooka.dahua_interface_server.loginPort}")
+    private String loginPort;
+    @Value("${sooka.dahua_interface_server.userName}")
+    private String userName;
+    @Value("${sooka.dahua_interface_server.userPwd}")
+    private String userPwd;
+//    private String loginIp = "10.53.0.35";
+//    private String loginPort = "7901";
+//    private String userName = "system";
+//    private String userPwd = "Admin123";
     //按组织获取设备详细信息
     public static final String ACTION = "/videoService/devicesManager/devicesInfo";
     // 使用线程安全的Map存储所有设备的监控任务