对象信息管理-新增贴图和颜色

src/main/java/com/lqkj/link/GlobalExceptionHandler.java

@@ -15,7 +15,7 @@ public class GlobalExceptionHandler {
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
-    @ExceptionHandler
+    @ExceptionHandler(Exception.class)
     @ResponseBody
     public MessageBean<String> resolveException(Exception e) {
         logger.error("收到异常", e);

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

@@ -301,6 +301,7 @@ public class UserInfoService {
      * @param movingSpeed
      * @param userCode
      */
+    @Transactional
     public void saveSettings(Integer autosaveTime, Integer movingSpeed, String userCode) {
         userInfoRepository.saveSettings(autosaveTime, movingSpeed, userCode);
     }

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

@@ -184,12 +184,10 @@ public class ResourceController {
             description = "5.1.2.20 模型列表接口"
     )
     @PostMapping("/" + VERSION_V1 + "/models")
-    public List<ModelInfo> models(@RequestParam(required = false) Integer categoryId,
-                                  @RequestParam(required = false, defaultValue = "") String modelName,
-                                  HttpServletRequest request) {
+    public List<ModelInfo> models(HttpServletRequest request) {
         String authHeader = request.getHeader("Authorization");
         String userCode = jwtService.decryptUsernameWithHeader(authHeader);
-        return resourceService.models(userCode, categoryId, modelName);
+        return resourceService.models(userCode);
     }
 
     @Operation(

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

@@ -0,0 +1,59 @@
+package com.lqkj.link.module.zone.controller;
+
+import com.lqkj.link.message.MessageBean;
+import com.lqkj.link.module.zone.domain.TextureInfo;
+import com.lqkj.link.module.zone.service.TextureInfoService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/texture")
+@Tag(name = "贴图管理", description = "贴图管理")
+public class TextureInfoController {
+
+    @Autowired
+    private TextureInfoService textureInfoService;
+
+
+    /**
+     * 保存贴图
+     * @param textureInfo
+     * @return
+     */
+    @PostMapping("/save")
+    public MessageBean save(@RequestBody TextureInfo textureInfo) {
+        textureInfoService.sava(textureInfo);
+        return MessageBean.ok(null, "保存贴图成功");
+    }
+
+    /**
+     * 批量删除贴图
+     * @param materialIds
+     * @return
+     */
+
+    @PostMapping("/batchDelete")
+    public MessageBean batchDelete(@RequestParam List<Integer> materialIds){
+        textureInfoService.batchDelete(materialIds);
+        return MessageBean.ok(null, "删除贴图成功");
+    }
+
+
+    /**
+     * 获取全部贴图
+     * @param name
+     * @return
+     */
+    @PostMapping("/getAll")
+    public MessageBean<List<TextureInfo>> getAll(@RequestParam(required = false, defaultValue = "") String name,
+                                                 @RequestParam(required = false) Integer userId) {
+        return MessageBean.ok(textureInfoService.getAll(name, userId), "贴图分页接口");
+
+    }
+
+
+
+}

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

@@ -77,6 +77,20 @@ public class GeomInfo {
     @Column(name = "material_id")
     private Integer materialId;
 
+    /**
+     * 贴图ID
+     * @return
+     */
+    @Column(name = "texture_id")
+    private Integer textureId;
+
+    /**
+     * 颜色
+     * @return
+     */
+    @Column(name = "color")
+    private String color;
+
     public JSONObject getLocation() {
         if (location == null) return trans;
         return location;

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

@@ -40,7 +40,7 @@ public class MaterialInfo {
     @Schema(description = "材质图标")
     private String materialIcon;
 
-    @Column(name = "json_file_name")
+    @Transient
     @Schema(description = "json文件名")
     private String compressFileName;
 

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

@@ -0,0 +1,38 @@
+package com.lqkj.link.module.zone.domain;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Table(name = "texture_info")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class TextureInfo {
+
+
+    @Id
+    @Column(name = "texture_id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Schema(description = "贴图ID")
+    private Integer textureId;
+
+    @Column(name = "texture_name")
+    @Schema(description = "贴图名称")
+    private String textureName;
+
+    @Column(name = "texture_path")
+    @Schema(description = "文件路径")
+    private String texturePath;
+
+    @Column(name = "user_id")
+    @Schema(description = "用户id")
+    private Integer userId;
+
+}

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

@@ -40,7 +40,7 @@ public interface MaterialInfoRepository extends JpaRepository<MaterialInfo, Inte
     @Query(nativeQuery = true,
             value = "select * from material_info where " +
                     "(:materialName = '' or material_name like concat('%', :materialName, '%')) " +
-                    "and material_type = :materialType " +
+                    "and (:materialType is null or material_type = :materialType) " +
                     "and (:userId is null or user_id = :userId) " +
                     "order by update_time"
     )

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

@@ -21,15 +21,9 @@ public interface ModelInfoRepository extends JpaRepository<ModelInfo, Integer> {
         value = "select mi.* from model_info mi " +
                 "left join model_category mc on mi.category_id = mc.category_id " +
                 "left join user_info ui on mc.user_id = ui.user_id " +
-                "where " +
-                "(:modelName = '' or mi.model_name like concat('%', :modelName, '%')) " +
-                "and (:categoryId = 0 or mi.category_id = :categoryId) " +
-                "and mc.user_id is null or ui.user_code = :userCode " +
-                "order by mi.order_id"
+                "where mc.user_id is null or ui.user_code = :userCode order by mi.order_id"
     )
-    List<ModelInfo> listWitUserCode(@Param("userCode") String userCode,
-                                    @Param("categoryId") Integer categoryId,
-                                    @Param("modelName") String modelName);
+    List<ModelInfo> listWitUserCode(@Param("userCode") String userCode);
 
     @Query("select t from ModelInfo t where t.categoryId = :categoryId")
     List<ModelInfo> listWithCategory(@Param("categoryId") Integer categoryId);

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

@@ -0,0 +1,58 @@
+package com.lqkj.link.module.zone.repository;
+
+import com.lqkj.link.module.zone.domain.TextureInfo;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface TextureInfoRepository extends JpaRepository<TextureInfo, Integer> {
+
+    /**
+     * 判断是否重名
+     * @param textureId
+     * @param textureName
+     * @return
+     */
+    @Query(nativeQuery = true,
+            value = "select count(*) > 0 from texture_info where texture_name = :textureName and texture_id != :textureId"
+    )
+    boolean hasSameNameWithoutOne(@Param("textureId") Integer textureId,
+                                  @Param("textureName")String textureName);
+
+
+    /**
+     * 判断是否重名
+     * @param textureName
+     * @return
+     */
+    @Query(nativeQuery = true,
+            value = "select count(*) > 0 from texture_info where texture_name = :textureName"
+    )
+    boolean hasSameName(@Param("textureName") String textureName);
+
+
+    @Query(nativeQuery = true,
+            value = "select * from texture_info where " +
+                    "(:textureName = '' or texture_name like concat('%', :textureName, '%')) " +
+                    "and texture_type = :textureType " +
+                    "and (:userId is null or user_id = :userId) " +
+                    "order by update_time"
+    )
+    Page<TextureInfo> pageQuery(@Param("textureName") String textureName,
+                                 @Param("textureType") Integer textureType,
+                                 Pageable pageable,
+                                 @Param("userId") Integer userId);
+
+    @Query(nativeQuery = true,
+            value = "select * from texture_info where " +
+                    "(:name = '' or texture_name like concat('%', :name, '%')) " +
+                    "and (:userId is null or user_id = :userId) "
+    )
+    List<TextureInfo> getAll(String name, Integer userId);
+}

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

@@ -149,8 +149,8 @@ public class ResourceService {
         return categoryRepository.queryWithUserCode(userCode);
     }
 
-    public List<ModelInfo> models(String userCode, Integer categoryId, String modelName) {
-        return infoRepository.listWitUserCode(userCode, categoryId, modelName);
+    public List<ModelInfo> models(String userCode) {
+        return infoRepository.listWitUserCode(userCode);
     }
 
     public Map<String, Object> savePersonal(ModelCategory modelCategory, String userCode) {

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

@@ -0,0 +1,30 @@
+package com.lqkj.link.module.zone.service;
+
+import com.lqkj.link.module.zone.domain.TextureInfo;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+
+public interface TextureInfoService {
+
+
+    /**
+     * 保存材质
+     * @param textureInfo
+     * @return
+     */
+    void sava(TextureInfo textureInfo);
+
+    /**
+     * 批量删除材质
+     * @param materialId
+     */
+    void batchDelete(List<Integer> materialId);
+
+    /**
+     * 获取全部贴图
+     * @param name
+     * @return
+     */
+    List<TextureInfo> getAll(String name, Integer userId);
+}

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

@@ -0,0 +1,59 @@
+package com.lqkj.link.module.zone.service.impl;
+
+import cn.hutool.core.util.RandomUtil;
+import com.lqkj.link.module.authority.repository.UserInfoRepository;
+import com.lqkj.link.module.zone.domain.TextureInfo;
+import com.lqkj.link.module.zone.repository.TextureInfoRepository;
+import com.lqkj.link.module.zone.service.TextureInfoService;
+import com.lqkj.link.util.Unzipper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class TextureInfoServiceImpl implements TextureInfoService {
+
+    @Autowired
+    private TextureInfoRepository textureInfoRepository;
+
+    @Autowired
+    private UserInfoRepository userInfoRepository;
+
+    @Transactional
+    @Override
+    public void sava(TextureInfo textureInfo) {
+        if ((Objects.nonNull(textureInfo.getTextureId()) && textureInfoRepository.hasSameNameWithoutOne(textureInfo.getTextureId(), textureInfo.getTextureName()))
+            || (Objects.isNull(textureInfo.getTextureId()) && textureInfoRepository.hasSameName(textureInfo.getTextureName()))) {
+            throw new RuntimeException("贴图名称不能重复!");
+        }
+        textureInfoRepository.save(textureInfo);
+        userInfoRepository.updateRefreshStatus();
+    }
+
+    @Transactional
+    @Override
+    public void batchDelete(List<Integer> textureId) {
+        textureInfoRepository.deleteAllById(textureId);
+        // 更新用户资源刷新状态
+        userInfoRepository.updateRefreshStatus();
+    }
+
+    @Override
+    public List<TextureInfo> getAll(String name, Integer userId) {
+
+        return textureInfoRepository.getAll(name, userId);
+    }
+
+    
+
+
+}

src/main/resources/db/migration/V11__2.0.6.sql

@@ -0,0 +1,29 @@
+
+create table if not exists texture_info
+(
+    texture_id      SERIAL             not null,
+    texture_name    VARCHAR(255)       null,
+    texture_path    VARCHAR(255)       null,
+    user_id         int                null,
+    constraint PK_TEXTURE_INFO primary key (texture_id)
+);
+comment on table texture_info is
+'贴图信息表';
+comment on column texture_info.texture_id is
+'贴图id';
+comment on column texture_info.texture_name is
+'贴图名称';
+comment on column texture_info.texture_path is
+'贴图路径';
+comment on column texture_info.user_id is
+'用户id';
+
+ALTER TABLE geom_info
+    add COLUMN if not exists texture_id int;
+comment on column geom_info.texture_id is '贴图id';
+
+ALTER TABLE geom_info
+    add COLUMN if not exists color VARCHAR(255);
+comment on column geom_info.color is '颜色';
+
+