소스 검색

minio上传图片ip修改

gao.qiang 11 달 전
부모
커밋
44f7077862

+ 5 - 1
business-service/src/main/java/com/ozs/entity/MsgAlarmExt.java

@@ -1,9 +1,11 @@
 package com.ozs.entity;
 
 import java.io.Serializable;
+import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -46,5 +48,7 @@ public class MsgAlarmExt implements Serializable {
      */
     private String alarmAttPath;
 
-
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 }

+ 0 - 7
business-service/src/main/java/com/ozs/utils/CameraUtil.java

@@ -242,15 +242,8 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
      * @return
      */
     public static String getPlayFlv(String cameraCode, String channel, boolean flay, String state) {
-        log.info("getPlayFlv----state---------"+state);
-        if (state.contains("master")) {
             log.info("getPlayFlv----master---------"+wsUrl);
             return wsUrl + "/ws/" + cameraCode + "/" + channel + ".flv";
-        } else {
-            log.info("getPlayFlv------slave------"+wsUrls);
-            return wsUrls + "/ws/" + cameraCode + "/" + channel + ".flv";
-        }
-
 
 //        if (!flay) {
 //            return bakUrl + "/ws/" + channel + "/" + cameraCode + ".flv";

+ 1 - 0
vehicle-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -349,6 +349,7 @@ public class GeoHazardMonitorTokenController {
                         msgAlarmExt.setAlarmId(msgAlarm.getAlarmId());
                         msgAlarmExt.setAlarmAttPath(files1[i].fileUrl);
                         msgAlarmExt.setAlarmAttType(files1[i].fileType);
+                        msgAlarmExt.setCreateTime(new Date());
                         msgAlarmExtService.save(msgAlarmExt);
                     }
                 }