公共包

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

@@ -51,6 +51,11 @@ public class ConstantFilePath {
     public static final String DATABUFFER_FORMAT = SCENE_PATH + "data/data%s/";
 
     /**
+     * 场景数据文件路径
+     */
+    public static final String IMAGESBUFFER_FORMAT = SCENE_PATH + "images/images%s/";
+
+    /**
      * 漫游文件路径
      */
     public static final String TOURLIST_PATH_FORMAT = SCENE_PATH + "data/data%s/" + ConstantFileName.TOUR_LIST;
@@ -58,7 +63,14 @@ public class ConstantFilePath {
     /**
      * 漫游文件路径
      */
-    public static final String SCENE_PATH_FORMAT = SCENE_PATH + "data/data%s/" + ConstantFileName.SCENE_JSON;
+    public static final String TOURLIST_FOLDER_PATH_FORMAT = SCENE_PATH + "data/data%s/" + ConstantFileName.TOURLIST_FOLDER;
+
+    /**
+     * 漫游文件路径
+     */
+    public static final String SCENE_PATH_FORMAT = DATABUFFER_FORMAT + ConstantFileName.SCENE_JSON;
+
+    public static final String MEDIAINFO_PATH_FORMAT = DATABUFFER_FORMAT + ConstantFileName.MEDIA_DATAFILE;
 
     public void setHardDiskLaser(String value){
         ConstantFilePath.BUILD_MODEL_LASER_PATH = value;

4dkankan-common-utils/src/main/java/com/fdkankan/common/response/ResultData.java

@@ -34,7 +34,7 @@ public class ResultData<T> implements Serializable {
     private long timestamp = Calendar.getInstance().getTimeInMillis();
 
     public static ResultData ok() {
-        return ok("");
+        return ok(null);
     }
     public static ResultData ok(Object data) {
         return ok("", data);
@@ -53,7 +53,7 @@ public class ResultData<T> implements Serializable {
     }
 
     public static ResultData error(int code, String msg) {
-        return error(code, msg, ""); }
+        return error(code, msg, null); }
     public static ResultData error(int code, String msg, Object data) {
         return base(code, msg, data,false);
     }

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

@@ -30,4 +30,39 @@ public class DateExtUtil {
         return gc.getTime();
     }
 
+    public void test1() throws InterruptedException {
+        synchronized (this){
+            System.out.println("test1 start");
+            Thread.sleep(5000);
+            System.out.println("test1 end");
+        }
+    }
+
+    public void test2() throws InterruptedException {
+        synchronized (this){
+            System.out.println("test2 start");
+            Thread.sleep(5000);
+            System.out.println("test2 end");
+        }
+    }
+
+    public static void main(String[] args) {
+        DateExtUtil dateExtUtil = new DateExtUtil();
+        new Thread(()->{
+            try {
+                dateExtUtil.test1();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }).start();
+
+        new Thread(()->{
+            try {
+                dateExtUtil.test2();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }).start();
+    }
+
 }

4dkankan-utils-redis/src/main/java/com/fdkankan/redis/constant/RedisLockKey.java

@@ -21,6 +21,9 @@ public class RedisLockKey {
     public static String LOCK_SCENE_VISIT_UPDATE = "lock:scene:visit:update";
 
     /**
+     *
+     *
+     *
      * 场景上传图片锁
      */
     public static String LOCK_UPLOAD_PIC = "lock:upload:pic:scenecode:%s";