111

4dkankan-common-utils/src/main/java/com/fdkankan/common/constant/ErrorCode.java

@@ -48,6 +48,7 @@ public enum ErrorCode {
 
 
 
+    FAILURE_CODE_2001(2001, "场景上传中，请勿重复上传"),
 
     FAILURE_CODE_3001(3001, "缺少必要参数"),
     FAILURE_CODE_3002(3002, "访问异常!"),
@@ -170,6 +171,7 @@ public enum ErrorCode {
     FAILURE_CODE_5073(5073, "相机原始资源正在被清除"),
     FAILURE_CODE_5074(5074, "场景原始资源被冻结，不支持重算"),
     FAILURE_CODE_5075(5075, "模型不正确"),
+    FAILURE_CODE_5076(5076, "场景密钥已失效"),
 
     FAILURE_CODE_6003(6003, "该相机未被绑定，请前往 我的相机 先绑定相机后再进行授权 "),
 

4dkankan-common-utils/src/main/java/com/fdkankan/common/util/EncryptDecrypt.java

@@ -18,7 +18,8 @@ public class EncryptDecrypt {
    }
 
     public static void main(String[] args) {
-        System.out.println(getEncrypt("WFlh5+irtZyaF9WfBYNvDGpSZrU/k/QiHQUizJ3I"));
+        System.out.println(getEncrypt("LTAI5t5znpYwmLmGyCXBeYzx"));
+        System.out.println(getEncrypt("OtIt47WueHh13pN6mg9ge8clV36kGe"));
 //        System.out.println(getEncrypt("LTAI5tJZBJwP5qazE6b3b4Gr"));
 //        System.out.println(getEncrypt("zSQCG0yyvRJISPokNZGhbhaAfh4hGX"));
 //        System.out.println(getEncrypt("4dkankan524%40123*"));

4dkankan-utils-model/src/main/java/com/fdkankan/model/utils/ComputerUtil.java

@@ -310,24 +310,23 @@ public class ComputerUtil {
     /**
      * 循环检测算法是否计算成功
      * @param uploadJsonPath uploadjson路径
-     * @param maxCheckTimes 循环次数
+     * @param maxCheckTimes 最大检查次数
      * @param waitTime 每次检测间隔时间，毫秒
-     * @return boolean
-     * @throws Exception
+     * @return 文件是否存在
+     * @throws InterruptedException
      */
-    public static boolean checkComputeCompleted(String uploadJsonPath, int maxCheckTimes, long waitTime) throws Exception{
-        int checkTimes = 1;
-        boolean exist = false;
-        do {
-            if(new File(uploadJsonPath).exists()){
-                exist = true;
-                break;
+    public static boolean checkComputeCompleted(String uploadJsonPath, int maxCheckTimes, long waitTime) throws InterruptedException {
+        File file = new File(uploadJsonPath);
+        for (int i = 0; i < maxCheckTimes; i++) {
+            if (file.exists()) {
+                return true;
             }
-            Thread.sleep(waitTime);
-            ++checkTimes;
-        }while (checkTimes <= maxCheckTimes);
-
-        return exist;
+            if (i < maxCheckTimes - 1) {
+                Thread.sleep(waitTime);
+            }
+        }
+        log.warn("检测超时，路径: {}, 检查次数: {}", uploadJsonPath, maxCheckTimes);
+        return false;
     }
 
     /**