异物侵限报警修改

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -215,12 +215,12 @@ public class CameraUtil {
      */
     public static String getPlayFlv(String cameraCode, String channel, boolean flay, String format) {
         if (!ObjectUtils.isEmpty(format) && "WS-FLV".equals(format)) {
-            return wsUrl + "/ws/" + channel + "/" + cameraCode ;
+            return wsUrl + "/ws/" + channel + "/" + cameraCode;
         }
         if (!flay) {
-            return webUrl + "/hdl/" + channel + "/" + cameraCode ;
+            return webUrl + "/hdl/" + channel + "/" + cameraCode;
         }
-        return webUrl + "/hdl/" + channel + "/" + cameraCode ;
+        return webUrl + "/hdl/" + channel + "/" + cameraCode;
     }
 
     public static String getPlayFlv(String cameraCode, String channel, String format) {
@@ -546,16 +546,16 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
      */
     public static String getRecordUrl(String cameraCode, String channel, Date startTm, Date endTm) {
         String result = null;
-        log.info(bakUrl + "/gb28181/api/invite?id=" + cameraCode + "&channel=" + channel + "&startTime=" + startTm.getTime()/1000 + "&endTime=" + endTm.getTime()/1000);
-        String url = bakUrl + "/gb28181/api/invite?id=" + cameraCode + "&channel=" + channel + "&startTime=" + startTm.getTime()/1000 + "&endTime=" + endTm.getTime()/1000;
+        log.info(bakUrl + "/gb28181/api/invite?id=" + cameraCode + "&channel=" + channel + "&startTime=" + startTm.getTime() / 1000 + "&endTime=" + endTm.getTime() / 1000);
+        String url = bakUrl + "/gb28181/api/invite?id=" + cameraCode + "&channel=" + channel + "&startTime=" + startTm.getTime() / 1000 + "&endTime=" + endTm.getTime() / 1000;
         try {
             result = HttpClientUtil.get(url);
-            log.info("-----getRecordUrl-----"+result);
+            log.info("-----getRecordUrl-----" + result);
             if (result.equals("200")) {
-                String path = apiSummary(cameraCode + "/" + channel+"/"+startTm.getTime()/1000+"-"+endTm.getTime()/1000);
-                if (StringUtils.isNotEmpty(path)){
+                String path = apiSummary(cameraCode + "/" + channel + "/" + startTm.getTime() / 1000 + "-" + endTm.getTime() / 1000);
+                if (StringUtils.isNotEmpty(path)) {
                     return path;
-                }else {
+                } else {
                     return "当前相机暂无回放视频";
                 }
             }
@@ -572,7 +572,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
      * @return
      */
     public static String apiSummary(String path) {
-        log.info("---------apiSummary-----"+path);
+        log.info("---------apiSummary-----" + path);
         int maxRetries = 5;
         int retryCount = 0;
         boolean success = false;
@@ -592,16 +592,16 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
                 retryCount++;
             }
         }
-        log.info("---------streamArray-----"+streamArray);
+        log.info("---------streamArray-----" + streamArray);
         if (!ObjectUtils.isEmpty(streamArray)) {
             for (int i = 0; i < streamArray.size(); i++) {
                 JSONObject subObj = streamArray.getJSONObject(i);
                 String streamPath = subObj.getString("StreamPath");
-                log.info("---------streamPath-----"+streamPath);
+                log.info("---------streamPath-----" + streamPath);
                 if (streamPath.equals(path)) {
                     //取出VideoTracks
                     JSONArray videoJson = subObj.getJSONArray("VideoTracks");
-                    log.info("---------videoJson-----"+videoJson);
+                    log.info("---------videoJson-----" + videoJson);
                     if (videoJson != null && videoJson.size() > 0) {
                         return wsUrl + "/ws/" + streamPath;
                     }
@@ -854,7 +854,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         if (StringUtils.isBlank(channel)
                 || ObjectUtils.isEmpty(startTm)
                 || ObjectUtils.isEmpty(endTm)) {
-            log.info("channel-----"+channel+"----startTm"+startTm+"-----endTm"+endTm);
+            log.info("channel-----" + channel + "----startTm" + startTm + "-----endTm" + endTm);
             return null;
         }
         Map<Date, Map<String, Object>> m = new HashMap<>();
@@ -866,11 +866,11 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         // /api/record/flv/list
         String s = HttpUtils.sendGet(bakUrl + "/recordpro/api/list", param);
         // 视频拼接
-        log.info("视频拼接s-----"+s);
+        log.info("视频拼接s-----" + s);
         if (!StringUtils.isBlank(s) || "null".equals(s)) {
             List<Map<String, Object>> maps = JSON.parseArray(s, Map.class);
             if (ObjectUtils.isEmpty(maps)) {
-                log.info("maps-----"+maps);
+                log.info("maps-----" + maps);
                 return null;
             }
             for (Map<String, Object> map : maps) {
@@ -1085,7 +1085,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
                     new LambdaQueryWrapper<BaseDeviceDynamicManagement>()
                             .eq(BaseDeviceDynamicManagement::getCameraCode, cameraCode));
 
-            boolean shouldDisable = (status == 1) || (deviceDynamicManagement != null && deviceDynamicManagement.getIsDisable().equals(1));
+            boolean shouldDisable = (status == 1) || (deviceDynamicManagement != null && (status == 2 && deviceDynamicManagement.getIsDisable().equals(1)));
 
             BaseDeviceResume resume = new BaseDeviceResume();
             resume.setCameraCode(cameraCode);
@@ -1251,10 +1251,10 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
     }
 
 
-    public void removePrice(Integer number,String path) {
+    public void removePrice(Integer number, String path) {
         log.info("removePrice-----------开始调用");
-        log.info("removePrice------number-----"+number);
-        log.info("removePrice-------path----"+path);
+        log.info("removePrice------number-----" + number);
+        log.info("removePrice-------path----" + path);
         try {
             // 创建MinioClient对象
             MinioClient minioClient = MinioClient.builder()
@@ -1264,8 +1264,8 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
 
             // 指定要删除文件的桶名和目录名
             String bucketName = this.bucketName;
-            String prefix = "camera_picture/normal/"+path;
-            log.info("removePrice-------prefix----"+prefix);
+            String prefix = "camera_picture/normal/" + path;
+            log.info("removePrice-------prefix----" + prefix);
             // 指定要删除的时间点（此处为当前时间之前的时间）
             ZonedDateTime deleteTime = ZonedDateTime.now().minusDays(number); // 删除90天前的文件
 
@@ -1309,10 +1309,10 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
             String prefix = "camera_picture/normal/";
             // List all objects in the bucket
             Iterable<Result<Item>> results = minioClient.listObjects(ListObjectsArgs.builder().bucket(bucketName).prefix(prefix).recursive(true).build());
-            log.info("-------获取minio所有图片--------"+results);
+            log.info("-------获取minio所有图片--------" + results);
             for (Result<Item> result : results) {
                 Item item = result.get();
-                log.info("----item.lastModified()----"+item.lastModified());
+                log.info("----item.lastModified()----" + item.lastModified());
                 log.info(item.objectName());
             }
         } catch (Exception e) {