Browse Source

down-version

lyhzzz 1 year ago
parent
commit
91fb3cb4b1

+ 2 - 0
src/main/java/com/fdkankan/manage/common/RedisKeyUtil.java

@@ -16,6 +16,8 @@ public class RedisKeyUtil {
 
     public static final String ipAddress= "manage:ip_address:%s";
 
+    public static final String SCENE_VERSION = "scenejson:num:%s";
+
 
 
 }

+ 12 - 4
src/main/java/com/fdkankan/manage/service/impl/DownService.java

@@ -2,6 +2,7 @@ package com.fdkankan.manage.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.fdkankan.manage.common.RedisKeyUtil;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.common.constant.SceneConstant;
 import com.fdkankan.manage.common.DownloadStatusEnum;
@@ -102,11 +103,18 @@ public class DownService implements IDownService {
             version = proEdit.getVersion();
         }
         if(scenePro == null && scenePlus !=null){
-            SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
-            if(sceneEditInfo == null){
-                throw new BusinessException(SceneConstant.FAILURE_CODE_5005, SceneConstant.FAILURE_MSG_5005);
+            String redisKey = String.format(RedisKeyUtil.SCENE_VERSION,scenePlus.getNum());
+            if(!redisUtil.hasKey(redisKey) || StringUtils.isBlank(redisUtil.get(redisKey))){
+                SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
+                if(sceneEditInfo == null){
+                    throw new com.fdkankan.common.exception.BusinessException(SceneConstant.FAILURE_CODE_5005, SceneConstant.FAILURE_MSG_5005);
+                }
+                version = sceneEditInfo.getVersion();
+            }else {
+                String redisObj = redisUtil.get(redisKey);
+                JSONObject obj = JSONObject.parseObject(redisObj);
+                version = obj.getInteger("version");
             }
-            version = sceneEditInfo.getVersion();
         }
         return version;
     }

+ 0 - 23
src/main/java/com/fdkankan/manage/test/TestController.java

@@ -1,13 +1,6 @@
 package com.fdkankan.manage.test;
-import com.google.common.collect.Lists;
-
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.fdkankan.common.util.SecurityUtil;
-import com.fdkankan.elasticsearch.service.DocumentService;
-import com.fdkankan.elasticsearch.service.IndexService;
-import com.fdkankan.elasticsearch.service.QueryDataService;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.manage.common.*;
 import com.fdkankan.manage.entity.*;
@@ -24,10 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.*;
-import java.util.stream.Collectors;
 
-import static com.amazonaws.util.CredentialUtils.getCredentialsProvider;
-import static com.fdkankan.manage.util.RsaUtils.getKeyPair;
 
 @Slf4j
 @RestController
@@ -228,18 +218,5 @@ public class TestController {
     }
 
     public static void main(String[] args) {
-        List<Integer> list1 = new ArrayList<>();
-
-        List<Integer> list2 = new ArrayList<>();
-        list2.add(3);
-        list2.add(4);
-        list2.add(5);
-        list2.add(6);
-
-        List<Integer> intersection = list1.stream()
-                .filter(list2::contains)
-                .collect(Collectors.toList());
-
-        System.out.println("交集:" + intersection);
     }
 }