bug fixed

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/FileUploadController.java

@@ -99,7 +99,7 @@ public class FileUploadController extends BaseController {
                 handleResult.setFileName("");
                 handleResult.setFileUrl("");
                 handleResult.setHandleResult(HANDLE_STATUS_ENUM.FAILURE.getName());
-                handleResult.setDescription("文件大小为0");
+                handleResult.setDescription("文件" + originalFilename + "大小为0");
                 failureCount++;
                 handleList.add(handleResult);
                 continue;
@@ -190,6 +190,10 @@ public class FileUploadController extends BaseController {
         batchUploadResVO.setTotal(files.length);
         batchUploadResVO.setHandleList(handleList);
         batchUploadResVO.setFileList(datumUrlList);
+
+        if (failureCount > 0) {
+            return getFailResult(batchUploadResVO);
+        }
         return getResult(batchUploadResVO);
     }
 
@@ -284,7 +288,7 @@ public class FileUploadController extends BaseController {
                 handleResult.setFileName("");
                 handleResult.setFileUrl("");
                 handleResult.setHandleResult(HANDLE_STATUS_ENUM.FAILURE.getName());
-                handleResult.setDescription("文件大小为0");
+                handleResult.setDescription("文件" + originalFilename + "大小为0");
                 failureCount++;
                 handleList.add(handleResult);
                 continue;
@@ -396,7 +400,7 @@ public class FileUploadController extends BaseController {
                 handleResult.setFileName("");
                 handleResult.setFileUrl("");
                 handleResult.setHandleResult(HANDLE_STATUS_ENUM.FAILURE.getName());
-                handleResult.setDescription("文件大小为0");
+                handleResult.setDescription("文件" + originalFilename + "大小为0");
                 failureCount++;
                 handleList.add(handleResult);
                 continue;
@@ -506,7 +510,7 @@ public class FileUploadController extends BaseController {
                 handleResult.setFileName("");
                 handleResult.setFileUrl("");
                 handleResult.setHandleResult(HANDLE_STATUS_ENUM.FAILURE.getName());
-                handleResult.setDescription("文件大小为0");
+                handleResult.setDescription("文件" + originalFilename + "大小为0");
                 failureCount++;
                 handleList.add(handleResult);
                 continue;

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LoginController.java

@@ -169,7 +169,7 @@ public class LoginController extends BaseController {
                         }
                     }
                     resultMap.put("resultCode", "500");
-                    resultMap.put("message", "密码不正确,您还有" + (i - Integer.valueOf(s)) + "次机会！");
+                    resultMap.put("message", "密码不正确,您还有" + (i - Integer.parseInt(s)) + "次机会！");
                     return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
                 }
                 List<Role> roles = roleService.selectRoleByUserId(user.getId());
@@ -177,7 +177,7 @@ public class LoginController extends BaseController {
                 //获取当前用户角色拥有菜单
                 List<Menu> userMenuPerms = new ArrayList<>();
                 if (roles != null && roles.get(0) != null) {
-                    roles.stream().forEach(r -> list1.add(r.getId()));
+                    roles.forEach(r -> list1.add(r.getId()));
                     user.setRoleList(list1);
                     userMenuPerms = this.menuService.getUserMenuPerms(list1);
                 }
@@ -191,7 +191,7 @@ public class LoginController extends BaseController {
 
                 String token = JwtTokenUtil.sign(username, user.getId());
                 // 将token信息存入Redis
-                stringRedisTemplate.opsForValue().set(SHIRO_JWT_TOKEN + token, user.getId(), 240, TimeUnit.MINUTES);
+                stringRedisTemplate.opsForValue().set(SHIRO_JWT_TOKEN + token, user.getId(), 12, TimeUnit.HOURS);
 
                 resultMap.put("user", user);
                 resultMap.put("token", token);

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/base/BaseController.java

@@ -117,11 +117,25 @@ public class BaseController implements Serializable {
      */
     protected Map<String, Object> getFailResult() {
         Map<String, Object> map = new LinkedHashMap<>();
-        map.put(RESULT_INFO_ENUM.RESULT_CODE.getKey(), RESPONSE_CODE_ENUM.SERVER_ERROR.getResultCode());
+        map.put(RESULT_INFO_ENUM.RESULT_CODE.getKey(), "400");
         map.put(RESULT_INFO_ENUM.RESULT_MSG.getKey(), RESPONSE_CODE_ENUM.SERVER_ERROR.getMessage());
         return map;
     }
 
+    /**
+     * 添加数据到结果对象中
+     *
+     * @param obj 封装接口集合参数
+     * @return map
+     */
+    protected Map<String, Object> getFailResult(Object obj) {
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put(RESULT_INFO_ENUM.RESULT_CODE.getKey(), "400");
+        map.put(RESULT_INFO_ENUM.RESULT_MSG.getKey(), "操作失败");
+        map.put(RESULT_INFO_ENUM.RESULT_BODY.getKey(), obj);
+        return map;
+    }
+
     /**
      * 返回失败
      *