1

src/main/java/com/fdkankan/manage/common/DownloadStatusEnum.java

@@ -0,0 +1,21 @@
+package com.fdkankan.manage.common;
+
+public enum DownloadStatusEnum {
+    DOWNLOADING(1000, "文件正在下载"),
+    DOWNLOAD_COMPRESSING(1001, "文件正在压缩"),
+    DOWNLOAD_SUCCESS(1002, "文件压缩成功/下载处理成功"),
+    DOWNLOAD_FAILED(1003, "下载处理失败");
+
+    public static final int DOWNLOADING_CODE = 1000;
+    public static final int DOWNLOAD_COMPRESSING_CODE = 1001;
+    public static final int DOWNLOAD_SUCCESS_CODE = 1002;
+    public static final int DOWNLOAD_FAILED_CODE = 1003;
+
+    private int status;
+    private String desc;
+
+    DownloadStatusEnum(int status, String desc) {
+        this.status = status;
+        this.desc = desc;
+    }
+}

src/main/java/com/fdkankan/manage/service/impl/DownService.java

@@ -3,6 +3,7 @@ package com.fdkankan.manage.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.SceneConstant;
+import com.fdkankan.manage.common.DownloadStatusEnum;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.service.*;
@@ -108,16 +109,28 @@ public class DownService implements IDownService {
         if(scenePro == null && scenePlus == null){
             throw new BusinessException(SceneConstant.FAILURE_CODE_5005, SceneConstant.FAILURE_MSG_5005);
         }
+        Long userId = scenePro == null ? scenePlus.getUserId() : scenePro.getUserId();
         DownVo downVo = new DownVo();
+        Integer sceneVersion = getSceneVersion(scenePro, scenePlus);
+
         Map<String,String> params = new HashMap<>(2);
         params.put("type","local");
         params.put("sceneNum",sceneNum);
         String redisKey = RedisKey.DOWNLOAD_TASK;
+        String sysVersion = "v3";
         if(scenePro == null){
             params.put("num",sceneNum);
             redisKey = RedisKey.SCENE_DOWNLOADS_TASK_V4;
+            sysVersion = "v4";
         }
         redisUtil.lRightPush(redisKey, JSONObject.toJSONString(params));
+        SceneDownloadLog sceneDownloadLogEntity = new SceneDownloadLog();
+        sceneDownloadLogEntity.setUserId(userId);
+        sceneDownloadLogEntity.setSceneNum(sceneNum);
+        sceneDownloadLogEntity.setSceneVersion(sceneVersion);
+        sceneDownloadLogEntity.setStatus(0);
+        sceneDownloadLogEntity.setSysVersion(sysVersion);
+        sceneDownloadLogService.save(sceneDownloadLogEntity);
         downVo.setDownloadStatus(1);
         return downVo;
     }
@@ -141,7 +154,27 @@ public class DownService implements IDownService {
         if(StringUtils.isEmpty(result)){
             return new DownloadProcessVo();
         }
-        return JSONObject.parseObject(result,DownloadProcessVo.class);
+        int isUp = 0;
+        if(scenePro == null){
+            isUp = 1;
+        }
+        SceneDownloadLog sceneDownloadLog = sceneDownloadLogService.getByStatusAndNum(sceneNum,0,isUp);
+
+        DownloadProcessVo downloadProcessVo = JSONObject.parseObject(result, DownloadProcessVo.class);
+        switch (downloadProcessVo.getStatus()) {
+            case DownloadStatusEnum.DOWNLOAD_SUCCESS_CODE:
+                String url = downloadProcessVo.getUrl();
+                if (!StringUtils.isEmpty(url)) {
+                    sceneDownloadLog.setDownloadUrl(url);
+                    sceneDownloadLog.setStatus(1);
+                    break;
+                }
+            case DownloadStatusEnum.DOWNLOAD_FAILED_CODE:
+                sceneDownloadLog.setStatus(-1);
+                break;
+        }
+        sceneDownloadLogService.updateById(sceneDownloadLog);
+        return downloadProcessVo;
     }
 
 }