调整贴图和材质

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

@@ -77,4 +77,14 @@ public class MaterialInfoController {
         return MessageBean.ok(null, "批量添加材质成功");
     }
 
+
+    /**
+     * 获取所有材质
+     * @return
+     */
+    @GetMapping("/getAll")
+    public List<MaterialInfo> getAll(){
+        return materialInfoService.getAll();
+    }
+
 }

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

@@ -48,9 +48,8 @@ public class TextureInfoController {
      * @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), "贴图分页接口");
+    public List<TextureInfo> getAll(@RequestParam(required = false, defaultValue = "") String name, @RequestParam Integer userId) {
+        return textureInfoService.getAll(name, userId);
 
     }
 

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

@@ -57,4 +57,11 @@ public class MaterialInfo {
     @Schema(description = "用户id")
     private Integer userId;
 
+    @Transient
+    private String name;
+
+    public String getName() {
+        return materialId.toString();
+    }
+
 }

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

@@ -35,4 +35,11 @@ public class TextureInfo {
     @Schema(description = "用户id")
     private Integer userId;
 
+    @Transient
+    private String name;
+
+    public String getName() {
+        return textureId.toString();
+    }
+
 }

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

@@ -52,7 +52,7 @@ public interface TextureInfoRepository extends JpaRepository<TextureInfo, Intege
     @Query(nativeQuery = true,
             value = "select * from texture_info where " +
                     "(:name = '' or texture_name like concat('%', :name, '%')) " +
-                    "and (:userId is null or user_id = :userId) "
+                    "and user_id = :userId "
     )
     List<TextureInfo> getAll(String name, Integer userId);
 }

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

@@ -38,4 +38,7 @@ public interface MaterialInfoService {
      * @param compressFilePath
      */
     void batchAdd(String compressFilePath);
+
+    List<MaterialInfo> getAll();
+
 }

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(), null));
+                                    modelPath.replace("model", "icon").replace("json", "png").substring(1), modelFileName, 1, new Date(), null, null));
                         } else {
                             MaterialInfo materialInfo = materialMap.get(modelFileName.substring(0, modelFileName.lastIndexOf(".")));
                             materialInfo.setMaterialIcon(modelPath.replace("model", "icon").replace("json", "png").substring(1));
@@ -111,5 +111,11 @@ public class MaterialInfoServiceImpl implements MaterialInfoService {
         }
     }
 
+    @Override
+    public List<MaterialInfo> getAll() {
+
+        return materialInfoRepository.findAll();
+    }
+
 
 }