fix 注销用户不能启用

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

@@ -141,17 +141,23 @@ public class DownloadController extends BaseController {
     }
 
 
-
+    /**
+     * 根据file表id下载，支持多个同时下载
+     * @param ids
+     * @return
+     * @throws IOException
+     */
     @ApiOperation("下载")
-    @GetMapping("download/{id}")
-    public Result download(@PathVariable Long id) throws IOException {
-        DownloadResponse entity = downloadService.rFindById(id);
-        if (entity == null) {
-            log.error("对象不存在： {}", id);
-            return Result.failure("对象不存在");
+    @GetMapping("download/{ids}")
+    public Result download(@PathVariable String ids) throws IOException {
+
+        if (StringUtils.isBlank(ids)) {
+            log.error("对象id不能为空");
+            Result.failure("对象id不能为空");
         }
-        String fileIds = entity.getFileIds();
-        List<FileEntity> files  = StringUtils.isNotBlank(fileIds) ? fileService.findByIds(fileIds) : new ArrayList<>();
+
+        List<FileEntity> files = fileService.findByIds(ids);
+        log.info("file size: {}" , files.size());
 
         // 1.将oss资源下载到服务器
         String time = DateUtil.format(new Date(), "yyyyMMdd_HHmmssSSS");

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

@@ -29,6 +29,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -115,6 +116,12 @@ public class IndexController extends BaseController {
     }
 
 
+    @GetMapping("test")
+    public String test(){
+        return LocalDateTime.now().toString();
+    }
+
+
 
 
 }

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

@@ -59,7 +59,6 @@ public class PartController extends BaseController {
 
     @WebControllerLog(description = "部件管理-新增/修改")
     @ApiOperation("新增/修改")
-//    @PostMapping(value = "save", consumes = {"multipart/form-data"})
     @PostMapping(value = "save")
     public Result save(@Valid @RequestBody PartRequest param) throws IOException {
 

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

@@ -1,22 +0,0 @@
-package com.museum.web.controller;
-
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
-import java.time.LocalDateTime;
-
-/**
- * Created by owen on 2020/5/8 0008 9:54
- */
-@ApiIgnore
-@RestController
-@RequestMapping
-public class TestController {
-
-    @GetMapping
-    public String test(){
-        return LocalDateTime.now().toString();
-    }
-}

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

@@ -137,6 +137,12 @@ public class UserController extends BaseController {
         return Result.success();
     }
 
+    /**
+     * 注销账号不能启用
+     * @param id
+     * @param status
+     * @return
+     */
     @WebControllerLog(description = "用户管理-启用、停用、注销账户")
     @RequiresRoles(value = {"admin"}, logical = Logical.OR)
     @ApiOperation("启用、停用、注销账户")
@@ -149,12 +155,21 @@ public class UserController extends BaseController {
             return Result.failure("用户不存在");
         }
 
+        // 注销账号不能启用
+        if (user.getStatus() == 2) {
+            log.error("注销账号不能启用");
+            Result.failure("注销账号不能启用");
+        }
+
         // 管理员账号不能停用
         if ("admin".equals(user.getRole())) {
             log.error("管理员账户不能停用/注销： {}", id);
             return Result.failure("管理员账户不能停用/注销");
         }
 
+
+
+
         user.setStatus(status);
         user.setUpdateTime(new Date());
         userService.update(user);