fix: ue设置，贴图功能

src/main/java/com/lqkj/link/module/authority/controller/UserInfoController.java

@@ -217,4 +217,22 @@ public class UserInfoController {
         userInfoService.register(userInfo, false, userCode);
         return MessageBean.ok(null, "保存用户接口");
     }
+
+
+    /**
+     * 保存用户ue设置
+     * @param autosaveTime
+     * @param movingSpeed
+     * @param request
+     * @return
+     */
+    @PostMapping("/saveSettings")
+    public MessageBean<String> saveSettings(@RequestParam Integer autosaveTime,
+                                            @RequestParam Integer movingSpeed,
+                                            HttpServletRequest request) {
+        String authHeader = request.getHeader("Authorization");
+        String userCode = jwtService.decryptUsernameWithHeader(authHeader);
+        userInfoService.saveSettings(autosaveTime, movingSpeed, userCode);
+        return MessageBean.ok(null, "保存用户设置");
+    }
 }

src/main/java/com/lqkj/link/module/authority/domain/UserInfo.java

@@ -81,6 +81,14 @@ public class UserInfo implements UserDetails {
     @Column(name = "refresh_resource")
     private Boolean refreshResource;
 
+    @Column(name = "autosave_time")
+    @Schema(description = "自动保存时间")
+    private Integer autosaveTime;
+
+    @Column(name = "moving_speed")
+    @Schema(description = "移动速度")
+    private Integer movingSpeed;
+
     @Override
     @JsonIgnore
     public Collection<? extends GrantedAuthority> getAuthorities() {

src/main/java/com/lqkj/link/module/authority/repository/UserInfoRepository.java

@@ -110,4 +110,12 @@ public interface UserInfoRepository extends JpaRepository<UserInfo, Integer> {
             value = "update user_info set refresh_resource = false where user_code = :userCode"
     )
     void resourceRefreshed();
+
+    @Modifying
+    @Query(nativeQuery = true,
+            value = "update user_info set autosave_time = :autosaveTime, moving_speed = :movingSpeed where user_code = :userCode"
+    )
+    void saveSettings(@Param("autosaveTime") Integer autosaveTime,
+                      @Param("movingSpeed") Integer movingSpeed,
+                      @Param("userCode") String userCode);
 }

src/main/java/com/lqkj/link/module/authority/service/UserInfoService.java

@@ -265,4 +265,15 @@ public class UserInfoService {
         }
 
     }
+
+
+    /**
+     * 保存ue设置
+     * @param autosaveTime
+     * @param movingSpeed
+     * @param userCode
+     */
+    public void saveSettings(Integer autosaveTime, Integer movingSpeed, String userCode) {
+        userInfoRepository.saveSettings(autosaveTime, movingSpeed, userCode);
+    }
 }

src/main/java/com/lqkj/link/module/bulletin/service/NoticeInfoService.java

