20220804 新需求基本完成

acl提供给流程的接口.md

@@ -379,3 +379,255 @@ Connection: close
 }
 
 ```
+
+## 用户树形结构接口
+
+```http
+POST http://127.0.0.1:12128/rest/flow/api/userTree
+Content-Type: application/json
+
+{
+  "city": 130200,
+  "role": [4],
+  "user": []
+}
+```
+
+```json
+HTTP/1.1 200 
+Content-Type: application/json
+Transfer-Encoding: chunked
+Date: Thu, 04 Aug 2022 12:25:36 GMT
+Connection: close
+
+{
+  "success": true,
+  "code": 1,
+  "message": "成功",
+  "data": [
+    {
+      "name": "河北省",
+      "child": [
+        {
+          "name": "省公司",
+          "child": [
+            {
+              "name": "河北省",
+              "userName": "系统用户",
+              "userId": 1,
+              "child": []
+            },
+            {
+              "name": "河北省",
+              "userName": "王玉龙",
+              "userId": 24,
+              "child": []
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "唐山市",
+      "child": [
+        {
+          "name": "市公司",
+          "child": [
+            {
+              "name": "唐山市",
+              "userName": "郭栋",
+              "userId": 219,
+              "child": []
+            },
+            {
+              "name": "唐山市",
+              "userName": "王振",
+              "userId": 30,
+              "child": []
+            },
+            {
+              "name": "唐山市",
+              "userName": "李四喜",
+              "userId": 4,
+              "child": []
+            },
+            {
+              "name": "海港区",
+              "userName": "颜君明",
+              "userId": 229,
+              "child": []
+            },
+            {
+              "name": "古冶区",
+              "userName": "李志香",
+              "userId": 224,
+              "child": []
+            },
+            {
+              "name": "丰润区",
+              "userName": "刘雅光",
+              "userId": 223,
+              "child": []
+            },
+            {
+              "name": "玉田县",
+              "userName": "高振宇",
+              "userId": 221,
+              "child": []
+            },
+            {
+              "name": "遵化市",
+              "userName": "张灵芝",
+              "userId": 230,
+              "child": []
+            },
+            {
+              "name": "迁西县",
+              "userName": "程成",
+              "userId": 220,
+              "child": []
+            },
+            {
+              "name": "曹妃甸区",
+              "userName": "苏晓辉",
+              "userId": 226,
+              "child": []
+            },
+            {
+              "name": "曹妃甸区",
+              "userName": "贾鹏莹",
+              "userId": 232,
+              "child": []
+            },
+            {
+              "name": "路南区",
+              "userName": "夏杰",
+              "userId": 236,
+              "child": []
+            },
+            {
+              "name": "迁安市",
+              "userName": "訾悦馨",
+              "userId": 233,
+              "child": []
+            },
+            {
+              "name": "开平区",
+              "userName": "王跃东",
+              "userId": 234,
+              "child": []
+            },
+            {
+              "name": "滦州市",
+              "userName": "张望然",
+              "userId": 231,
+              "child": []
+            },
+            {
+              "name": "路北区",
+              "userName": "陈琳",
+              "userId": 237,
+              "child": []
+            },
+            {
+              "name": "滦南县",
+              "userName": "王晓红",
+              "userId": 228,
+              "child": []
+            },
+            {
+              "name": "高开区",
+              "userName": "王梦云",
+              "userId": 227,
+              "child": []
+            },
+            {
+              "name": "乐亭县",
+              "userName": "苏惠芳",
+              "userId": 225,
+              "child": []
+            },
+            {
+              "name": "丰南区",
+              "userName": "张力山",
+              "userId": 235,
+              "child": []
+            },
+            {
+              "name": "丰南区",
+              "userName": "冯雪征",
+              "userId": 240,
+              "child": []
+            }
+          ]
+        },
+        {
+          "name": "路南区",
+          "child": []
+        },
+        {
+          "name": "路北区",
+          "child": []
+        },
+        {
+          "name": "古冶区",
+          "child": []
+        },
+        {
+          "name": "开平区",
+          "child": []
+        },
+        {
+          "name": "丰南区",
+          "child": []
+        },
+        {
+          "name": "丰润区",
+          "child": []
+        },
+        {
+          "name": "曹妃甸区",
+          "child": []
+        },
+        {
+          "name": "滦南县",
+          "child": []
+        },
+        {
+          "name": "乐亭县",
+          "child": []
+        },
+        {
+          "name": "迁西县",
+          "child": []
+        },
+        {
+          "name": "玉田县",
+          "child": []
+        },
+        {
+          "name": "遵化市",
+          "child": []
+        },
+        {
+          "name": "迁安市",
+          "child": []
+        },
+        {
+          "name": "滦州市",
+          "child": []
+        },
+        {
+          "name": "海港区",
+          "child": []
+        },
+        {
+          "name": "高开区",
+          "child": []
+        }
+      ]
+    }
+  ]
+}
+
+```

src/main/java/com/nokia/controller/FlowApiController.java

@@ -7,12 +7,14 @@ import com.nokia.service.FlowService;
 import com.nokia.vo.flow.FlowRoleCityVo;
 import com.nokia.vo.flow.FlowRoleVo;
 import com.nokia.vo.flow.FlowUserVo;
+import com.nokia.vo.flow.UserTreeReq;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 提供给工作流的api
@@ -29,9 +31,9 @@ public class FlowApiController {
     }
 
     @PostMapping("flow/api/userTree")
-    public R getUserTree(@RequestBody JSONObject jsonObject) {
-        
-        return null;
+    public R getUserTree(@RequestBody UserTreeReq userTreeReq) {
+        List<Map<String, Object>> userTree = flowService.getUserTree(userTreeReq);
+        return R.ok().data(userTree);
     }
 
     @PostMapping("flow/api")

src/main/java/com/nokia/dao/AreaDao.java

@@ -0,0 +1,21 @@
+package com.nokia.dao;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import com.nokia.pojo.Area;
+
+@Mapper
+public interface AreaDao {
+
+    @Select("select * from sqmdb_rpt.acl_area order by type_code, area_id")
+    List<Area> getAll();
+
+    @Select("select * from sqmdb_rpt.acl_area where parent_id = #{parentId} order by type_code, area_id")
+    List<Area> getByParentId(int parent_id);
+
+    @Select("select * from sqmdb_rpt.acl_area where area_id = #{areaId}")
+    Area getByAreaId(int areaId);
+}

src/main/java/com/nokia/pojo/Area.java

@@ -16,6 +16,4 @@ public class Area {
     private Integer typeCode;
     // 上一级行政区的id
     private Integer parentId;
-    // 上一级行政区
-    private Area parent;
 }

src/main/java/com/nokia/service/FlowService.java

@@ -1,6 +1,8 @@
 package com.nokia.service;
 
+import com.nokia.dao.AreaDao;
 import com.nokia.dao.UserDao;
+import com.nokia.pojo.Area;
 import com.nokia.pojo.Role;
 import com.nokia.pojo.User;
 import com.nokia.vo.flow.FlowRoleVo;
@@ -12,17 +14,21 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 @Service
 public class FlowService {
 
     private final UserDao userDao;
+    private final AreaDao areaDao;
 
     @Autowired
-    public FlowService(UserDao userDao) {
+    public FlowService(UserDao userDao, AreaDao areaDao) {
         this.userDao = userDao;
+        this.areaDao = areaDao;
     }
 
     public List<FlowRoleVo> findRoleList(String username) {
@@ -61,16 +67,101 @@ public class FlowService {
         return userDao.getRoleCityByUserId(userId);
     }
 
-    public Map<String, Object> getUserTree(UserTreeReq userTreeReq) {
+    @SuppressWarnings("unchecked")
+    public List<Map<String, Object>> getUserTree(UserTreeReq userTreeReq) {
+        // cityIds 用于查找用户 用户在叶子节点
         List<Integer> cityIds = new ArrayList<>();
+        // areas 用于构建树结构的前两层
+        List<Area> areas = new ArrayList<>();
         if (userTreeReq.getCity() == -1) {
+            // 如果这里给的是河北省，那么需要取全部
+            areas = areaDao.getAll();
             cityIds = null;
         } else {
+            // 都需要添加省级用户
+            areas.add(areaDao.getByAreaId(-1));
+            // 添加对应的地市
+            areas.add(areaDao.getByAreaId(userTreeReq.getCity()));
+            // 添加地市对应的区县
+            areas.addAll(areaDao.getByParentId(userTreeReq.getCity()));
             cityIds.add(-1);
             cityIds.add(userTreeReq.getCity());
         }
+        // 组织结果
+        List<Map<String, Object>> result = new ArrayList<>();
+        // 用于记录第一层排序
+        Map<Integer, Integer> top = new HashMap<>();
+        // 用于记录第二层排序
+        Map<Integer, Integer> second = new HashMap<>();
+        for (int i = 0; i < areas.size(); i++) {
+            if (areas.get(i).getTypeCode() == 1) {
+                // 省
+                // 第一层
+                Map<String, Object> map1 = new LinkedHashMap<>();
+                map1.put("name", areas.get(i).getAreaName());
+                map1.put("child", new ArrayList<>());
+                result.add(map1);
+                // 记录第一层排序
+                top.put(areas.get(i).getAreaId(), i);
+                // 第二层
+                Map<String, Object> map2 = new LinkedHashMap<>();
+                map2.put("name", "省公司");
+                map2.put("child", new ArrayList<>());
+                ((List<Object>) map1.get("child")).add(map2);
+            } else if (areas.get(i).getTypeCode() == 2) {
+                // 地市
+                // 第一层
+                Map<String, Object> map1 = new LinkedHashMap<>();
+                map1.put("name", areas.get(i).getAreaName());
+                map1.put("child", new ArrayList<>());
+                result.add(map1);
+                // 记录第一层排序
+                top.put(areas.get(i).getAreaId(), i);
+                // 第二层
+                Map<String, Object> map2 = new LinkedHashMap<>();
+                map2.put("name", "市公司");
+                map2.put("child", new ArrayList<>());
+                ((List<Object>) map1.get("child")).add(map2);
+            } else {
+                // 区县，仅第二层
+                Map<String, Object> map = new LinkedHashMap<>();
+                map.put("name", areas.get(i).getAreaName());
+                map.put("child", new ArrayList<>());
+                // 加入到第二层
+                List<Object> list = (List<Object>) result.get(top.get(areas.get(i).getParentId())).get("child");
+                list.add(map);
+                // 记录第二层排序
+                second.put(areas.get(i).getAreaId(), list.size() - 1);
+            }
+        }
         List<User> users = userDao.getByRoleIds(userTreeReq.getRole(), cityIds);
-        Map<String, Object> result = new HashMap<>();
+        Map<Area, Object> userMap = new LinkedHashMap<>();
+        // 将用户归类
+        for (User user : users) {
+            Map<String, Object> map = new LinkedHashMap<>();
+            map.put("name", user.getArea() == null ? user.getCity().getAreaName() :user.getArea().getAreaName());
+            map.put("userName", user.getUserName());
+            map.put("userId", user.getUserId());
+            map.put("child", new ArrayList<>());
+            // 把 map 放入 列表中
+            List<Object> userList = ((List<Object>) userMap.getOrDefault(user.getCity(),
+                    new ArrayList<>()));
+            userList.add(map);
+            userMap.put(user.getCity(), userList);
+        }
+        // 把归类后的用户放入第三层
+        for (Entry<Area, Object> entry : userMap.entrySet()) {
+            // 第一层的child
+            List<Map<String, Object>> list = (List<Map<String, Object>>) result.get(top.get(entry.getKey().getAreaId()))
+                    .get("child");
+            if (entry.getKey().getTypeCode() < 3) {
+                // 省级和地市级用户
+                list.get(0).put("child", entry.getValue());
+            } else {
+                // 区县级用户
+                list.get(second.get(entry.getKey().getAreaId())).put("child", entry.getValue());
+            }
+        }
         return result;
     }
 }

src/main/java/com/nokia/vo/YuceUserVo.java

@@ -20,7 +20,7 @@ public class YuceUserVo {
     public YuceUserVo(User user) {
         this.userId = user.getUserId();
         this.userName = user.getUserName();
-        this.province = user.getCity().getParent().getAreaName();
+        this.province = user.getProvince().getAreaName();
         // this.belongCity = user.getCity().getCityNameZh();
         for (Role role : user.getRoles()) {
             if ("yuce".equals(role.getSystem())) {

src/main/java/com/nokia/vo/flow/UserTreeReq.java

@@ -1,5 +1,6 @@
 package com.nokia.vo.flow;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import lombok.Data;
@@ -7,6 +8,6 @@ import lombok.Data;
 @Data
 public class UserTreeReq {
     private Integer city;
-    private List<Integer> role;
-    private List<Integer> user;
+    private List<Integer> role = new ArrayList<>();
+    private List<Integer> user = new ArrayList<>();
 }

src/main/resources/mapper/UserMapper.xml

@@ -17,6 +17,7 @@
         <association column="city_id" property="city">
             <id column="city_id" property="areaId"></id>
             <result column="city_name" property="areaName" />
+            <result column="type_code" property="typeCode" />
         </association>
         <association column="area_id" property="area">
             <id column="area_id" property="areaId"></id>
@@ -42,29 +43,50 @@
     </select>
 
     <select id="getByLoginName" resultMap="UserResultMap">
-        select au.user_id, au.login_name, au.user_name, au.phone, au.email, au.province_id, ac.area_name as province_name, 
-            au.city_id, ac2.area_name as city_name, au.area_id, ar.role_id, ar.role_name, ar."system", aurc.city_id as role_city_id, 
-            ac3.area_name as role_area_name 
-        from sqmdb_rpt.acl_user au, sqmdb_rpt.acl_role ar, sqmdb_rpt.acl_user_role_city aurc, sqmdb_rpt.acl_area ac,  sqmdb_rpt.acl_area ac2, sqmdb_rpt.acl_area ac3 
-        where au.user_id = aurc.user_id and ar.role_id = aurc.role_id and au.province_id = ac.area_id 
-            and au.city_id = ac2.area_id and aurc.city_id = ac3.area_id and au.login_name = #{loginName}
+        select tmp.*, ac4.area_name 
+            from ( select au.user_id, au.login_name, au.user_name, au.phone, au.email, au.province_id,
+                ac.area_name as province_name, au.city_id, ac2.area_name as city_name,
+                ac2.type_code, au.area_id, ar.role_id, ar.role_name, ar."system",
+                aurc.city_id as role_city_id, ac3.area_name as role_area_name
+            from
+                sqmdb_rpt.acl_user au, sqmdb_rpt.acl_role ar,
+                sqmdb_rpt.acl_user_role_city aurc, sqmdb_rpt.acl_area ac,
+                sqmdb_rpt.acl_area ac2, sqmdb_rpt.acl_area ac3
+            where
+                au.user_id = aurc.user_id and ar.role_id = aurc.role_id
+                and au.province_id = ac.area_id and au.city_id = ac2.area_id
+                and aurc.city_id = ac3.area_id ) tmp
+            left join sqmdb_rpt.acl_area ac4
+            on tmp.area_id = ac4.area_id
+        where 1=1
+            and tmp.login_name = #{loginName}
     </select>
 
     <select id="getByRoleIds" resultMap="UserResultMap">
-        select au.user_id, au.login_name, au.user_name, au.phone, au.email, au.province_id, ac.area_name as province_name, 
-            au.city_id, ac2.area_name as city_name, au.area_id, ar.role_id, ar.role_name, ar."system", aurc.city_id as role_city_id, 
-            ac3.area_name as role_area_name 
-        from sqmdb_rpt.acl_user au, sqmdb_rpt.acl_role ar, sqmdb_rpt.acl_user_role_city aurc, sqmdb_rpt.acl_area ac,  sqmdb_rpt.acl_area ac2, sqmdb_rpt.acl_area ac3 
-        where au.user_id = aurc.user_id and ar.role_id = aurc.role_id and au.province_id = ac.area_id 
-            and au.city_id = ac2.area_id and aurc.city_id = ac3.area_id
+        select tmp.*, ac4.area_name 
+            from ( select au.user_id, au.login_name, au.user_name, au.phone, au.email, au.province_id, 
+                ac.area_name as province_name, au.city_id, ac2.area_name as city_name, 
+                ac2.type_code, au.area_id, ar.role_id, ar.role_name, ar."system", 
+                aurc.city_id as role_city_id, ac3.area_name as role_area_name
+            from
+                sqmdb_rpt.acl_user au, sqmdb_rpt.acl_role ar,
+                sqmdb_rpt.acl_user_role_city aurc, sqmdb_rpt.acl_area ac,
+                sqmdb_rpt.acl_area ac2, sqmdb_rpt.acl_area ac3
+            where
+                au.user_id = aurc.user_id and ar.role_id = aurc.role_id
+                and au.province_id = ac.area_id and au.city_id = ac2.area_id
+                and aurc.city_id = ac3.area_id ) tmp
+            left join sqmdb_rpt.acl_area ac4
+            on tmp.area_id = ac4.area_id
+        where tmp.user_id != 1
         <if test="roleIds != null">
-            and aurc.role_id in
+            and tmp.role_id in
             <foreach collection="roleIds" item="item" open="(" separator="," close=")" index="index">
                 #{item}
             </foreach>
         </if>
         <if test="cityIds != null">
-            and aurc.city_id in
+            and tmp.role_city_id in
             <foreach collection="cityIds" item="item" open="(" separator="," close=")" index="index">
                 #{item}
             </foreach>

src/test/java/com/nokia/dao/AreaDaoTest.java

@@ -0,0 +1,34 @@
+package com.nokia.dao;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import com.nokia.pojo.Area;
+
+@SpringBootTest
+public class AreaDaoTest {
+
+    @Autowired
+    private AreaDao areaDao;
+
+    @Test
+    void testGetAll() {
+        List<Area> result = areaDao.getAll();
+        System.out.println(result);
+    }
+
+    @Test
+    void testGetByParentId() {
+        List<Area> result = areaDao.getByParentId(-1);
+        System.out.println(result);
+    }
+
+    @Test
+    void testGetByAreaId() {
+        Area area = areaDao.getByAreaId(130100);
+        System.out.println(area);
+    }
+}

src/test/java/com/nokia/dao/UserDaoTest.java

@@ -82,7 +82,7 @@ public class UserDaoTest {
     void testGetByRoleIds() {
         List<Integer> roleIds = new ArrayList<>();
         roleIds.add(4);
-        roleIds.add(3);
+        // roleIds.add(3);
 
         List<Integer> cityIds = new ArrayList<>();
         cityIds.add(-1);

src/test/java/com/nokia/service/FlowServiceTest.java

@@ -0,0 +1,70 @@
+package com.nokia.service;
+
+import java.util.List;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import com.nokia.vo.flow.UserTreeReq;
+
+@SpringBootTest
+public class FlowServiceTest {
+    @Autowired
+    private FlowService service;
+
+    @Test
+    void testFindAuthorizedUser() {
+
+    }
+
+    @Test
+    void testFindRoleIdByUserId() {
+
+    }
+
+    @Test
+    void testFindRoleList() {
+
+    }
+
+    @Test
+    void testFindRoleList2() {
+
+    }
+
+    @Test
+    void testFindToPage() {
+
+    }
+
+    @Test
+    void testFindUserIdByRoleId() {
+
+    }
+
+    @Test
+    void testGetByLoginId() {
+
+    }
+
+    @Test
+    void testGetByUserId() {
+
+    }
+
+    @Test
+    void testGetRoleCityByUserId() {
+
+    }
+
+    @Test
+    void testGetUserTree() {
+        UserTreeReq req = new UserTreeReq();
+        req.setCity(130100);
+        req.getRole().add(4);
+        List<Map<String, Object>> userTree = service.getUserTree(req);
+        System.out.println(userTree);
+    }
+}