Home Explore Help
Sign In
ytrd-project-management
/
GeoHazardMonitor
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

wyyay 1 year ago
parent
2ab1bfcd24 1a2d92e687
commit
b29c29200e
4 changed files with 7 additions and 9 deletions
Split View Show Diff Stats
  1. 1 2
      business-service/src/main/java/com/ozs/service/utils/PublishCallback.java
  2. 0 1
      business-service/src/main/resources/mapper/service/MsgAlarmMapper.xml
  3. 1 1
      hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java
  4. 5 5
      hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

+ 1 - 2
business-service/src/main/java/com/ozs/service/utils/PublishCallback.java
View File 

@@ -27,8 +27,7 @@ public class PublishCallback implements MqttCallback {
 
     @Override
 
     public void connectionLost(Throwable cause) {
 
         // 连接丢失后，一般在这里面进行重连
 
-        System.out.println("连接断开，可以做重连");
 
-        new SubscribeClient("heart", "heart").start();
 
+//        System.out.println("连接断开，可以做重连");
 
     }
 
 
     //接收到已经发布的 QoS 1 或 QoS 2 消息的传递令牌时调用

+ 0 - 1
business-service/src/main/resources/mapper/service/MsgAlarmMapper.xml
View File 

@@ -391,7 +391,6 @@
 
                a.line_dir         AS lineDir,
 
                a.alarm_type       AS alarmType,
 
                a.camera_code      AS cameraCode,
 
-               a.id               AS id,
 
                a.content          AS content,
 
                a.alarm_confidence AS alarmConfidence,
 
                a.alarm_attr       AS alarmAttr,

+ 1 - 1
hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java
View File 

@@ -732,7 +732,7 @@ public class BaseCameraManagementController extends BaseController {
 
             return error("查不到该ID的相机台账数据!!!");
 
         }
 
         log.info("endRecording------------" + baseCameraManagement.getTaskId());
 
-        String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getTaskId()));
 
+        String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getCameraCode(),baseCameraManagement.getChannel()));
 
         log.info("endRecording------------" + start);
 
         if ("success".equals(start)) {
 
             baseCameraManagement.setStartRecording(2);

+ 5 - 5
hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java
View File 

@@ -179,8 +179,8 @@ public class CameraUtil {
 
      * @param taskId 录像接口返回的任务ID
 
      * @return
 
      */
 
-    public static String endRecording(String taskId) {
 
-        return webUrl + "/recordpro/api/stop?id=" + taskId;
 
+    public static String endRecording(String cameraCode,String channel) {
 
+        return webUrl + "/recordpro/api/stop?id=" + cameraCode+"/"+channel+"/flv";
 
     }
 
 
 
@@ -235,7 +235,7 @@ public class CameraUtil {
 
         String endTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, endTm);
 
 
         String param = "channel=" + channel + "&startTime=" + startTime + "&endTime=" + endTime;
 
-        String s = HttpUtils.sendGet(webUrl + "/api/record/flv/list", param);
 
+        String s = HttpUtils.sendGet(webUrl + "/recordpro/api/list", param);
 
         // 视频拼接
 
         if (!StringUtils.isBlank(s) && !"null".equals(s) && !s.startsWith("<!DOCTYPE html>")) {
 
             List<Map<String, Object>> maps = JSON.parseArray(s, Map.class);
 
@@ -649,7 +649,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
 
                                 lw.eq(BaseCameraManagement::getCameraCode, substring);
 
                                 BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
 
                                 log.info("closeRecording-endRecording------------" + baseCameraManagement.getTaskId());
 
-                                String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getTaskId()));
 
+                                String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getCameraCode(),baseCameraManagement.getChannel()));
 
                                 log.info("closeRecording-endRecording------------" + start);
 
                                 if ("success".equals(start)) {
 
                                     baseCameraManagement.setStartRecording(2);
 
@@ -666,7 +666,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
 
                             lw.eq(BaseCameraManagement::getCameraCode, substring);
 
                             BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
 
                             log.info("closeRecording-endRecording------------" + baseCameraManagement.getTaskId());
 
-                            String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getTaskId()));
 
+                            String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getCameraCode(),baseCameraManagement.getChannel()));
 
                             log.info("closeRecording-endRecording------------" + start);
 
                             if ("success".equals(start)) {
 
                                 baseCameraManagement.setStartRecording(2);