@@ -31,8 +31,16 @@ public class NoticeInfoService {
         List<NoticeInfo> noticeInfos = noticeInfoRepository.queryWithUserCode(userCode);
         noticeInfos.stream().forEach(noticeInfo -> {
             if (noticeInfo.getType() == 4) {
-                ShareInfo shareInfo = shareInfoRepository.findByZoneIdAndSharedUserId(noticeInfo.getZoneId(), noticeInfo.getUserId()).get(0);
-                noticeInfo.setAcceptStatus(Objects.isNull(shareInfo) ? false : shareInfo.getAcceptStatus());
+                if (shareInfoRepository.findByZoneIdAndSharedUserId(noticeInfo.getZoneId(), noticeInfo.getUserId()).size() > 0){
+                    ShareInfo shareInfo = shareInfoRepository.findByZoneIdAndSharedUserId(noticeInfo.getZoneId(), noticeInfo.getUserId()).get(0);
+                    if (Objects.nonNull(shareInfo.getAcceptStatus())){
+                        noticeInfo.setAcceptStatus(shareInfo.getAcceptStatus());
+                    }
+                }
+                else {
+                    noticeInfo.setAcceptStatus(false);
+                }
+
             }
         });
         return noticeInfos;

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

@@ -55,6 +55,12 @@ public class GeomInfo {
     @Transient
     private String modelPath;
 
+    /**
+     * 材质ID
+     */
+    @Column(name = "material_id")
+    private Integer materialId;
+
     public JSONObject getLocation() {
         if (location == null) return trans;
         return location;

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

@@ -53,4 +53,8 @@ public class MaterialInfo {
     @Schema(description = "更新时间")
     private Date updateTime;
 
+    @Column(name = "user_id")
+    @Schema(description = "用户id")
+    private Integer userId;
+
 }

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

@@ -30,7 +30,7 @@ public interface ShareInfoRepository extends JpaRepository<ShareInfo, Integer> {
      * @return
      */
     @Query(nativeQuery = true,
-            value = "SELECT * FROM share_info WHERE zone_id = ?1"
+            value = "SELECT * FROM share_info WHERE zone_id = ?1 and ( accept_status ISNULL OR accept_status = TRUE ) "
     )
     List<ShareInfo> findByZoneId(Integer zoneId);
 

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

@@ -343,11 +343,12 @@ public class ZoneInfoService {
      */
     private void notifySharer(Integer zoneId) {
         List<NoticeInfo>  noticeInfos = new ArrayList<>();
+        ZoneInfo zoneInfo = zoneInfoRepository.findById(zoneId).get();
         shareInfoRepository.findByZoneId(zoneId).forEach(shareInfo -> {
             NoticeInfo noticeInfo = new NoticeInfo();
             noticeInfo.setUserId(shareInfo.getSharedUserId());
             noticeInfo.setType(6);
-            noticeInfo.setContent("经决定对团队进行调整。很遗憾地通知您，您将不再作为该项目的协作者。我们感谢您到目前为止的贡献。");
+            noticeInfo.setContent("经决定对" + zoneInfo.getZoneName() + "团队进行调整。很遗憾地通知您，您将不再作为该项目的协作者。我们感谢您到目前为止的贡献。");
             noticeInfo.setHasView(false);
             noticeInfo.setCreateTime(new Date());
             noticeInfo.setZoneId(zoneId);

src/main/java/com/lqkj/link/module/zone/service/impl/MaterialInfoServiceImpl.java

@@ -92,7 +92,7 @@ public class MaterialInfoServiceImpl implements MaterialInfoService {
                         }
                         if (!materialMap.containsKey(modelFileName.substring(0, modelFileName.lastIndexOf(".")))) {
                             materialInfoList.add(new MaterialInfo(null, modelFileName.substring(0, modelFileName.lastIndexOf(".")), modelPath.substring(1),
-                                    modelPath.replace("model", "icon").replace("json", "png").substring(1), modelFileName, 1, new Date()));
+                                    modelPath.replace("model", "icon").replace("json", "png").substring(1), modelFileName, 1, new Date(), null));
                         } else {
                             MaterialInfo materialInfo = materialMap.get(modelFileName.substring(0, modelFileName.lastIndexOf(".")));
                             materialInfo.setMaterialIcon(modelPath.replace("model", "icon").replace("json", "png").substring(1));

src/main/resources/db/migration/V6__2.0.3.sql

@@ -0,0 +1,7 @@
+ALTER TABLE share_info ADD COLUMN accept_status BOOL;
+comment on column share_info.accept_status is
+'接受状态: accept_status';
+
+ALTER TABLE material_info ADD COLUMN material_type INT4;
+comment on column material_info.material_type is
+'材质类型: 1：材质， 2：贴图';

src/main/resources/db/migration/V7__2.0.4.sql

@@ -0,0 +1,16 @@
+
+ALTER TABLE material_info ADD COLUMN user_id INT4;
+comment on column material_info.user_id is
+'用户id: user_id';
+
+ALTER TABLE geom_info ADD COLUMN material_id INT4;
+comment on column material_info.material_id is
+'材质id: material_id';
+
+ALTER TABLE user_info ADD COLUMN autosave_time INT4 default 30;
+comment on column user_info.autosave_time is
+'自动保存时间: autosave_time';
+
+ALTER TABLE user_info ADD COLUMN moving_speed INT4 default 5000;
+comment on column user_info.moving_speed is
+'移动速度: moving_speed';