fix: 材质管理，资源管理功能优化

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

@@ -57,9 +57,10 @@ public class MaterialInfoController {
      */
     @PostMapping("/pageQuery")
     public MessageBean<Page<MaterialInfo>> pageQueryTemplate(@RequestParam(required = false, defaultValue = "") String name,
-                                                      @RequestParam(required = false, defaultValue = "0") Integer page,
-                                                      @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
-        return MessageBean.ok(materialInfoService.pageQuery(name, page, pageSize), "材质分页接口");
+                                                             @RequestParam(required = false, defaultValue = "0") Integer page,
+                                                             @RequestParam(required = false) Integer materialType,
+                                                             @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
+        return MessageBean.ok(materialInfoService.pageQuery(name, page, pageSize, materialType), "材质分页接口");
 
     }
 

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

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

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

@@ -44,6 +44,10 @@ public class MaterialInfo {
     @Schema(description = "材质图标")
     private String compressFileName;
 
+    @Column(name = "material_type")
+    @Schema(description = "材质类型： 1：材质， 2：贴图")
+    private Integer materialType;
+
     @Column(name = "update_time")
     @JsonFormat(pattern = "YYYY-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @Schema(description = "更新时间")

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

@@ -40,7 +40,9 @@ 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 " +
                     "order by update_time"
     )
-    Page<MaterialInfo> pageQuery(@Param("materialName")String materialName, Pageable pageable);
+    Page<MaterialInfo> pageQuery(@Param("materialName") String materialName,
+                                 @Param("materialType") Integer materialType,Pageable pageable);
 }

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

@@ -21,9 +21,15 @@ 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 mc.user_id is null or ui.user_code = :userCode order by mi.order_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"
     )
-    List<ModelInfo> listWitUserCode(@Param("userCode") String userCode);
+    List<ModelInfo> listWitUserCode(@Param("userCode") String userCode,
+                                    @Param("categoryId") Integer categoryId,
+                                    @Param("modelName") String modelName);
 
     @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/service/MaterialInfoService.java

@@ -30,7 +30,7 @@ public interface MaterialInfoService {
      * @param pageSize
      * @return
      */
-    Page<MaterialInfo> pageQuery(String name, Integer page, Integer pageSize);
+    Page<MaterialInfo> pageQuery(String name, Integer page, Integer pageSize, Integer materialType);
 
 
     /**

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

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

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

@@ -54,9 +54,9 @@ public class MaterialInfoServiceImpl implements MaterialInfoService {
 
 
     @Override
-    public Page<MaterialInfo> pageQuery(String name, Integer page, Integer pageSize) {
+    public Page<MaterialInfo> pageQuery(String name, Integer page, Integer pageSize, Integer materialType) {
         Pageable pageable = PageRequest.of(page, pageSize);
-        return materialInfoRepository.pageQuery(name, pageable);
+        return materialInfoRepository.pageQuery(name, materialType, pageable);
     }
 
     @Transactional
@@ -96,7 +96,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, new Date()));
+                                    modelPath.replace("model", "icon").replace("json", "png").substring(1), modelFileName, 1, new Date()));
                         } else {
                             MaterialInfo materialInfo = materialMap.get(modelFileName.substring(0, modelFileName.lastIndexOf(".")));
                             materialInfo.setMaterialIcon(modelPath.replace("model", "icon").replace("json", "png").substring(1));