1.部门模块

2.角色模块部分

cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/UserDto.java

+package com.mx.cneeds.common.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName UserDto
+ * @Author zzrdark
+ * @Date 2020-03-12 14:56
+ * @Description TODO
+ **/
+@Data
+public class UserDto implements Serializable {
+    /**
+     * 用户id
+     */
+    private Long userId;
+    /**
+     * 用户名
+     */
+    private String username;
+    /**
+     * 密码
+     */
+    private String password;
+    /**
+     * 加密盐
+     */
+    private String salt;
+    /**
+     * 邮箱
+     */
+    private String email;
+    /**
+     * 手机
+     */
+    private String mobile;
+    /**
+     * 账户状态 0：禁用   1：正常
+     */
+    private Integer status;
+    /**
+     * 部门id
+     */
+    private Long deptId;
+}

cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/CascaderVo.java

@@ -2,6 +2,7 @@ package com.mx.cneeds.common.vo;
 
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -11,7 +12,7 @@ import java.util.List;
  * @Description TODO
  **/
 @Data
-public class CascaderVo {
+public class CascaderVo implements Serializable {
     private Long value;
     private String label;
     private Long pid;

cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/TreeVo.java

+package com.mx.cneeds.common.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @ClassName TreeVo
+ * @Author zzrdark
+ * @Date 2020-03-12 18:32
+ * @Description TODO
+ **/
+@Data
+public class TreeVo implements Serializable {
+    private Long id;
+    private String label;
+    private Long pid;
+    private List<TreeVo> children;
+
+    public TreeVo(Long id, String label, Long pid) {
+        this.id = id;
+        this.label = label;
+        this.pid = pid;
+    }
+}

cneeds-common-utils/src/main/java/com/mx/cneeds/common/generate/CascaderToolUtils.java

+package com.mx.cneeds.common.generate;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.mx.cneeds.common.vo.CascaderVo;
+
+import java.util.List;
+import java.util.Map;
+
+public class CascaderToolUtils {
+    /**
+     * 根节点对象存放到这里
+     */
+    private List<CascaderVo> rootList;
+    /**
+     * 其他节点存放到这里，可以包含根节点
+     */
+    private List<CascaderVo> bodyList;
+
+    public CascaderToolUtils(List<CascaderVo> rootList, List<CascaderVo> bodyList) {
+        this.rootList = rootList;
+        this.bodyList = bodyList;
+    }
+ 
+    public List<CascaderVo> getTree(){   //调用的方法入口
+        if(bodyList != null && !bodyList.isEmpty()){
+            //声明一个map，用来过滤已操作过的数据
+            Map<Long,Long> map = Maps.newHashMapWithExpectedSize(bodyList.size());
+            rootList.forEach(beanTree -> getChild(beanTree,map));
+            return rootList;
+        }
+        return null;
+    }
+ 
+    public void getChild(CascaderVo treeDto,Map<Long,Long> map){
+        List<CascaderVo> childList = Lists.newArrayList();
+        bodyList.stream()
+                .filter(c -> !map.containsKey(c.getValue()))
+                .filter(c ->c.getPid().equals(treeDto.getValue()))
+                .forEach(c ->{
+                    map.put(c.getValue(),c.getPid());
+                    getChild(c,map);
+                    childList.add(c);
+                });
+        treeDto.setChildren(childList);
+ 
+    }
+}
\ No newline at end of file

cneeds-common-utils/src/main/java/com/mx/cneeds/common/generate/TreeToolUtils.java

@@ -2,7 +2,7 @@ package com.mx.cneeds.common.generate;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.mx.cneeds.common.vo.CascaderVo;
+import com.mx.cneeds.common.vo.TreeVo;
 
 import java.util.List;
 import java.util.Map;
@@ -11,18 +11,18 @@ public class TreeToolUtils {
     /**
      * 根节点对象存放到这里
      */
-    private List<CascaderVo> rootList;
+    private List<TreeVo> rootList;
     /**
      * 其他节点存放到这里，可以包含根节点
      */
-    private List<CascaderVo> bodyList;
+    private List<TreeVo> bodyList;
  
-    public TreeToolUtils(List<CascaderVo> rootList, List<CascaderVo> bodyList) {
+    public TreeToolUtils(List<TreeVo> rootList, List<TreeVo> bodyList) {
         this.rootList = rootList;
         this.bodyList = bodyList;
     }
  
-    public List<CascaderVo> getTree(){   //调用的方法入口
+    public List<TreeVo> getTree(){   //调用的方法入口
         if(bodyList != null && !bodyList.isEmpty()){
             //声明一个map，用来过滤已操作过的数据
             Map<Long,Long> map = Maps.newHashMapWithExpectedSize(bodyList.size());
@@ -32,13 +32,13 @@ public class TreeToolUtils {
         return null;
     }
  
-    public void getChild(CascaderVo treeDto,Map<Long,Long> map){
-        List<CascaderVo> childList = Lists.newArrayList();
+    public void getChild(TreeVo treeDto, Map<Long,Long> map){
+        List<TreeVo> childList = Lists.newArrayList();
         bodyList.stream()
-                .filter(c -> !map.containsKey(c.getValue()))
-                .filter(c ->c.getPid().equals(treeDto.getValue()))
+                .filter(c -> !map.containsKey(c.getId()))
+                .filter(c ->c.getPid().equals(treeDto.getId()))
                 .forEach(c ->{
-                    map.put(c.getValue(),c.getPid());
+                    map.put(c.getId(),c.getPid());
                     getChild(c,map);
                     childList.add(c);
                 });

cneeds-server-datashow/src/main/java/com/mx/cneeds/common/UserUtils.java

+package com.mx.cneeds.common;
+
+import org.springframework.security.core.context.SecurityContextHolder;
+
+/**
+ * @ClassName UserUtils
+ * @Author zzrdark
+ * @Date 2020-03-12 14:49
+ * @Description TODO
+ **/
+public class UserUtils {
+
+    public static String getUserName(){
+        String username = (String) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        return username;
+    }
+}

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/client/UserClient.java

 package com.mx.cneeds.server.datashow.client;
 
-import com.mx.cneeds.common.dto.DepartmentDto;
-import com.mx.cneeds.common.dto.JwtToken;
-import com.mx.cneeds.common.dto.PageDto;
+import com.mx.cneeds.common.dto.*;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -33,6 +29,8 @@ public interface UserClient {
                      @RequestParam("sidx") String orderField,
                      @RequestParam("order") String order);
 
+    @PostMapping("/sys/func/listAll")
+    List<FuncDto> funcListAll();
     /**
      *
      * @param page
@@ -48,6 +46,22 @@ public interface UserClient {
                      @RequestParam("order") String order);
 
     /**
+     * 获取部门列表
+     * @return
+     */
+    @PostMapping("/sys/dept/listAll")
+    List<DepartmentDto> deptListAll();
+
+    @PostMapping("/sys/dept/save")
+    void addDept(@RequestBody DepartmentDto dto);
+
+    @PostMapping("/sys/dept/update")
+    void updateDept(@RequestBody DepartmentDto dto);
+
+    @PostMapping("/sys/dept/delete")
+    void deleteDept(@RequestBody List<Long> ids);
+
+    /**
      *
      * @param page
      * @param pageSize
@@ -61,6 +75,7 @@ public interface UserClient {
                      @RequestParam("sidx") String orderField,
                      @RequestParam("order") String order);
 
+
     /**
      *
      * @param page
@@ -75,6 +90,7 @@ public interface UserClient {
                      @RequestParam("sidx") String orderField,
                      @RequestParam("order") String order);
 
-    @PostMapping("/sys/dept/listAll")
-    List<DepartmentDto> deptListAll();
+
+    @PostMapping("/sys/user/userinfo")
+    UserDto userInfo(@RequestParam String username);
 }

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/system/SystemController.java

 package com.mx.cneeds.server.datashow.web.system;
 
+import com.mx.cneeds.common.UserUtils;
 import com.mx.cneeds.common.converter.RequestParamterConverter;
 import com.mx.cneeds.common.dto.DepartmentDto;
+import com.mx.cneeds.common.dto.FuncDto;
 import com.mx.cneeds.common.dto.PageDto;
+import com.mx.cneeds.common.dto.UserDto;
+import com.mx.cneeds.common.generate.CascaderToolUtils;
 import com.mx.cneeds.common.generate.TreeToolUtils;
 import com.mx.cneeds.common.result.R;
 import com.mx.cneeds.common.vo.CascaderVo;
 import com.mx.cneeds.common.vo.DepartmentVo;
+import com.mx.cneeds.common.vo.TreeVo;
 import com.mx.cneeds.server.datashow.client.UserClient;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -159,7 +165,10 @@ public class SystemController {
 
     @PostMapping("/dept/add")
     public R addDept(DepartmentVo departmentVo){
+        DepartmentDto departmentDto = new DepartmentDto();
 
+        BeanUtils.copyProperties(departmentVo,departmentDto);
+        userClient.addDept(departmentDto);
         return R.ok();
 
     }
@@ -167,39 +176,87 @@ public class SystemController {
     @PostMapping("/dept/edit")
     public R editDept(DepartmentVo departmentVo){
 
+        DepartmentDto departmentDto = new DepartmentDto();
+
+        BeanUtils.copyProperties(departmentVo,departmentDto);
+        userClient.updateDept(departmentDto);
         return R.ok();
 
     }
 
     @PostMapping("/dept/delete")
-    public R deleteDept(@RequestParam(value = "ids",required = false) List<Long> ids,String e){
-
+    public R deleteDept(@RequestParam(value = "ids",required = false) List<Long> ids){
+        userClient.deleteDept(ids);
         return R.ok();
 
     }
 
     @PostMapping("/dept/listAll")
     public R selectDeptParent(){
+        UserDto userDto = userClient.userInfo(UserUtils.getUserName());
         List<DepartmentDto> dtos = userClient.deptListAll();
         List<CascaderVo> rootList = new ArrayList<>();
         List<CascaderVo> bodyList = new ArrayList<>();
+        if (userDto.getDeptId()==0){
+            CascaderVo voRoot = new CascaderVo(0L,"根",0L);
+            rootList.add(voRoot);
+        }
         dtos.forEach(dto -> {
             CascaderVo vo = new CascaderVo(
                     dto.getDeptId(),
                     dto.getName(),
                     dto.getParentId());
-            //TODO  这里应该是自己的部门Id
-            if (dto.getParentId()==0){
+            if (dto.getParentId().equals(userDto.getDeptId())){
                 rootList.add(vo);
-            }else{
+            } else {
                 bodyList.add(vo);
             }
         });
-        TreeToolUtils utils =  new TreeToolUtils(rootList,bodyList);
+        CascaderToolUtils utils =  new CascaderToolUtils(rootList,bodyList);
         List<CascaderVo> result =  utils.getTree();
         return new R().put("data",result);
     }
 
+    @PostMapping("/dept/listAllTree")
+    public R selectTreeDeptParent(){
+        UserDto userDto = userClient.userInfo(UserUtils.getUserName());
+        List<DepartmentDto> dtos = userClient.deptListAll();
+        List<TreeVo> rootList = new ArrayList<>();
+        List<TreeVo> bodyList = new ArrayList<>();
+        dtos.forEach(dto -> {
+            TreeVo vo = new TreeVo(
+                    dto.getDeptId(),
+                    dto.getName(),
+                    dto.getParentId());
+            if (dto.getParentId().equals(userDto.getDeptId())){
+                rootList.add(vo);
+            } else {
+                bodyList.add(vo);
+            }
+        });
+        TreeToolUtils utils =  new TreeToolUtils(rootList,bodyList);
+        List<TreeVo> result =  utils.getTree();
+        return new R().put("data",result);
+    }
 
-
+    @PostMapping("/func/listAll")
+    public R selectTreeFunc(){
+        List<FuncDto> dtos = userClient.funcListAll();
+        List<TreeVo> rootList = new ArrayList<>();
+        List<TreeVo> bodyList = new ArrayList<>();
+        dtos.forEach(dto -> {
+            TreeVo vo = new TreeVo(
+                    dto.getFuncId(),
+                    dto.getName(),
+                    dto.getParentId());
+            if (dto.getParentId() == 0L){
+                rootList.add(vo);
+            } else {
+                bodyList.add(vo);
+            }
+        });
+        TreeToolUtils utils =  new TreeToolUtils(rootList,bodyList);
+        List<TreeVo> result =  utils.getTree();
+        return new R().put("data",result);
+    }
 }

cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysDeptController.java

@@ -75,9 +75,10 @@ public class SysDeptController {
      */
     @RequestMapping("/save")
 //    @RequiresPermissions("sys:sysdept:save")
-    public R save(@RequestBody SysDeptEntity sysDept){
+    public R save(@RequestBody DepartmentDto departmentDto){
+        SysDeptEntity sysDept = new SysDeptEntity();
+        BeanUtils.copyProperties(departmentDto,sysDept);
         sysDeptService.save(sysDept);
-
         return R.ok();
     }
 
@@ -98,9 +99,8 @@ public class SysDeptController {
      */
     @RequestMapping("/delete")
 //    @RequiresPermissions("sys:sysdept:delete")
-    public R delete(@RequestBody Long[] deptIds){
-        sysDeptService.removeByIds(Arrays.asList(deptIds));
-
+    public R delete(@RequestBody List<Long> ids){
+        sysDeptService.removeByIds(ids);
         return R.ok();
     }
 

cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysFuncController.java

 package com.mx.cneeds.server.user.web;
 
+import com.mx.cneeds.common.dto.FuncDto;
 import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.result.R;
 import com.mx.cneeds.common.validator.ValidatorUtils;
 import com.mx.cneeds.server.entity.SysFuncEntity;
 import com.mx.cneeds.server.user.service.SysFuncService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 //import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -83,4 +87,16 @@ public class SysFuncController {
         return R.ok();
     }
 
+    @RequestMapping("/listAll")
+    public List<FuncDto> list(){
+        List<SysFuncEntity> list = sysFuncService.list();
+        List<FuncDto> dtos = new ArrayList<>();
+        list.forEach(sysFuncEntity -> {
+            FuncDto funcDto = new FuncDto();
+            BeanUtils.copyProperties(sysFuncEntity,funcDto);
+            dtos.add(funcDto);
+        });
+        return dtos;
+    }
+
 }

cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserController.java

 package com.mx.cneeds.server.user.web;
 
+import com.mx.cneeds.common.dto.UserDto;
 import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.result.R;
 import com.mx.cneeds.common.validator.ValidatorUtils;
 import com.mx.cneeds.common.vo.UserVo;
 import com.mx.cneeds.server.entity.SysUserEntity;
 import com.mx.cneeds.server.user.service.SysUserService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -50,7 +52,7 @@ public class SysUserController {
     /**
      * 信息
      */
-    @RequestMapping("/info/{userId}")
+//    @RequestMapping("/info/{userId}")
 //    @RequiresPermissions("sys:sysuser:info")
     public R info(@PathVariable("userId") Long userId){
         SysUserEntity sysUser = sysUserService.getById(userId);
@@ -58,6 +60,14 @@ public class SysUserController {
         return R.ok().put("sysUser", sysUser);
     }
 
+    @PostMapping("/userinfo")
+    public UserDto infoByUsername(@RequestParam("username") String username){
+        SysUserEntity sysUser = sysUserService.queryUserByUsername(username);
+        UserDto userDto = new UserDto();
+        BeanUtils.copyProperties(sysUser,userDto);
+        return userDto;
+    }
+
     /**
      * 保存
      */

cneeds-server-user/src/main/resources/application-dev.yml

@@ -50,7 +50,7 @@ eureka:
       defaultZone: http://192.168.2.244:8761/eureka/
   instance:
     prefer-ip-address: true
-#    ip-address: 192.168.2.244
+    ip-address: 192.168.2.244
 
 
 mybatis-plus: