离线包状态

src/main/java/com/fdkankan/fusion/controller/BaseController.java

@@ -32,14 +32,10 @@ public class BaseController {
     private RedisUtil redisUtil;
 
     protected String getUserName(){
-        JWT jwt = JWTUtil.parseToken(getToken());
-        Object userName = jwt.getPayload("userName");
-       return userName.toString();
+       return "";
     }
     protected String getNickName(){
-        JWT jwt = JWTUtil.parseToken(getToken());
-        Object userName = jwt.getPayload("nickName");
-        return userName.toString();
+        return "";
     }
     protected String getDeptId(){
         return "";

src/main/java/com/fdkankan/fusion/controller/HotIconController.java

@@ -57,7 +57,6 @@ public class HotIconController extends BaseController{
 
         String iconUrl = uploadService.uploadFile(file, true, String.format(FilePath.ICON_OSS_PATH,environment,""));
 
-        String username = getUserName();
         HotIcon hotIcon = new HotIcon();
         hotIcon.setIconTitle(iconTitle);
         hotIcon.setIconUrl(iconUrl);

src/main/java/com/fdkankan/fusion/down/CaseDownService.java

@@ -123,10 +123,8 @@ public class CaseDownService {
 
     @Autowired
     RedisUtil redisUtil;
-
-    @Value("${spring.profiles.active}")
-    private String environment;
     public static String downProcessKey = "fusion:down:offline:process:caseId:%s";
+    public static String buildSceneKey = "fusion:build:scene:";
 
     public DownVo checkDown(Integer caseId) {
         DownVo downVo = new DownVo();
@@ -187,6 +185,7 @@ public class CaseDownService {
         processVo.setStatus(status);
         processVo.setPercent(num);
         processVo.setUrl( url);
+        processVo.setCaseId( caseId);
         redisUtil.set(redisKey,JSONObject.toJSONString(processVo),60 * 60 * 24);
     }
 
@@ -429,7 +428,6 @@ public class CaseDownService {
     /**
      * @param buildOfflineStatus   //1 生成成功,0:正在生成 1，初次生成  2，下载失败
      */
-    public static String buildSceneKey = "fusion:build:scene:";
     private Boolean downSceneOffline(String num,Integer sceneId, Boolean isLaser, String offPath, Boolean rebuildOffline, String offlineFolder, Integer buildOfflineStatus) {
         String redisKey = buildSceneKey + num;
         if(redisUtil.hasKey(redisKey) && Integer.parseInt(redisUtil.get(redisKey))>=2 ){
@@ -463,8 +461,12 @@ public class CaseDownService {
             }
             File file = new File(offlineFolder);
             File file1 = new File(offPath + File.separator + num);
-            if(!file.getPath().equals(file1.getPath())){
-                FileUtil.copyContent(file,file1,true);
+            if(!file.getPath().equals(file1.getPath()) || file1.getParentFile().getPath().equals(file.getPath())){
+                try {
+                    FileUtil.copyContent(file,file1,true);
+                }catch (Exception e){
+
+                }
             }
             return false;
         }

src/main/java/com/fdkankan/fusion/response/DownloadProcessVo.java

@@ -10,4 +10,6 @@ public class DownloadProcessVo {
     private Integer status = 1000;
     private String url;
     private Integer percent = 0;
+
+    private Integer caseId;
 }

src/main/java/com/fdkankan/fusion/service/impl/HotIconServiceImpl.java

@@ -37,8 +37,6 @@ public class HotIconServiceImpl extends ServiceImpl<IHotIconMapper, HotIcon> imp
     @Override
     public List<HotIcon> getListByUserName(String username) {
         LambdaQueryWrapper<HotIcon> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(HotIcon::getUserName,username)
-               .or().eq(HotIcon::getIsSystem,1);
         wrapper.orderByDesc(HotIcon::getIsSystem)           // 官方默认
                 .orderByDesc(HotIcon::getIsNew)           // 新增
                 .orderByDesc(HotIcon::getLastUse)         // 上次使用

src/main/java/com/fdkankan/fusion/task/InitService.java

@@ -3,11 +3,14 @@ package com.fdkankan.fusion.task;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.log.Log;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.fusion.common.util.LocalToOssUtil;
 import com.fdkankan.fusion.config.CacheUtil;
 import com.fdkankan.fusion.entity.*;
+import com.fdkankan.fusion.response.DownloadProcessVo;
 import com.fdkankan.fusion.service.*;
+import com.fdkankan.redis.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -23,6 +26,7 @@ import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @Service
@@ -43,10 +47,12 @@ public class InitService {
         checkDefaultImag();
         delMediaLibrary();
         writerStateFile();
+        delRedisKey();
     }
 
 
 
+
     public void initConfig(){
         CacheUtil.uploadType = uploadType;
         CacheUtil.installPath = new File(installPath).getParentFile().getPath() +File.separator;
@@ -144,4 +150,28 @@ public class InitService {
         log.info("写入status文件:{}",path);
         FileUtil.writeString("1",new File(path), StandardCharsets.UTF_8);
     }
+
+    @Autowired
+    RedisUtil redisUtil;
+    @Autowired
+    ICaseService caseService;
+
+    private void delRedisKey() {
+        try {
+            String downProcessKey = "fusion:down:offline:process:caseId:*";
+            Set<String> keys = redisUtil.keys(downProcessKey);
+            for (String key : keys) {
+                log.info("删除案件下载未完成进度:{}",key);
+                String s = redisUtil.get(key);
+                DownloadProcessVo downloadProcessVo = JSONObject.parseObject(s, DownloadProcessVo.class);
+                if(downloadProcessVo != null && downloadProcessVo.getCaseId() != null){
+                    caseService.updateOfflineStatus(downloadProcessVo.getCaseId(),-1,null);
+                }
+                redisUtil.del(key);
+            }
+        }catch (Exception e){
+            log.info("删除失败：{}",e);
+        }
+
+    }
 }