Merge branch 'release/V1.0.0/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/ResourceController.java

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

@@ -205,13 +205,13 @@ public class ResourceController {
             )
     )
     @PostMapping("/" + VERSION_V1 + "/savePersonal")
-    public MessageBean<String> savePersonal(@RequestBody ModelCategory category,
+    public MessageBean<ModelCategory> savePersonal(@RequestBody ModelCategory category,
                                     HttpServletRequest request) {
         String authHeader = request.getHeader("Authorization");
         String userCode = jwtService.decryptUsernameWithHeader(authHeader);
-        String msg = resourceService.savePersonal(category, userCode);
-        if (StringUtils.isNotBlank(msg)) return MessageBean.error(msg);
-        return MessageBean.ok(null, "个人文件夹保存接口");
+        Map<String, Object> result = resourceService.savePersonal(category, userCode);
+        if (result.containsKey("msg")) return MessageBean.error(String.valueOf(result.get("msg")));
+        return MessageBean.ok((ModelCategory) result.get("category"), "个人文件夹保存接口");
     }
 
     @Operation(
@@ -231,4 +231,10 @@ public class ResourceController {
         return MessageBean.ok(resourceService.saveModel(modelInfo), "个人文件夹保存接口");
     }
 
+    @PostMapping("/" + VERSION_V1 + "/needRefresh")
+    public MessageBean<Boolean> needRefresh(HttpServletRequest request) {
+        String authHeader = request.getHeader("Authorization");
+        String userCode = jwtService.decryptUsernameWithHeader(authHeader);
+        return MessageBean.ok(resourceService.needRefreshResource(userCode), "资源更新检查");
+    }
 }

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

@@ -13,6 +13,13 @@ import java.util.Map;
 @Repository
 public interface GeomInfoRepository extends JpaRepository<GeomInfo, String> {
 
+    @Query(nativeQuery = true,
+        value = "with t1 as(select zone_id, st_makepoint(" +
+                    "(init_location -> 'translation' ->> 'x')\\:\\:float8, " +
+                    "(init_location -> 'translation' ->> 'y')\\:\\:float8, " +
+                    "(init_location -> 'translation' ->> 'z')\\:\\:float8) as init from zone_info where zone_id = :zoneId) " +
+                "select gi.* from geom_info gi, t1 where gi.zone_id = t1.zone_id order by st_distance(gi.geom, t1.init) "
+    )
     List<GeomInfo> findAllByZoneId(Integer zoneId);
 
     @Modifying

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

@@ -1,5 +1,6 @@
 package com.lqkj.link.module.zone.service;
 
+import com.lqkj.link.module.authority.domain.UserInfo;
 import com.lqkj.link.module.authority.repository.UserInfoRepository;
 import com.lqkj.link.module.zone.domain.ModelCategory;
 import com.lqkj.link.module.zone.domain.ModelInfo;
@@ -15,10 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -150,22 +148,29 @@ public class ResourceService {
         return infoRepository.listWitUserCode(userCode, categoryId, modelName);
     }
 
-    public String savePersonal(ModelCategory modelCategory, String userCode) {
+    public Map<String, Object> savePersonal(ModelCategory modelCategory, String userCode) {
+        Map<String, Object> result = new HashMap<>();
         if (modelCategory.getCategoryId() == 0) {
             modelCategory.setCategoryId(null);
         }
         Integer userId = userInfoRepository.findByUserCode(userCode).getUserId();
         if ((modelCategory.getCategoryId() != null && categoryRepository.hasSameNameByUserWithoutOne(modelCategory.getCategoryName(), modelCategory.getCategoryId(), userId))
                 || (modelCategory.getCategoryId() == null && categoryRepository.hasSameNameByUser(modelCategory.getCategoryName(), userId))) {
-            return "不能与已有文件夹重名！";
+            result.put("msg", "不能与已有文件夹重名！");
+            return result;
         }
         modelCategory.setUserId(userId);
-        categoryRepository.save(modelCategory);
-        return null;
+        modelCategory = categoryRepository.save(modelCategory);
+        result.put("category", modelCategory);
+        return result;
     }
 
     public ModelInfo saveModel(ModelInfo modelInfo) {
         return infoRepository.save(modelInfo);
     }
 
+    public Boolean needRefreshResource(String userCode) {
+        UserInfo userInfo = userInfoRepository.findByUserCode(userCode);
+        return userInfo.getRefreshResource() != null && userInfo.getRefreshResource();
+    }
 }