Merge branch 'release/V1.0.1/test' of http://192.168.4.240:3000/LINK/LINK-SERVER into release/V2.0.0/test

 Conflicts:

	src/main/java/com/lqkj/link/module/zone/controller/ZoneInfoController.java

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

	src/main/java/com/lqkj/link/module/zone/repository/ZoneInfoRepository.java

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

src/main/java/com/lqkj/link/config/OpenApiConfig.java

@@ -107,6 +107,7 @@ public class OpenApiConfig {
                         "/notice/v1/**",
                         "/layer/v1/**",
                         "/resource/v1/**",
+                        "/zone/getSpawnPointList",
                         "/resource/ossUpload")
                 .build();
     }

src/main/java/com/lqkj/link/module/zone/controller/ZoneInfoController.java

@@ -1,9 +1,11 @@
 package com.lqkj.link.module.zone.controller;
 
+import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.lqkj.link.message.MessageBean;
 import com.lqkj.link.message.MessageListBean;
 import com.lqkj.link.module.base.service.BaseService;
+import com.lqkj.link.module.bulletin.domain.BulletinInfo;
 import com.lqkj.link.module.jwt.service.JwtService;
 import com.lqkj.link.module.zone.domain.ZoneInfo;
 import com.lqkj.link.module.zone.service.ZoneInfoService;
@@ -413,4 +415,46 @@ public class ZoneInfoController {
         return MessageBean.ok(zoneInfoService.viewShareUser(zoneId), "查看分享用户");
     }
 
+
+    @PostMapping("/getSpawnPointList")
+    public MessageBean<List<Map<String, Object>>> getSpawnPointList(@RequestParam Integer zoneId) {
+        return MessageBean.ok(zoneInfoService.getSpawnPointList(zoneId), "获取出生点列表");
+    }
+
+    @Operation(
+            summary = "保存作品",
+            description = "保存作品",
+            requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody(
+                    description = "通知公告信息实体",
+                    required = true,
+                    content = @Content(
+                            mediaType = "application/json",
+                            schema = @Schema(implementation = BulletinInfo.class)
+                    )
+            ))
+    @PostMapping("/save")
+    public MessageBean<String> save(@RequestBody ZoneInfo zoneInfo) {
+        zoneInfoService.save(zoneInfo);
+        return MessageBean.ok();
+    }
+
+
+    @Operation(
+            summary = "作品详情",
+            description = "作品详情",
+            parameters = {
+                    @Parameter(name = "zoneId", description = "作品ID", required = true)
+            }
+    )
+    @PostMapping("/zoneDetails")
+    public MessageBean<ZoneInfo> zoneDetails(@RequestParam Integer zoneId) {
+
+        return MessageBean.ok(zoneInfoService.zoneDetails(zoneId), "作品详情");
+    }
+
+
+
+
+
+
 }

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

