dengsixing hace 9 meses
padre
commit
3e9e26244a

+ 0 - 6
src/main/java/com/fdkankan/modeldemo/bean/ResultData.java

@@ -59,10 +59,4 @@ public class ResultData<T> implements Serializable {
         return rd;
     }
 
-    public static void main(String[] args) {
-        String test =  "1111-1111-2222-33333";
-        System.out.println(test.replace("-", ""));
-        System.out.println(test.replaceAll("-", ""));
-    }
-
 }

+ 38 - 38
src/main/java/com/fdkankan/modeldemo/proto/BigSceneProto.java

@@ -182,10 +182,10 @@ public final class BigSceneProto {
     /**
      * <code>repeated .tutorial.chunk_simple chunk = 1;</code>
      */
-    public java.util.List<? extends chunk_simpleOrBuilder>
-        getChunkOrBuilderList() {
-      return chunk_;
-    }
+//    public java.util.List<? extends chunk_simpleOrBuilder>
+//        getChunkOrBuilderList() {
+//      return chunk_;
+//    }
     /**
      * <code>repeated .tutorial.chunk_simple chunk = 1;</code>
      */
@@ -217,10 +217,10 @@ public final class BigSceneProto {
     /**
      * <code>repeated .tutorial.chunk_quantized quantized_chunk = 2;</code>
      */
-    public java.util.List<? extends chunk_quantizedOrBuilder>
-        getQuantizedChunkOrBuilderList() {
-      return quantizedChunk_;
-    }
+//    public java.util.List<? extends chunk_quantizedOrBuilder>
+//        getQuantizedChunkOrBuilderList() {
+//      return quantizedChunk_;
+//    }
     /**
      * <code>repeated .tutorial.chunk_quantized quantized_chunk = 2;</code>
      */
@@ -746,14 +746,14 @@ public final class BigSceneProto {
       /**
        * <code>repeated .tutorial.chunk_simple chunk = 1;</code>
        */
-      public java.util.List<? extends chunk_simpleOrBuilder>
-           getChunkOrBuilderList() {
-        if (chunkBuilder_ != null) {
-          return chunkBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(chunk_);
-        }
-      }
+//      public java.util.List<? extends chunk_simpleOrBuilder>
+//           getChunkOrBuilderList() {
+//        if (chunkBuilder_ != null) {
+//          return chunkBuilder_.getMessageOrBuilderList();
+//        } else {
+//          return java.util.Collections.unmodifiableList(chunk_);
+//        }
+//      }
       /**
        * <code>repeated .tutorial.chunk_simple chunk = 1;</code>
        */
@@ -986,14 +986,14 @@ public final class BigSceneProto {
       /**
        * <code>repeated .tutorial.chunk_quantized quantized_chunk = 2;</code>
        */
-      public java.util.List<? extends chunk_quantizedOrBuilder>
-           getQuantizedChunkOrBuilderList() {
-        if (quantizedChunkBuilder_ != null) {
-          return quantizedChunkBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(quantizedChunk_);
-        }
-      }
+//      public java.util.List<? extends chunk_quantizedOrBuilder>
+//           getQuantizedChunkOrBuilderList() {
+//        if (quantizedChunkBuilder_ != null) {
+//          return quantizedChunkBuilder_.getMessageOrBuilderList();
+//        } else {
+//          return java.util.Collections.unmodifiableList(quantizedChunk_);
+//        }
+//      }
       /**
        * <code>repeated .tutorial.chunk_quantized quantized_chunk = 2;</code>
        */
@@ -5894,8 +5894,8 @@ public final class BigSceneProto {
     /**
      * <code>repeated .tutorial.uv_quantized uvs = 4;</code>
      */
-    java.util.List<? extends uv_quantizedOrBuilder>
-        getUvsOrBuilderList();
+//    java.util.List<? extends uv_quantizedOrBuilder>
+//        getUvsOrBuilderList();
     /**
      * <code>repeated .tutorial.uv_quantized uvs = 4;</code>
      */
@@ -6172,10 +6172,10 @@ public final class BigSceneProto {
     /**
      * <code>repeated .tutorial.uv_quantized uvs = 4;</code>
      */
-    public java.util.List<? extends uv_quantizedOrBuilder>
-        getUvsOrBuilderList() {
-      return uvs_;
-    }
+//    public java.util.List<? extends uv_quantizedOrBuilder>
+//        getUvsOrBuilderList() {
+//      return uvs_;
+//    }
     /**
      * <code>repeated .tutorial.uv_quantized uvs = 4;</code>
      */
@@ -7032,14 +7032,14 @@ public final class BigSceneProto {
       /**
        * <code>repeated .tutorial.uv_quantized uvs = 4;</code>
        */
-      public java.util.List<? extends uv_quantizedOrBuilder>
-           getUvsOrBuilderList() {
-        if (uvsBuilder_ != null) {
-          return uvsBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(uvs_);
-        }
-      }
+//      public java.util.List<? extends uv_quantizedOrBuilder>
+//           getUvsOrBuilderList() {
+//        if (uvsBuilder_ != null) {
+//          return uvsBuilder_.getMessageOrBuilderList();
+//        } else {
+//          return java.util.Collections.unmodifiableList(uvs_);
+//        }
+//      }
       /**
        * <code>repeated .tutorial.uv_quantized uvs = 4;</code>
        */

+ 12 - 12
src/main/java/com/fdkankan/modeldemo/proto/Visionmodeldata.java

@@ -3710,10 +3710,10 @@ public final class Visionmodeldata {
     /**
      * <code>repeated .com.example.tutorial.SweepLocation sweepLocations = 1;</code>
      */
-    public java.util.List<? extends SweepLocationOrBuilder>
-        getSweepLocationsOrBuilderList() {
-      return sweepLocations_;
-    }
+//    public java.util.List<? extends SweepLocationOrBuilder>
+//        getSweepLocationsOrBuilderList() {
+//      return sweepLocations_;
+//    }
     /**
      * <code>repeated .com.example.tutorial.SweepLocation sweepLocations = 1;</code>
      */
@@ -4193,14 +4193,14 @@ public final class Visionmodeldata {
       /**
        * <code>repeated .com.example.tutorial.SweepLocation sweepLocations = 1;</code>
        */
-      public java.util.List<? extends SweepLocationOrBuilder>
-           getSweepLocationsOrBuilderList() {
-        if (sweepLocationsBuilder_ != null) {
-          return sweepLocationsBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(sweepLocations_);
-        }
-      }
+//      public java.util.List<? extends SweepLocationOrBuilder>
+//           getSweepLocationsOrBuilderList() {
+//        if (sweepLocationsBuilder_ != null) {
+//          return sweepLocationsBuilder_.getMessageOrBuilderList();
+//        } else {
+//          return java.util.Collections.unmodifiableList(sweepLocations_);
+//        }
+//      }
       /**
        * <code>repeated .com.example.tutorial.SweepLocation sweepLocations = 1;</code>
        */

+ 5 - 3
src/main/java/com/fdkankan/modeldemo/utils/ConvertUtil.java

@@ -55,6 +55,8 @@ public class ConvertUtil {
 
     private static String extinguisherJson = "extinguisher.json";
 
+    private static String floorplanJsonName = "floorplan.json";
+
 
 
     @Autowired
@@ -175,12 +177,12 @@ public class ConvertUtil {
         //复制文件
         JSONObject standarFloor = null;
         Integer maxWallNum = 0;
-        if(FileUtil.exist(sourcePath +  DATA_DIR + "/floorplan.json")){
-            String floorplanJson = FileUtil.readUtf8String(sourcePath + DATA_DIR + "/floorplan.json");
+        if(FileUtil.exist(sourcePath +  DATA_DIR + "/" + floorplanJsonName)){
+            String floorplanJson = FileUtil.readUtf8String(sourcePath + DATA_DIR + "/" + floorplanJsonName);
             JSONObject jsonObject = JSON.parseObject(floorplanJson);
             Integer currentId = jsonObject.getInteger("currentId");
             if(Objects.nonNull(currentId) && currentId == 0){
-                FileUtil.del(sourcePath + DATA_DIR + "/floorplan.json");
+                FileUtil.del(sourcePath + DATA_DIR + "/" + floorplanJsonName);
             }else{
                 JSONArray floors = jsonObject.getJSONArray("floors");
                 for (Object floor : floors) {