manage : fix 素材库

virtual-patient-manage/src/main/java/com/supervision/manage/controller/file/MaterialLibraryManageController.java

@@ -32,24 +32,25 @@ public class MaterialLibraryManageController {
     @GetMapping("queryMedicalRecPage")
     public IPage<MaterialLibrary> queryMaterialPage(@ApiParam("素材类型 0:图片 1:视频 2:音频") @RequestParam("materialType") String materialType,
                                                     @ApiParam("素材名，长度小于64") @RequestParam("materialName") String materialName,
+                                                    @ApiParam("目录id") @RequestParam("directoryId") String directoryId,
                                                     @ApiParam("页码") @RequestParam(name="pageNum",defaultValue = "1") Integer pageNum,
                                                     @ApiParam("每页大小") @RequestParam(name="pageSize",defaultValue = "10")Integer pageSize) {
 
-        return materialLibraryManageService.queryMaterialPage(materialType, materialName, pageNum, pageSize);
+        return materialLibraryManageService.queryMaterialPage(materialType, materialName, directoryId,pageNum, pageSize);
     }
 
 
 
-    @ApiOperation("删除文件目录")
-    @DeleteMapping("/deleteDirectory")
+    @ApiOperation("删除素材")
+    @DeleteMapping("/deleteMaterial")
     public boolean deleteMaterial(@ApiParam("素材id") @RequestParam("id") String id) throws Exception {
 
         return materialLibraryManageService.deleteMaterial(id);
 
     }
 
-    @ApiOperation("修改文件目录")
-    @PutMapping("/updateDirectory")
+    @ApiOperation("修改素材")
+    @PutMapping("/updateMaterial")
     public boolean updateMaterial(@RequestBody MaterialLibrary materialLibrary) {
 
         return materialLibraryManageService.updateMaterial(materialLibrary);

virtual-patient-manage/src/main/java/com/supervision/manage/service/MaterialLibraryManageService.java

@@ -16,7 +16,7 @@ public interface MaterialLibraryManageService {
      */
     String uploadMaterial(MultipartFile multipartFile, String materialName, String materialType) throws Exception;
 
-    IPage<MaterialLibrary> queryMaterialPage(String materialType, String materialName, Integer pageNum, Integer pageSize);
+    IPage<MaterialLibrary> queryMaterialPage(String materialType, String materialName, String directoryId,Integer pageNum, Integer pageSize);
 
     boolean deleteMaterial(String id) throws Exception;
 

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MaterialLibraryManageServiceImpl.java

@@ -54,10 +54,12 @@ public class MaterialLibraryManageServiceImpl implements MaterialLibraryManageSe
     }
 
     @Override
-    public IPage<MaterialLibrary> queryMaterialPage(String materialType, String materialName, Integer pageNum, Integer pageSize) {
+    public IPage<MaterialLibrary> queryMaterialPage(String materialType, String materialName, String directoryId,
+                                                    Integer pageNum, Integer pageSize) {
 
         AbstractWrapper wrapper = materialLibraryService.lambdaQuery()
                 .eq(StrUtil.isNotEmpty(materialType), MaterialLibrary::getMaterialType, materialType)
+                .eq(StrUtil.isNotEmpty(directoryId), MaterialLibrary::getDirectoryId, directoryId)
                 .like(StrUtil.isNotEmpty(materialName), MaterialLibrary::getMaterialName, materialName).getWrapper();
 
         return materialLibraryService.page(new Page<>(pageNum, pageSize),wrapper);