问题修改

src/main/java/com/tld/controller/DepartmentController.java

@@ -65,4 +65,14 @@ public class DepartmentController {
         departmentService.export(department, response);
     }
 
+    /**
+     * 查询所有部门
+     * @param department 参数
+     * @return 返回结果
+     */
+    @GetMapping("getDepartBefor")
+    public Map<String, Object> getDepartBefor(Department department){
+        return departmentService.getDepartBefor(department);
+    }
+
 }

src/main/java/com/tld/controller/RoleController.java

@@ -65,4 +65,14 @@ public class RoleController {
     public void userExport(Role role, HttpServletResponse response){
         roleService.export(role, response);
     }
+
+    /**
+     * 查询所有角色
+     * @param role 参数
+     * @return 返回结果
+     */
+    @GetMapping("roleBefore")
+    public Map<String, Object> roleBefore(Role role){
+        return roleService.roleBefore(role);
+    }
 }

src/main/java/com/tld/controller/UserController.java

@@ -1,16 +1,18 @@
 package com.tld.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.tld.model.User;
 import com.tld.service.UserService;
 import com.tld.util.HttpClientUtil;
 import com.tld.util.PassToken;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -51,7 +53,7 @@ public class UserController {
      * @return 返回结果
      */
     @PostMapping("addUser")
-    public Map<String, Object> addUser(User user){
+    public Map<String, Object> addUser(@RequestBody User user){
         return userService.addUser(user);
     }
 
@@ -71,7 +73,7 @@ public class UserController {
      * @return 返回结果
      */
     @PutMapping("updateUser")
-    public Map<String, Object> updateUser(User user){
+    public Map<String, Object> updateUser(@RequestBody User user){
         return userService.updateUser(user);
     }
 
@@ -85,6 +87,7 @@ public class UserController {
     }
 
 
+
     public static void main(String[] args) {
         String url = "http://localhost:9520/user/test";
         Map<String, String> map = new HashMap<String, String>();
@@ -92,7 +95,12 @@ public class UserController {
         map.put("sex", "female");
         String str = HttpClientUtil.doGet(url, map);
         System.out.println("------------------------------");
-        System.out.println(str);
+        Map<String, String> mapData = (Map<String, String>) JSON.parse(str);
+        List<Object> list = JSONArray.parseArray(JSON.toJSONString(mapData.get("data")));
+        for(Object val : list){
+            System.out.println(val);
+        }
+        System.out.println(mapData);
         System.out.println("------------------------------");
     }
 }

src/main/java/com/tld/mapper/UserMapper.java

@@ -22,4 +22,6 @@ public interface UserMapper {
     void delUser(String id);
 
     List<Map<String, Object>> getUserExportData(User user);
+
+    int getUserIsNot(String userName);
 }

src/main/java/com/tld/model/User.java

@@ -52,6 +52,14 @@ public class User implements Serializable {
      * 角色
      */
     private String role;
+    /**
+     * 角色編號
+     */
+    private String roleId;
+    /**
+     * 部門編號
+     */
+    private String departmentId;
     /**
      * 创建时间
      */

src/main/java/com/tld/service/DepartmentService.java

@@ -15,4 +15,6 @@ public interface DepartmentService {
     Map<String, Object> delDepartment(String id);
 
     void export(Department department, HttpServletResponse response);
+
+    Map<String, Object> getDepartBefor(Department department);
 }

src/main/java/com/tld/service/RoleService.java

@@ -15,4 +15,6 @@ public interface RoleService {
     Map<String, Object> delRole(String id);
 
     void export(Role role, HttpServletResponse response);
+
+    Map<String, Object> roleBefore(Role role);
 }

src/main/java/com/tld/service/UserService.java

@@ -18,4 +18,5 @@ public interface UserService {
     Map<String, Object> updateUser(User user);
 
     void userExport(User user, HttpServletResponse response);
+
 }

src/main/java/com/tld/service/impl/DepartmentServiceImpl.java

@@ -109,6 +109,21 @@ public class DepartmentServiceImpl implements DepartmentService {
         }
     }
 
+    @Override
+    public Map<String, Object> getDepartBefor(Department department) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            List<Department> list = departmentMapper.getDepartment(department);
+            map.put("data", list);
+            map.put("msg", "200");
+        }catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
     /**
      * 编号规则
      * @param id 参数

src/main/java/com/tld/service/impl/MenuServiceImpl.java

@@ -23,11 +23,12 @@ public class MenuServiceImpl implements MenuService {
             List<Map<String, Object>> list = new ArrayList<>();
             for(Menu menu1 : menuMapper.getMenu(menu)){
                 Map<String, Object> treeMap = new TreeMap<>();
-                menu1.setPId(menu1.getId());
-                treeMap.put("children", getChildren(menu1));
                 treeMap.put("title", menu1.getName());
                 treeMap.put("key", menu1.getId());
+                treeMap.put("pId", menu1.getPId());
                 treeMap.put("url", menu1.getUrl());
+                menu1.setPId(menu1.getId());
+                treeMap.put("children", getChildren(menu1));
                 list.add(treeMap);
             }
             map.put("data", list);
@@ -124,9 +125,10 @@ public class MenuServiceImpl implements MenuService {
         List<Map<String, Object>> listTree = new ArrayList<>();
         for(Menu menu1 : menuMapper.getMenu(menu)){
             Map<String, Object> treeMap = new TreeMap<>();
-            menu1.setPId(menu1.getId());
             treeMap.put("title", menu1.getName());
             treeMap.put("key", menu1.getId());
+            treeMap.put("pId", menu1.getPId());
+            menu1.setPId(menu1.getId());
             treeMap.put("children", getChildren(menu1));
             treeMap.put("url", menu1.getUrl());
             listTree.add(treeMap);

src/main/java/com/tld/service/impl/RoleServiceImpl.java

@@ -111,6 +111,21 @@ public class RoleServiceImpl implements RoleService {
         }
     }
 
+    @Override
+    public Map<String, Object> roleBefore(Role role) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            List<Role> list = roleMapper.getRole(role);
+            map.put("data", list);
+            map.put("msg", "200");
+        }catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
     /**
      * 编号规则
      * @param id 参数

src/main/java/com/tld/service/impl/UserServiceImpl.java

@@ -91,6 +91,12 @@ public class UserServiceImpl implements UserService {
     public Map<String, Object> addUser(User user) {
         Map<String, Object> map = new HashMap<>();
         try{
+            int count = userMapper.getUserIsNot(user.getUserName());
+            if(count > 0){
+                map.put("msg", "510");
+                map.put("errMsg", "账号存在");
+                return map;
+            }
             user.setPassword(DesEncry.encrypt(user.getPassword()));
             //新增用户
             userMapper.addUser(user);
@@ -126,6 +132,12 @@ public class UserServiceImpl implements UserService {
     public Map<String, Object> updateUser(User user) {
         Map<String, Object> map = new HashMap<>();
         try{
+            int count = userMapper.getUserIsNot(user.getUserName());
+            if(count > 0){
+                map.put("msg", "510");
+                map.put("errMsg", "账号存在");
+                return map;
+            }
             userMapper.updateUser(user);
             map.put("msg", "200");
         } catch (Exception e){
@@ -163,6 +175,7 @@ public class UserServiceImpl implements UserService {
         }
     }
 
+
     /**
      * 用户编号规则
      * @param id 参数

src/main/resources/mapper/MenuMapper.xml

@@ -28,7 +28,7 @@
                 and p_id = #{pId}
             </if>
             <if test="name != null and name != ''">
-                and name = #{name}
+                and name like CONCAT(CONCAT('%', #{name}), '%')
             </if>
         </trim>
         order by order_by

src/main/resources/mapper/UserMapper.xml

@@ -37,7 +37,9 @@
             a.phone,
             a.create_time,
             c.department_name as department,
-            b.role_name as role
+            b.role_name as role,
+            a.role as roleId,
+            a.department as departmentId
         from tld_user a
         left join tld_role b on a.role = b.id
         left join tld_department c on a.department = c.id
@@ -48,6 +50,9 @@
             <if test="userName != null and userName != ''">
                 and a.user_name like CONCAT(CONCAT('%', #{userName}), '%')
             </if>
+            <if test="id != null and id != ''">
+                and a.id = #{id}
+            </if>
         </trim>
     </select>
     <!-- 新增用户 -->
@@ -98,6 +103,10 @@
     <delete id="delUser">
         delete from tld_user where id = #{id}
     </delete>
+    <!-- 查询用户名是否存在 -->
+    <select id="getUserIsNot" resultType="int">
+        select count(*) from tld_user where user_name = #{userName}
+    </select>
     <!-- 查询导出数据 -->
     <select id="getUserExportData" resultType="java.util.LinkedHashMap">
         select