2.3.0

src/main/java/com/fdkankan/contro/schedule/ScheduleJob.java

@@ -39,7 +39,7 @@ public class ScheduleJob {
     /**
      * 每隔十分钟拉取一次压缩包
      */
-    @Scheduled(fixedDelay = 5*60*1000, initialDelay = 1000)
+    @Scheduled(fixedDelay = 30*1000, initialDelay = 1000)
     public void bd() {
         log.info("定时任务推送开始");
         gzZcdjzxService.bd();

src/main/java/com/fdkankan/contro/service/impl/HaixinServiceImpl.java

@@ -83,7 +83,8 @@ public class HaixinServiceImpl implements IHaixinService {
         sceneOrigBdService.save(sceneOrigBd);
 
         //推送进度
-        haixinService.syncRenderStatus(sceneOrigBd.getId(), 0, this.getExpectedTime(sceneOrigBd), null);
+//        haixinService.syncRenderStatus(sceneOrigBd.getId(), 0, this.getExpectedTime(sceneOrigBd), null);
+        haixinService.syncRenderStatus(sceneOrigBd.getId(), 0, 0, null);
 
         return ResultData.ok();
     }

src/main/java/com/fdkankan/contro/service/impl/MjServiceImpl.java

@@ -80,17 +80,13 @@ public class MjServiceImpl implements MjService {
             try {
 
                 ScenePlus scenePlus = scenePlusService.getByTaskId(taskId);
-                if(Objects.nonNull(scenePlus) && scenePlus.getSceneStatus() == SceneStatus.wait.code()){
-                    continue;
-                }
+//                if(Objects.nonNull(scenePlus) && scenePlus.getSceneStatus() == SceneStatus.wait.code()){
+//                    continue;
+//                }
 
                 FileUtil.mkdir(zipDir);
                 String downloadCmd = "wget -O " + zipDir + zipName + " " + fileUrl;
                 CmdUtils.callLineSh(downloadCmd);
-//                httpClient.downloadFile(fileUrl, zipDir, zipName);
-//                String unzipCmd = "unzip -O GBK " + zipDir + zipName + " -d " + zipDir;
-
-//                CmdUtils.callLine(unzipCmd);
 
                 ZipUtil.unzip(new File(zipDir + zipName), new File(zipDir));
                 //解压后删除压缩包