优化常量的使用，服务增加支持redis数据隔离

648540858
1 parent 2c470f50
Showing 8 changed files with 37 additions and 30 deletions
src/main/java/top/panll/assist/controller/RecordController.java
src/main/java/top/panll/assist/dto/AssistConstants.java
src/main/java/top/panll/assist/dto/UserSettings.java
src/main/java/top/panll/assist/service/FFmpegExecUtils.java
src/main/java/top/panll/assist/service/FileManagerTimer.java
src/main/java/top/panll/assist/service/VideoFileService.java
src/main/java/top/panll/assist/utils/RedisUtil.java
src/main/resources/application-local.yml
@@ -14,9 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import top.panll.assist.controller.bean.ControllerException;
 import top.panll.assist.controller.bean.ErrorCode;
 import top.panll.assist.controller.bean.WVPResult;
-import top.panll.assist.dto.MergeOrCutTaskInfo;
-import top.panll.assist.dto.SignInfo;
-import top.panll.assist.dto.SpaceInfo;
+import top.panll.assist.dto.*;
 import top.panll.assist.service.VideoFileService;
 import top.panll.assist.utils.PageInfo;
 import top.panll.assist.utils.RedisUtil;
@@ -43,6 +41,9 @@ public class RecordController {
     @Autowired
     private RedisUtil redisUtil;
  
+    @Autowired
+    private UserSettings userSettings;
+
     private SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  
  
@@ -372,7 +373,7 @@ public class RecordController {
     @GetMapping(value = "/addStreamCallInfo", produces = "application/json;charset=UTF-8")
     @PostMapping(value = "/addStreamCallInfo", produces = "application/json;charset=UTF-8")
     public void addStreamCallInfo(String app, String stream, String callId) {
-        String key = "Stream_Call_Info" + app + "_" + stream;
+        String key = AssistConstants.STREAM_CALL_INFO + userSettings.getId() + "_" + app + "_" + stream;
         redisUtil.set(key, callId, -1);
     }
  
+package top.panll.assist.dto;
+
+public class AssistConstants {
+
+    public final static String STREAM_CALL_INFO = "STREAM_CALL_INFO_";
+
+    public final static String MERGEORCUT = "MERGEORCUT_";
+}
@@ -3,9 +3,15 @@ package top.panll.assist.dto;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
  
+/**
+ * @author lin
+ */
 @Component
 public class UserSettings {
  
+    @Value("${userSettings.id}")
+    private String id;
+
     @Value("${userSettings.record}")
     private String record;
  
@@ -24,6 +30,14 @@ public class UserSettings {
     @Value("${userSettings.threads:2}")
     private int threads;
  
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
     public String getRecord() {
         return record;
     }
@@ -49,9 +49,6 @@ public class FFmpegExecUtils implements InitializingBean{
     @Autowired
     private UserSettings userSettings;
  
-    @Autowired
-    private RedisUtil redisUtil;
-
     private FFprobe ffprobe;
     private FFmpeg ffmpeg;
  
@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
+import top.panll.assist.dto.AssistConstants;
 import top.panll.assist.dto.MergeOrCutTaskInfo;
 import top.panll.assist.dto.UserSettings;
 import top.panll.assist.utils.RedisUtil;
@@ -35,8 +36,6 @@ public class FileManagerTimer {
     @Autowired
     private RedisUtil redisUtil;
  
-    private final String keyStr = "MERGEORCUT";
-
 //    @Scheduled(fixedDelay = 2000)   //测试 20秒执行一次
     @Scheduled(cron = "0 0 0 * * ?")   //每天的0点执行
     public void execute(){
@@ -128,7 +127,7 @@ public class FileManagerTimer {
             }
         }
         // 清理redis记录
-        String key = String.format("%S_*_*_*", keyStr);
+        String key = String.format("%S_%S_*_*_*", AssistConstants.MERGEORCUT, userSettings.getId());
         List<Object> taskKeys = redisUtil.scan(key);
         for (Object taskKeyObj : taskKeys) {
             String taskKey = (String) taskKeyObj;
@@ -10,11 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.DigestUtils;
-import top.panll.assist.dto.SignInfo;
-import top.panll.assist.dto.SpaceInfo;
+import top.panll.assist.dto.*;
 import top.panll.assist.utils.RedisUtil;
-import top.panll.assist.dto.MergeOrCutTaskInfo;
-import top.panll.assist.dto.UserSettings;
 import top.panll.assist.utils.DateUtils;
  
 import java.io.File;
@@ -39,9 +36,6 @@ public class VideoFileService {
     private RedisUtil redisUtil;
  
     @Autowired
-    private RedisTemplate redisTemplate;
-
-    @Autowired
     private FFmpegExecUtils ffmpegExecUtils;
  
  
@@ -49,8 +43,6 @@ public class VideoFileService {
     private final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
     private final SimpleDateFormat simpleDateFormatForTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  
-    private final String keyStr = "MERGEORCUT";
-
     public List<File> getAppList(Boolean sort) {
         File recordFile = new File(userSettings.getRecord());
         if (recordFile.isDirectory()) {
@@ -150,7 +142,7 @@ public class VideoFileService {
                 long endTime = startTime + durationLong;
                 endTime = endTime - endTime%1000;
  
-                String key = "Stream_Call_Info" + app + "_" + stream;
+                String key = AssistConstants.STREAM_CALL_INFO + userSettings.getId() + "_" + app + "_" + stream;
                 String callId = (String) redisUtil.get(key);
                 if (callId != null) {
  
@@ -396,9 +388,8 @@ public class VideoFileService {
                 mergeOrCutTaskInfo.setDownloadFile(remoteHost + "/download.html?url=" + relativize);
                 mergeOrCutTaskInfo.setPlayFile(remoteHost + "/" + relativize);
             }
-            String key = String.format("%S_%S_%S_%S", keyStr, mergeOrCutTaskInfo.getApp(), mergeOrCutTaskInfo.getStream(), mergeOrCutTaskInfo.getId());
+            String key = String.format("%S_%S_%S_%S_%S", AssistConstants.MERGEORCUT , userSettings.getId(), mergeOrCutTaskInfo.getApp(), mergeOrCutTaskInfo.getStream(), mergeOrCutTaskInfo.getId());
             redisUtil.set(key, mergeOrCutTaskInfo);
-            redisUtil.convertAndSend("topic_mergeorcut_end", mergeOrCutTaskInfo);
             logger.info("[录像合并] 合并完成，APP:{}, STREAM: {}, 任务ID：{}", app, stream, taskId);
         }else {
             ffmpegExecUtils.mergeOrCutFile(filesInTime, recordFile, stream, (status, percentage, result)->{
@@ -413,13 +404,11 @@ public class VideoFileService {
                         mergeOrCutTaskInfo.setDownloadFile(remoteHost + "/download.html?url=" + relativize);
                         mergeOrCutTaskInfo.setPlayFile(remoteHost + "/" + relativize);
                     }
-                    redisUtil.convertAndSend("topic_mergeorcut_end", mergeOrCutTaskInfo);
                     logger.info("[录像合并] 合并完成，APP:{}, STREAM: {}, 任务ID：{}", app, stream, taskId);
                 }else {
                     mergeOrCutTaskInfo.setPercentage(percentage + "");
-                    redisUtil.convertAndSend("topic_mergeorcut_continue",  mergeOrCutTaskInfo);
                 }
-                String key = String.format("%S_%S_%S_%S", keyStr, mergeOrCutTaskInfo.getApp(), mergeOrCutTaskInfo.getStream(), mergeOrCutTaskInfo.getId());
+                String key = String.format("%S_%S_%S_%S_%S", AssistConstants.MERGEORCUT, userSettings.getId(), mergeOrCutTaskInfo.getApp(), mergeOrCutTaskInfo.getStream(), mergeOrCutTaskInfo.getId());
                 redisUtil.set(key, mergeOrCutTaskInfo);
             });
         }
@@ -500,7 +489,8 @@ public class VideoFileService {
         if (taskId == null) {
             taskId = "*";
         }
-        List<Object> taskCatch = redisUtil.scan(String.format("%S_%S_%S_%S", keyStr, app, stream, taskId));
+        List<Object> taskCatch = redisUtil.scan(String.format("%S_%S_%S_%S_%S", AssistConstants.MERGEORCUT,
+                userSettings.getId(), app, stream, taskId));
         for (int i = 0; i < taskCatch.size(); i++) {
             String keyItem = taskCatch.get(i).toString();
             MergeOrCutTaskInfo mergeOrCutTaskInfo = (MergeOrCutTaskInfo)redisUtil.get(keyItem);
 package top.panll.assist.utils;
  
-import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.*;
 import org.springframework.stereotype.Component;
@@ -721,7 +720,4 @@ public class RedisUtil {
         return new ArrayList<>(resultKeys);
     }
  
-    public void convertAndSend(String channel, Object msg) {
-//        redisTemplate.convertAndSend(channel, msg);
-    }
 }
@@ -33,6 +33,8 @@ server:
  
 # [根据业务需求配置]
 userSettings:
+    # [必选 ] 服务ID
+    id: 334533
     # [必选 ] zlm配置的录像路径
     record: /home/lin/server/test001/default/www/record/
     # [可选 ] 录像保存时长（单位： 天）每天晚12点自动对过期文件执行清理