1

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

@@ -249,9 +249,16 @@ public class CaseDownService {
                     for (Object object : jsonArray) {
                         JSONObject sceneInfoObj = (JSONObject) object;
                         String newPath = String.format(FilePath.OFFLINE_LASER_OSS_PATH, sceneData.getNum(), sceneData.getNum());
+                        String mapping = sceneInfoObj.getString("mapping");
                         String oldPath = sceneInfoObj.getString("webBin");
+                        String webBin = null;
+                        if(StringUtils.isNotBlank(mapping)){
+                            webBin =newPath + mapping+ File.separator+ oldPath;
+                        }else {
+                            webBin = newPath+ oldPath;
+                        }
                         sceneInfoObj.put("oldWebBin",oldPath);
-                        sceneInfoObj.put("webBin",newPath + oldPath);
+                        sceneInfoObj.put("webBin",webBin);
                         newJsonArray.add(sceneInfoObj);
                         dataSetIds.add( sceneInfoObj.getString("id"));
                     }

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

@@ -178,8 +178,8 @@ public class InitService {
                 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);
+                if(downloadProcessVo != null && downloadProcessVo.getCaseId() != null && downloadProcessVo.getPercent() != 100 ){
+                    caseService.updateOfflineStatus(downloadProcessVo.getCaseId(),0,null);
                 }
                 redisUtil.del(key);
             }