Merge branch 'release/V1.0.0/test' of http://192.168.4.240:3000/LINK/LINK-SERVER into feature/v1.0.0.0/lyt/fixbug

src/main/java/com/lqkj/link/module/zone/domain/TemplateGeom.java

@@ -0,0 +1,14 @@
+package com.lqkj.link.module.zone.domain;
+
+import com.alibaba.fastjson2.JSONObject;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class TemplateGeom {
+    private JSONObject init;
+    private List<TemplateInfo> models;
+}

src/main/java/com/lqkj/link/module/zone/service/ZoneInfoService.java

@@ -4,10 +4,7 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.lqkj.link.module.authority.domain.UserInfo;
 import com.lqkj.link.module.authority.repository.UserInfoRepository;
-import com.lqkj.link.module.zone.domain.GeomInfo;
-import com.lqkj.link.module.zone.domain.ModelInfo;
-import com.lqkj.link.module.zone.domain.TemplateInfo;
-import com.lqkj.link.module.zone.domain.ZoneInfo;
+import com.lqkj.link.module.zone.domain.*;
 import com.lqkj.link.module.zone.repository.GeomInfoRepository;
 import com.lqkj.link.module.zone.repository.ModelInfoRepository;
 import com.lqkj.link.module.zone.repository.ZoneInfoRepository;
@@ -78,37 +75,59 @@ public class ZoneInfoService {
                 // ----model2.json 模型2材质
                 //
                 // geom.json文件总json格式：
-                // [
-                //      {
-                //          "modelPath": "model1.fbx",
-                //          "location":[
-                //              {
-                //                  "rotation":
-                //                  {
-                //                      "x": 0,
-                //                      "y": 0,
-                //                      "z": 0,
-                //                      "w": 0
-                //                  },
-                //                  "translation":
-                //                  {
-                //                      "x": 0,
-                //                      "y": 0,
-                //                      "z": 0
-                //                  },
-                //                  "scale3D":
-                //                  {
-                //                      "x": 0,
-                //                      "y": 0,
-                //                      "z": 0
-                //                  }
-                //              }
-                //          ]
-                //      }
-                // ]
+                // 	{
+                //		"init": {
+                //			"rotation": {
+                //				"x": 0,
+                //				"y": 0,
+                //				"z": 0,
+                //				"w": 0
+                //			},
+                //			"translation": {
+                //				"x": 0,
+                //				"y": 0,
+                //				"z": 0
+                //			},
+                //			"scale3D": {
+                //				"x": 0,
+                //				"y": 0,
+                //				"z": 0
+                //			}
+                //		},
+                //		"models": [
+                //			{
+                //				"modelPath": "model1.fbx",
+                //				"location": [
+                //					{
+                //						"rotation": {
+                //							"x": 0,
+                //							"y": 0,
+                //							"z": 0,
+                //							"w": 0
+                //						},
+                //						"translation": {
+                //							"x": 0,
+                //							"y": 0,
+                //							"z": 0
+                //						},
+                //						"scale3D": {
+                //							"x": 0,
+                //							"y": 0,
+                //							"z": 0
+                //						}
+                //					}
+                //				]
+                //			}
+                //		]
+                //	}
                 Unzipper.unZipFiles(new File("." + zoneInfo.getTemplateFilePath()), "./upload/template/" + zoneInfo1.getZoneId() + "/");
                 String geomJsonString = Files.readString(Paths.get("./upload/template/" + zoneInfo1.getZoneId() + "/geom.json"));
-                List<TemplateInfo> templateInfoList = JSON.parseArray(geomJsonString, TemplateInfo.class);
+                TemplateGeom templateGeom = JSON.parseObject(geomJsonString, TemplateGeom.class);
+
+                zoneInfo1.setInitLocation(templateGeom.getInit());
+                zoneInfoRepository.save(zoneInfo1);
+
+                List<TemplateInfo> templateInfoList = templateGeom.getModels();
 
                 String modelFolderPath = "./upload/template/" + zoneInfo1.getZoneId() + "/models";
                 File modelFolder = new File(modelFolderPath);
@@ -276,16 +295,19 @@ public class ZoneInfoService {
             result.put("msg", "不能与已有作品重名！");
             return result;
         }
-        ZoneInfo zoneInfo = new ZoneInfo(null, userInfo.getUserId(), name, null,
-                null, 0, new Date(), 0, 0,
+
+        ZoneInfo template = null;
+        if (templateId != null) {
+            template = zoneInfoRepository.findById(templateId).get();
+        }
+
+        ZoneInfo zoneInfo = new ZoneInfo(null, userInfo.getUserId(), name, template == null ? null : template.getInitLocation(),
+                template == null ? null : template.getThumbnail(), 0, new Date(), 0, 0,
                 null, null, 0);
         ZoneInfo newInfo = zoneInfoRepository.save(zoneInfo);
 
         if (templateId != null) {
             GeometryFactory geometryFactory = new GeometryFactory();
-            ZoneInfo template = zoneInfoRepository.findById(templateId).get();
-            newInfo.setThumbnail(template.getThumbnail());
-            zoneInfoRepository.save(newInfo);
             if (geomInfoRepository.hasGeom(templateId)) {
                 List<GeomInfo> geomInfoList = geomInfoRepository.findAllByZoneId(templateId);
                 List<GeomInfo> list = new ArrayList<>();
@@ -306,11 +328,11 @@ public class ZoneInfoService {
                 }
                 geomInfoRepository.saveAll(list);
             }
+            // 模板使用次数+1
+            zoneInfoRepository.addTemplateUse(templateId);
         }
         result.put("zone", newInfo);
 
-        // 模板使用次数+1
-        zoneInfoRepository.addTemplateUse(templateId);
         return result;
     }