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

business-service/src/main/java/com/ozs/service/entity/vo/BaseCameraManagementVos.java

@@ -1,10 +1,6 @@
 package com.ozs.service.entity.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.ozs.common.annotation.Excel;
-import com.ozs.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -30,7 +26,7 @@ public class BaseCameraManagementVos implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-   
+
     /**
      * 相机编码
      */
@@ -42,7 +38,7 @@ public class BaseCameraManagementVos implements Serializable {
      */
     @Excel(name = "通道编号")
     private String channel;
-    
+
 
     /**
      * 行别(1上行2下行）
@@ -61,13 +57,13 @@ public class BaseCameraManagementVos implements Serializable {
      */
     @Excel(name = "监视相机纬度")
     private String installLatitude;
-    
+
     /**
      * 物联网卡号
      */
     @Excel(name = "物联网卡号")
     private String cardNum;
-    
+
     /**
      *所属工务段名称
      */
@@ -98,6 +94,8 @@ public class BaseCameraManagementVos implements Serializable {
     @Excel(name = "线路名称")
     private String railwayName;
 
+
     @Excel(name = "备注")
     private String remark;
-}
+
+}

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -897,7 +897,7 @@ public class BaseCameraManagementController extends BaseController {
             }
 
         } else {
-            return new AjaxResult(200, "ok", serverConfig.getUrl() + msgAlarm.getReleasedUrl());
+            return new AjaxResult(200, "ok", caneraConfig.getRecordUrl() + msgAlarm.getReleasedUrl());
         }
     }
 

hazard-admin/src/main/java/com/ozs/web/controller/app/GeoHazardMineController.java

@@ -55,10 +55,6 @@ public class GeoHazardMineController extends BaseController {
     private ISysUserService userService;
     @Autowired
     private TokenService tokenService;
-    @Value("${file.avatarUrl:#{null}}")
-    private String avatarURL;
-    @Value("${file.filreUrl:#{null}}")
-    private String fileUrl;
     @Autowired
     private ISysUserService sysUserService;
     @Autowired

hazard-admin/src/main/java/com/ozs/web/core/config/CaneraConfig.java

@@ -34,4 +34,6 @@ public class CaneraConfig {
     @Value("${base.wsUrl:http://124.70.58.209:18891}")
     private String wsUrl;
 
+    @Value("${base.recordUrl:http://183.236.39.220:8083}")
+    private String recordUrl;
 }

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

@@ -64,6 +64,7 @@ public class CameraUtil {
     private static CmdCameraUtil cUtil;
     private static RedisCache rc;
     private static ServerConfig sc;
+    private static String recordUrl;
 
     public final static String tsFilekey = "mergeVideoTsFile";
 
@@ -458,7 +459,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
     }
 
     public static List<Map<String, Object>> getRecordList(String channel, Date startTm, Date endTm) {
-        return filterRecordList(channel, startTm, endTm, filePath, sc.getUrl() + "/profile/");
+        return filterRecordList(channel, startTm, endTm, filePath, recordUrl + "/profile/");
     }
 
     /**
@@ -783,6 +784,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         rc = redisCache;
         sc = serverConfig;
         wsUrl = caneraConfig.getWsUrl();
+        recordUrl = caneraConfig.getRecordUrl();
     }
 
 

hazard-admin/src/main/resources/application.yml

@@ -23,6 +23,7 @@ base:
   wsUrl: ws://124.70.58.209:9080
   defaultPassword: yn5aq5Mt.106.tky
   imgUrl: http://124.71.171.71:18801/picbucket
+  recordUrl: http://124.70.58.209:18811${server.servlet.context-path}
 
 # 开发环境配置
 server: