下载

src/main/java/com/fdkankan/scene/SceneApplication.java

@@ -2,9 +2,14 @@ package com.fdkankan.scene;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.extra.spring.SpringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.fdkankan.common.constant.CommonSuccessStatus;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.scene.config.FdkkLaserConfig;
+import com.fdkankan.scene.entity.SceneDownloadLog;
+import com.fdkankan.scene.service.ISceneDownloadLogService;
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
@@ -18,6 +23,7 @@ import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Collection;
+import java.util.List;
 import java.util.Set;
 
 @SpringBootApplication
@@ -52,6 +58,10 @@ public class SceneApplication {
             redisUtil.del(o.toString());
         }
 
+        final ISceneDownloadLogService sceneDownloadLogService = SpringUtil.getBean(ISceneDownloadLogService.class);
+        sceneDownloadLogService.remove(new LambdaQueryWrapper<SceneDownloadLog>().eq(SceneDownloadLog::getStatus, CommonSuccessStatus.WAITING.code()));
+
+
 //        String nameSpace = SocketIoConstant.SCENE_HANDLER_SPACE.replace("/", "");
 //        Collection<String> keys = cache.keys(nameSpace + "*");
 //        for (String key : keys) {

src/main/java/com/fdkankan/scene/entity/Scene.java

@@ -266,5 +266,11 @@ public class Scene implements Serializable {
     @TableField("offline_status")
     private Integer offlineStatus;
 
+    /**
+     *
+     */
+    @TableField("mapping")
+    private String mapping;
+
 
 }

src/main/java/com/fdkankan/scene/service/impl/SceneDownloadLogServiceImpl.java

@@ -16,18 +16,13 @@ import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.scene.bean.SceneJsonBean;
+import com.fdkankan.scene.config.FdkkLaserConfig;
 import com.fdkankan.scene.config.ServiceConfig;
-import com.fdkankan.scene.entity.SceneDownloadLog;
-import com.fdkankan.scene.entity.SceneEditInfo;
-import com.fdkankan.scene.entity.ScenePlus;
-import com.fdkankan.scene.entity.ScenePlusExt;
+import com.fdkankan.scene.entity.*;
 import com.fdkankan.scene.mapper.ISceneDownloadLogMapper;
 import com.fdkankan.scene.oss.OssUtil;
-import com.fdkankan.scene.service.ISceneDownloadLogService;
+import com.fdkankan.scene.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.scene.service.ISceneEditInfoService;
-import com.fdkankan.scene.service.IScenePlusExtService;
-import com.fdkankan.scene.service.IScenePlusService;
 import com.fdkankan.web.bean.DownLoadProgressBean;
 import com.fdkankan.web.response.ResultData;
 import lombok.extern.slf4j.Slf4j;
@@ -68,6 +63,8 @@ public class SceneDownloadLogServiceImpl extends ServiceImpl<ISceneDownloadLogMa
     private ServiceConfig serviceConfig;
     @Autowired
     private IScenePlusExtService scenePlusExtService;
+    @Autowired
+    private ISceneService sceneService;
 
 
     @Override
@@ -150,6 +147,7 @@ public class SceneDownloadLogServiceImpl extends ServiceImpl<ISceneDownloadLogMa
         log.info("downloadProcess-processStr-{}",processStr);
         downLoadProgressBean = JSONObject.parseObject(processStr, DownLoadProgressBean.class);
         if (downLoadProgressBean.getStatus()== 1002){
+            final Scene scene = sceneService.getBySceneCode(num);
             //写库
             update(
                     new LambdaUpdateWrapper<SceneDownloadLog>()
@@ -157,7 +155,7 @@ public class SceneDownloadLogServiceImpl extends ServiceImpl<ISceneDownloadLogMa
                             .set(SceneDownloadLog::getDownloadUrl,downLoadProgressBean.getUrl())
                             .set(SceneDownloadLog::getStatus,1)
             );
-            downLoadProgressBean.setUrl(this.publicUrl+":"+serviceConfig.getServerPort()+"/profile" +downLoadProgressBean.getUrl());
+            downLoadProgressBean.setUrl(this.publicUrl+":"+serviceConfig.getServerPort()+ "/" + scene.getMapping() +downLoadProgressBean.getUrl());
         }
         return ResultData.ok(downLoadProgressBean);
     }