v1.0.7 优化权限的单词命名，以及中文命名

smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/ValidateList.java

@@ -0,0 +1,148 @@
+package com.gangquan360.smartadmin.common.domain;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+import java.util.*;
+
+/**
+ * @author: zhuoda
+ * @create: 2020-02-03 17:37 PM from win10
+ */
+public class ValidateList<E> implements List<E> {
+
+    @Valid
+    @NotEmpty(message = "数据长度请大于0！")
+    private List<E> list;
+
+    public ValidateList() {
+        this.list = new ArrayList<>();
+    }
+
+    public ValidateList(List<E> list) {
+        this.list = list;
+    }
+
+    public List<E> getList() {
+        return list;
+    }
+
+    public void setList(List<E> list) {
+        this.list = list;
+    }
+
+    @Override
+    public int size() {
+        return list.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return list.isEmpty();
+    }
+
+    @Override
+    public boolean contains(Object o) {
+        return list.contains(o);
+    }
+
+    @Override
+    public Iterator<E> iterator() {
+        return list.iterator();
+    }
+
+    @Override
+    public Object[] toArray() {
+        return list.toArray();
+    }
+
+    @Override
+    public <T> T[] toArray(T[] a) {
+        return list.toArray(a);
+    }
+
+    @Override
+    public boolean add(E e) {
+        return list.add(e);
+    }
+
+    @Override
+    public boolean remove(Object o) {
+        return list.remove(o);
+    }
+
+    @Override
+    public boolean containsAll(Collection<?> c) {
+        return list.containsAll(c);
+    }
+
+    @Override
+    public boolean addAll(Collection<? extends E> c) {
+        return list.addAll(c);
+    }
+
+    @Override
+    public boolean addAll(int index, Collection<? extends E> c) {
+        return list.addAll(index, c);
+    }
+
+    @Override
+    public boolean removeAll(Collection<?> c) {
+        return list.removeAll(c);
+    }
+
+    @Override
+    public boolean retainAll(Collection<?> c) {
+        return list.retainAll(c);
+    }
+
+    @Override
+    public void clear() {
+        list.clear();
+    }
+
+    @Override
+    public E get(int index) {
+        return list.get(index);
+    }
+
+    @Override
+    public E set(int index, E element) {
+        return list.set(index, element);
+    }
+
+    @Override
+    public void add(int index, E element) {
+        list.add(index, element);
+    }
+
+    @Override
+    public E remove(int index) {
+        return list.remove(index);
+    }
+
+    @Override
+    public int indexOf(Object o) {
+        return list.indexOf(o);
+    }
+
+    @Override
+    public int lastIndexOf(Object o) {
+        return list.lastIndexOf(o);
+    }
+
+    @Override
+    public ListIterator<E> listIterator() {
+        return list.listIterator();
+    }
+
+    @Override
+    public ListIterator<E> listIterator(int index) {
+        return list.listIterator(index);
+    }
+
+    @Override
+    public List<E> subList(int fromIndex, int toIndex) {
+        return list.subList(fromIndex, toIndex);
+    }
+
+}

smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeController.java

@@ -78,6 +78,7 @@ public class EmployeeController {
     public ResponseDTO<String> updatePwd(@Valid @RequestBody EmployeeUpdatePwdDTO updatePwdDTO) {
         RequestTokenBO requestToken = SmartRequestTokenUtil.getRequestUser();
         return employeeService.updatePwd(updatePwdDTO, requestToken);
+//        return ResponseDTO.succ();
     }
 
     @ApiOperation(value = "通过部门id获取当前部门的人员&没有部门的人", notes = "@author yandanyang")

smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginService.java

@@ -195,6 +195,7 @@ public class LoginService {
     public LoginDetailVO getSession(RequestTokenBO requestUser) {
         LoginDetailVO loginDTO = SmartBeanUtil.copy(requestUser.getEmployeeBO(), LoginDetailVO.class);
         List<PrivilegeEntity> privilegeEntityList = privilegeEmployeeService.getEmployeeAllPrivilege(requestUser.getRequestUserId());
+        //======  开启缓存   ======
         if (privilegeEntityList == null) {
             List<LoginPrivilegeDTO> loginPrivilegeDTOS = initEmployeePrivilege(requestUser.getRequestUserId());
             loginDTO.setPrivilegeList(loginPrivilegeDTOS);
@@ -202,6 +203,10 @@ public class LoginService {
             loginDTO.setPrivilegeList(SmartBeanUtil.copyList(privilegeEntityList, LoginPrivilegeDTO.class));
         }
 
+        //======  不开启缓存   ======
+//        List<LoginPrivilegeDTO> loginPrivilegeDTOS = initEmployeePrivilege(requestUser.getRequestUserId());
+//        loginDTO.setPrivilegeList(loginPrivilegeDTOS);
+
         //判断是否为超管
         Boolean isSuperman = privilegeEmployeeService.isSuperman(loginDTO.getId());
         loginDTO.setIsSuperMan(isSuperman);

smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/controller/PrivilegeController.java

@@ -2,6 +2,7 @@ package com.gangquan360.smartadmin.module.privilege.controller;
 
 import com.gangquan360.smartadmin.common.anno.OperateLog;
 import com.gangquan360.smartadmin.common.domain.ResponseDTO;
+import com.gangquan360.smartadmin.common.domain.ValidateList;
 import com.gangquan360.smartadmin.constant.SwaggerTagConst;
 import com.gangquan360.smartadmin.module.privilege.domain.dto.*;
 import com.gangquan360.smartadmin.module.privilege.service.PrivilegeService;
@@ -39,11 +40,12 @@ public class PrivilegeController {
 
     @ApiOperation(value = "菜单批量保存")
     @PostMapping("/privilege/menu/batchSaveMenu")
-    public ResponseDTO<String> menuBatchSave(@Valid @RequestBody List<PrivilegeMenuDTO> menuList) {
+    public ResponseDTO<String> menuBatchSave(@Valid @RequestBody ValidateList<PrivilegeMenuDTO> menuList) {
         return privilegeService.menuBatchSave(menuList);
 //        return ResponseDTO.succ();
     }
 
+
     @ApiOperation(value = "查询所有菜单项")
     @PostMapping("/privilege/menu/queryAll")
     public ResponseDTO<List<PrivilegeMenuVO>> queryAll() {