更新

sxz-base/src/main/java/com/fdkk/sxz/util/test.java

@@ -16,7 +16,12 @@ public class test {
         timer.start("1");
         ThreadUtil.sleep(800);
 
-        Console.log("Timer 1 took {} ms", timer.intervalDay("1"));
+        Console.log("Timer 1 took {} ms", timer.intervalMs("1"));
+
+
+        ThreadUtil.sleep(800);
+
+        Console.log("Timer 1 took {} ms", timer.intervalMs("1"));
 
     }
 }

sxz-core/src/main/java/com/fdkk/sxz/other/listener/Model3dBuild.java

@@ -24,10 +24,7 @@ import org.springframework.messaging.Message;
 import org.springframework.stereotype.Component;
 
 import java.io.File;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * @author Xiewj
@@ -101,10 +98,11 @@ public class Model3dBuild {
         final TimeInterval timer = new TimeInterval();
         timer.start(str.getName());
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("name", str.getName());
-        jsonObject.put("taskType", "localDataUpload");
+//        jsonObject.put("name", str.getName());
+//        jsonObject.put("taskType", "localDataUpload");
+        jsonObject.put("furnitureIDs", Arrays.asList(str.getName()));
         while (true) {
-            long l = timer.intervalMinute(str.getName());
+            long l = timer.intervalHour(str.getName());
             if (l>1){
                 log.info("渲染超时--{},={}",str.getName(),l);
                 over = true;
@@ -112,7 +110,7 @@ public class Model3dBuild {
                 modelUploadOfflineService.updateById(modelUploadOfflineEntity);
             }
 
-            String checkResult = OkHttpUtils.httpPostJson(buildUrl + "check", jsonObject.toJSONString());
+            String checkResult = OkHttpUtils.httpPostJson(buildUrl + "GetUploadFur", jsonObject.toJSONString());
             Thread.sleep(2000L);
             JSONObject checkJson = JSONObject.parseObject(checkResult);
 
@@ -134,7 +132,7 @@ public class Model3dBuild {
                 }
 
                 if (objectJson.containsKey("state") && ("".equals(objectJson.getString("state")) ||
-                        "done".equals(objectJson.getString("state")) || "error".equals(objectJson.getString("state")))) {
+                        "done".equals(objectJson.getString("state")))) {
                     over = true;
                     //完成 存库。。。。。name: XXXXX  完成状态 进度
                     //id ,name  status 1完成-2未完成 3-错误    progress