常规更新

museum_web/src/main/java/com/museum/web/controller/BaseController.java

@@ -11,6 +11,7 @@ import com.museum.service.LogService;
 import com.museum.service.TypeService;
 import com.museum.web.shiro.JwtUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 
@@ -106,17 +107,20 @@ public class BaseController {
     // 删除文件
     void removeFile(String ids) throws IOException {
         // 删除oss物理文件
-        List<FileEntity> files = fileService.findByIds(ids);
-        for (FileEntity entity: files) {
-            String filePath = entity.getFilePath();
-            filePath = filePath.replace(OSS_DOMAIN, "");
-            log.info("remove oss file: {}", filePath);
-            // 删除只要域名后面的路径就可以了
-            AliyunOssUtil.delete(filePath);
+        if (StringUtils.isNotBlank(ids)) {
+            List<FileEntity> files = fileService.findByIds(ids);
+            for (FileEntity entity: files) {
+                String filePath = entity.getFilePath();
+                filePath = filePath.replace(OSS_DOMAIN, "");
+                log.info("remove oss file: {}", filePath);
+                // 删除只要域名后面的路径就可以了
+                AliyunOssUtil.delete(filePath);
+            }
+
+            // 删除db记录
+            fileService.deleteByIds(ids);
         }
 
-        // 删除db记录
-        fileService.deleteByIds(ids);
     }
 
 

museum_web/src/main/java/com/museum/web/controller/BuildingController.java

@@ -53,8 +53,9 @@ public class BuildingController extends BaseController {
 
         if (entityList.size() > 0) {
             for (BuildingResponse entity : entityList) {
-                if (entity.getFileIds() != null) {
-                    List<FileEntity> files = fileService.findByIds(entity.getFileIds());
+                String fileIds = entity.getFileIds();
+                if (StringUtils.isNotBlank(fileIds)) {
+                    List<FileEntity> files = fileService.findByIds(fileIds);
                     entity.setFiles(files);
                 }
             }
@@ -105,8 +106,9 @@ public class BuildingController extends BaseController {
 
         // 查找文件
         List<FileEntity> files = new ArrayList<>();
-        if (entity.getFileIds() != null) {
-            files = fileService.findByIds(entity.getFileIds());
+        String fileIds = entity.getFileIds();
+        if (StringUtils.isNotBlank(fileIds)) {
+            files = fileService.findByIds(fileIds);
         }
 
         HashMap<String, Object> resultMap = new HashMap<>();

museum_web/src/main/java/com/museum/web/controller/DownloadController.java

@@ -17,6 +17,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.BeanUtils;
@@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Condition;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -94,14 +96,13 @@ public class DownloadController extends BaseController {
     @ApiOperation("详情")
     @GetMapping("detail/{id}")
     public Result detail(@PathVariable Long id) {
-//        DownloadEntity entity = downloadService.findById(id);
         DownloadResponse entity = downloadService.rFindById(id);
         if (entity == null) {
             log.error("对象不存在： {}", id);
             return Result.failure("对象不存在");
         }
-//        List<FileEntity> files = fileService.findByIds(entity.getFileIds());
-        List<FileEntity> files = fileService.findByIds(entity.getFileIds());
+        String fileIds = entity.getFileIds();
+        List<FileEntity> files  = StringUtils.isNotBlank(fileIds) ? fileService.findByIds(fileIds) : new ArrayList<>();
         HashMap<Object, Object> map = new HashMap<>();
         map.put("obj", entity);
         map.put("file", files);

museum_web/src/main/java/com/museum/web/controller/PartController.java

@@ -19,6 +19,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
+import org.junit.Test;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -148,4 +149,11 @@ public class PartController extends BaseController {
     }
 
 
+    @Test
+    public void test(){
+        String a = "1";
+        System.out.println(StringUtils.isNotBlank(a));
+    }
+
+
 }