@@ -66,6 +66,10 @@ public class GeomInfo {
     private Boolean navigation;
     @Column(name = "navigation_end")
     private String navigationEnd;
+    @Column(name = "type_number")
+    private Integer typeNumber;
+    @Column(name = "static_id")
+    private Integer staticId;
 
     /**
      * 材质ID

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

@@ -62,4 +62,7 @@ public class ZoneInfo {
     @Column(name = "like_count")
     @Schema(description = "点赞次数")
     private Integer likeCount;
+    @Column(name = "effect_address")
+    @Schema(description = "模板文件路径")
+    private String effectAddress;
 }

src/main/java/com/lqkj/link/module/zone/repository/ZoneInfoRepository.java

@@ -1,5 +1,7 @@
 package com.lqkj.link.module.zone.repository;
 
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.lqkj.link.module.zone.domain.ZoneInfo;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -223,4 +225,9 @@ public interface ZoneInfoRepository extends JpaRepository<ZoneInfo, Integer> {
     void acceptShare(@Param("zoneId") Integer zoneId,
                      @Param("userId") Integer userId,
                      @Param("acceptStatus") Boolean acceptStatus);
+
+    @Query(nativeQuery = true,
+            value = "SELECT * FROM initial_points WHERE zone_id =:zoneId"
+    )
+    List<Map<String, Object>> getSpawnPointList(@Param("zoneId") Integer zoneId);
 }

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

@@ -1,6 +1,7 @@
 package com.lqkj.link.module.zone.service;
 
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.lqkj.link.module.authority.domain.UserInfo;
 import com.lqkj.link.module.authority.repository.UserInfoRepository;
@@ -15,6 +16,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.aspectj.weaver.ast.Var;
 import org.checkerframework.checker.units.qual.A;
+import org.aspectj.weaver.ast.Var;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.GeometryFactory;
 import org.springframework.beans.BeanUtils;
@@ -380,13 +382,12 @@ public class ZoneInfoService {
             template = zoneInfoRepository.findById(templateId).get();
         }
 
-        ZoneInfo zoneInfo = new ZoneInfo(null, userInfo.getUserId(), name, template == null ? null : template.getInitLocation(),
+        ZoneInfo zoneInfo = new ZoneInfo(null, userInfo.getUserId(), name, template == null ? new JSONObject(JSON.parseObject("{\"rotation\":{\"x\":0,\"y\":0.4383658766746521,\"z\":0,\"w\":0.8987966179847717},\"translation\":{\"x\":-820.947265625,\"y\":0,\"z\":955.6719360351563},\"scale3D\":{\"x\":1,\"y\":1,\"z\":1}}")) : template.getInitLocation(),
                 template == null ? null : template.getThumbnail(), 0, new Date(), 0, 0,
-                null, null, 0, 0);
+                null, null, 0,null);
         ZoneInfo newInfo = zoneInfoRepository.save(zoneInfo);
-
+        GeometryFactory geometryFactory = new GeometryFactory();
         if (templateId != null) {
-            GeometryFactory geometryFactory = new GeometryFactory();
             if (geomInfoRepository.hasGeom(templateId)) {
                 List<GeomInfo> geomInfoList = geomInfoRepository.findAllByZoneId(templateId);
                 List<GeomInfo> list = new ArrayList<>();
@@ -409,6 +410,17 @@ public class ZoneInfoService {
             }
             // 模板使用次数+1
             zoneInfoRepository.addTemplateUse(templateId);
+        }else {
+            GeomInfo geomInfo = new GeomInfo();
+            geomInfo.setZoneId(newInfo.getZoneId());
+            geomInfo.setGeomId(newInfo.getZoneId() + "_1");
+            geomInfo.setModelId(10000);
+            geomInfo.setGeomName("地板");
+            geomInfo.setLocking(false);
+            geomInfo.setTrans(new JSONObject(JSON.parseObject("{\"rotation\":{\"x\":0,\"y\":0,\"z\":0,\"w\":1},\"translation\":{\"x\":0,\"y\":0,\"z\":20},\"scale3D\":{\"x\":1,\"y\":1,\"z\":1}}")));
+            geomInfo.setGeom(geometryFactory.createPoint(new Coordinate(0, 0, 0)));
+            geomInfo.setTypeNumber(0);
+            geomInfoRepository.save(geomInfo);
         }
         result.put("zone", newInfo);
 
@@ -418,7 +430,7 @@ public class ZoneInfoService {
     public void saveThumbnail(Integer zoneId, String thumbnailPath) {
         ZoneInfo zoneInfo = zoneInfoRepository.findById(zoneId).get();
         zoneInfo.setThumbnail(thumbnailPath);
-        zoneInfo.setUpdateTime(new Date());
+//        zoneInfo.setUpdateTime(new Date());
         zoneInfoRepository.save(zoneInfo);
     }
 
@@ -510,4 +522,25 @@ public class ZoneInfoService {
             return mutableMap;
         }).collect(Collectors.toList());
     }
+    public List<Map<String, Object>> getSpawnPointList(Integer zoneId) {
+        List<Map<String, Object>> spawnPointList = zoneInfoRepository.getSpawnPointList(zoneId);
+        ArrayList<Map<String, Object>> maps = new ArrayList<>();
+        for (Map<String, Object> map : spawnPointList) {
+            HashMap<String, Object> stringObjectHashMap = new HashMap<>();
+            stringObjectHashMap.put("id", map.get("id"));
+            stringObjectHashMap.put("zone_id", map.get("zone_id"));
+            stringObjectHashMap.put("name", map.get("name"));
+            stringObjectHashMap.put("init_location", JSONObject.parse(map.get("init_location").toString()));
+            maps.add(stringObjectHashMap);
+        }
+        return maps;
+    }
+
+    public void save(ZoneInfo zoneInfo) {
+        zoneInfoRepository.save(zoneInfo);
+    }
+
+    public ZoneInfo zoneDetails(Integer zoneId) {
+        return zoneInfoRepository.findById(zoneId).get();
+    }
 }

src/main/resources/db/migration/V4__1.0.0.sql

@@ -0,0 +1,12 @@
+create table initial_points(
+    id            SERIAL               not null,
+    zone_id       INT4                 null,
+    name          VARCHAR(255)         null,
+    init_location        jsonb                null,
+    constraint PK_INITIAL_POINTS primary key (id)
+);
+comment on table initial_points is '初始点';
+comment on column initial_points.id is 'id';
+comment on column initial_points.zone_id is '所属区域';
+comment on column initial_points.name is '名称';
+comment on column initial_points.init_location is '初始位置';

src/main/resources/db/migration/V5__1.0.0.sql

@@ -0,0 +1,15 @@
+ALTER TABLE zone_info
+add COLUMN if not exists effect_address VARCHAR(255);
+comment on column zone_info.effect_address is '特效文件地址';
+
+ALTER TABLE geom_info
+    add COLUMN if not exists type_number int default 0;
+comment on column geom_info.type_number is '类型编号0：模型 1：特效';
+
+ALTER TABLE geom_info
+    add COLUMN if not exists static_id int;
+comment on column geom_info.static_id is '类型编号';
+
+INSERT INTO "public"."model_category" ("category_id", "user_id", "icon", "category_name", "order_id", "compress_file_path", "compress_file_name") VALUES (10000, NULL, 'https://link-meta.oss-cn-chengdu.aliyuncs.com/file/2024-12-02/7F1B512F-4D21-4c7a-83E8-4AE96D0C3CB4.png', '地形', NULL, NULL, NULL);
+
+INSERT INTO "public"."model_info" ("model_id", "category_id", "model_name", "json_path", "texture_path", "order_id", "original_path", "model_icon", "template_id") VALUES (10000, 10000, '地板', NULL, NULL, NULL, 'https://link-meta.oss-cn-chengdu.aliyuncs.com/file/2024-12-02/2.fbx', 'https://link-meta.oss-cn-chengdu.aliyuncs.com/file/2024-12-02/7F1B512F-4D21-4c7a-83E8-4AE96D0C3CB4.png', NULL);