20220805 v1.9 上线版本

doc/接口文档/acl提供给投诉分析的接口.md

@@ -24,19 +24,6 @@ Content-Type: application/json
 }
 ```
 
-- 测试环境
-
-```http
-POST http://192.168.50.5:12128/api/verification
-Content-Type: application/json
-
-{
-  "token": "test_token_abc",
-  "fromSystem": "test",
-  "system": "fenxi"
-}
-```
-
 - 正式环境
 
 ```http

doc/接口文档/acl提供给投诉大屏的接口.md

@@ -24,19 +24,6 @@ Content-Type: application/json
 }
 ```
 
-- 测试环境
-
-```http
-POST http://192.168.50.5:12128/api/verification
-Content-Type: application/json
-
-{
-  "token": "test_token_abc",
-  "fromSystem": "test",
-  "system": "daping"
-}
-```
-
 - 正式环境
 
 ```http

doc/接口文档/acl提供给投诉预测的接口.md

@@ -23,19 +23,6 @@ Content-Type: application/json
 }
 ```
 
-- 测试环境
-
-```http
-POST http://133.96.94.176:12128/api/verification
-Content-Type: application/json
-
-{
-"token": "test_token_abc",
-"fromSystem": "test",
-"system": "yuce"
-}
-```
-
 - 正式环境
 
 ```http

doc/接口文档/acl提供给流程的接口.md

@@ -3,10 +3,10 @@
 部署环境 133.96.94.176:12128
 本地环境 127.0.0.1:12128
 
-## 鉴权接口
+## 鉴权接口 -开发环境
 
 ```http
-POST http://133.96.94.176:12128/api/verification
+POST http://127.0.0.1:12128/api/verification
 Content-Type: application/json
 
 {
@@ -382,6 +382,8 @@ Connection: close
 
 ## 用户树形结构接口
 
+- 开发环境
+
 ```http
 POST http://127.0.0.1:12128/rest/flow/api/userTree
 Content-Type: application/json
@@ -397,7 +399,7 @@ Content-Type: application/json
 HTTP/1.1 200 
 Content-Type: application/json
 Transfer-Encoding: chunked
-Date: Thu, 04 Aug 2022 12:25:36 GMT
+Date: Fri, 05 Aug 2022 07:49:11 GMT
 Connection: close
 
 {
@@ -411,12 +413,6 @@ Connection: close
         {
           "name": "省公司",
           "child": [
-            {
-              "name": "河北省",
-              "userName": "系统用户",
-              "userId": 1,
-              "child": []
-            },
             {
               "name": "河北省",
               "userName": "王玉龙",
@@ -441,112 +437,65 @@ Connection: close
             },
             {
               "name": "唐山市",
-              "userName": "王振",
-              "userId": 30,
-              "child": []
-            },
-            {
-              "name": "唐山市",
-              "userName": "李四喜",
+              "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,
+              "name": "唐山市",
+              "userName": "王振",
+              "userId": 30,
               "child": []
-            },
+            }
+          ]
+        },
+        {
+          "name": "路南区",
+          "child": [
             {
               "name": "路南区",
               "userName": "夏杰",
               "userId": 236,
               "child": []
-            },
-            {
-              "name": "迁安市",
-              "userName": "訾悦馨",
-              "userId": 233,
-              "child": []
-            },
-            {
-              "name": "开平区",
-              "userName": "王跃东",
-              "userId": 234,
-              "child": []
-            },
-            {
-              "name": "滦州市",
-              "userName": "张望然",
-              "userId": 231,
-              "child": []
-            },
+            }
+          ]
+        },
+        {
+          "name": "路北区",
+          "child": [
             {
               "name": "路北区",
               "userName": "陈琳",
               "userId": 237,
               "child": []
-            },
-            {
-              "name": "滦南县",
-              "userName": "王晓红",
-              "userId": 228,
-              "child": []
-            },
+            }
+          ]
+        },
+        {
+          "name": "古冶区",
+          "child": [
             {
-              "name": "高开区",
-              "userName": "王梦云",
-              "userId": 227,
+              "name": "古冶区",
+              "userName": "李志香",
+              "userId": 224,
               "child": []
-            },
+            }
+          ]
+        },
+        {
+          "name": "开平区",
+          "child": [
             {
-              "name": "乐亭县",
-              "userName": "苏惠芳",
-              "userId": 225,
+              "name": "开平区",
+              "userName": "王跃东",
+              "userId": 234,
               "child": []
-            },
+            }
+          ]
+        },
+        {
+          "name": "丰南区",
+          "child": [
             {
               "name": "丰南区",
               "userName": "张力山",
@@ -561,69 +510,132 @@ Connection: close
             }
           ]
         },
-        {
-          "name": "路南区",
-          "child": []
-        },
-        {
-          "name": "路北区",
-          "child": []
-        },
-        {
-          "name": "古冶区",
-          "child": []
-        },
-        {
-          "name": "开平区",
-          "child": []
-        },
-        {
-          "name": "丰南区",
-          "child": []
-        },
         {
           "name": "丰润区",
-          "child": []
+          "child": [
+            {
+              "name": "丰润区",
+              "userName": "刘雅光",
+              "userId": 223,
+              "child": []
+            }
+          ]
         },
         {
           "name": "曹妃甸区",
-          "child": []
+          "child": [
+            {
+              "name": "曹妃甸区",
+              "userName": "苏晓辉",
+              "userId": 226,
+              "child": []
+            },
+            {
+              "name": "曹妃甸区",
+              "userName": "贾鹏莹",
+              "userId": 232,
+              "child": []
+            }
+          ]
         },
         {
           "name": "滦南县",
-          "child": []
+          "child": [
+            {
+              "name": "滦南县",
+              "userName": "王晓红",
+              "userId": 228,
+              "child": []
+            }
+          ]
         },
         {
           "name": "乐亭县",
-          "child": []
+          "child": [
+            {
+              "name": "乐亭县",
+              "userName": "苏惠芳",
+              "userId": 225,
+              "child": []
+            }
+          ]
         },
         {
           "name": "迁西县",
-          "child": []
+          "child": [
+            {
+              "name": "迁西县",
+              "userName": "程成",
+              "userId": 220,
+              "child": []
+            }
+          ]
         },
         {
           "name": "玉田县",
-          "child": []
+          "child": [
+            {
+              "name": "玉田县",
+              "userName": "高振宇",
+              "userId": 221,
+              "child": []
+            }
+          ]
         },
         {
           "name": "遵化市",
-          "child": []
+          "child": [
+            {
+              "name": "遵化市",
+              "userName": "张灵芝",
+              "userId": 230,
+              "child": []
+            }
+          ]
         },
         {
           "name": "迁安市",
-          "child": []
+          "child": [
+            {
+              "name": "迁安市",
+              "userName": "訾悦馨",
+              "userId": 233,
+              "child": []
+            }
+          ]
         },
         {
           "name": "滦州市",
-          "child": []
+          "child": [
+            {
+              "name": "滦州市",
+              "userName": "张望然",
+              "userId": 231,
+              "child": []
+            }
+          ]
         },
         {
           "name": "海港区",
-          "child": []
+          "child": [
+            {
+              "name": "海港区",
+              "userName": "颜君明",
+              "userId": 229,
+              "child": []
+            }
+          ]
         },
         {
           "name": "高开区",
-          "child": []
+          "child": [
+            {
+              "name": "高开区",
+              "userName": "王梦云",
+              "userId": 227,
+              "child": []
+            }
+          ]
         }
       ]
     }

doc/接口文档/acl提供给黑点库的接口.md

@@ -22,19 +22,6 @@ Content-Type: application/json
 }
 ```
 
-- 测试环境
-
-```http
-POST http://133.96.94.176:12128/api/verification
-Content-Type: application/json
-
-{
-  "token": "test_token_abc",
-  "fromSystem": "test",
-  "system": "heidianku"
-}
-```
-
 - 正式环境
 
 ```http

doc/接口文档/userTree.json

@@ -0,0 +1,215 @@
+[
+    {
+        "name": "河北省",
+        "child": [
+            {
+                "name": "省公司",
+                "child": [
+                    {
+                        "name": "河北省",
+                        "userName": "王玉龙",
+                        "userId": 24,
+                        "child": []
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "name": "唐山市",
+        "child": [
+            {
+                "name": "市公司",
+                "child": []
+            },
+            {
+                "name": "路南区",
+                "child": [
+                    {
+                        "name": "路南区",
+                        "userName": "夏杰",
+                        "userId": 236,
+                        "child": []
+                    }
+                ]
+            },
+            {
+                "name": "路北区",
+                "child": [
+                    {
+                        "name": "路北区",
+                        "userName": "陈琳",
+                        "userId": 237,
+                        "child": []
+                    }
+                ]
+            },
+            {
+                "name": "古冶区",
+                "child": [
+                    {
+                        "name": "古冶区",
+                        "userName": "李志香",
+                        "userId": 224,
+                        "child": []
+                    }
+                ]
+            },
+            {
+                "name": "开平区",
+                "child": [
+                    {
+                        "name": "开平区",
+                        "userName": "王跃东",
+                        "userId": 234,
+                        "child": []
+                    }
+                ]
+            },
+            {
+                "name": "丰南区",
+                "child": [
+                    {
+                        "name": "丰南区",
+                        "userName": "张力山",
+                        "userId": 235,
+                        "child": []
+                    },
+                    {
+                        "name": "丰南区",
+                        "userName": "冯雪征",
+                        "userId": 240,
+                        "child": []
+                    }
+                ]
+            },
+            {
+                "name": "丰润区",
+                "child": [
+                    {
+                        "name": "丰润区",
+                        "userName": "刘雅光",
+                        "userId": 223,
+                        "child": []
+                    }
+                ]
+            },
+            {
+                "name": "曹妃甸区",
+                "child": [
+                    {
+                        "name": "曹妃甸区",
+                        "userName": "苏晓辉",
+                        "userId": 226,
+                        "child": []
+                    },
+                    {
+                        "name": "曹妃甸区",
+                        "userName": "贾鹏莹",
+                        "userId": 232,
+                        "child": []
+                    }
+                ]
+            },
+            {
+                "name": "滦南县",
+                "child": [
+                    {
+                        "name": "滦南县",
+                        "userName": "王晓红",
+                        "userId": 228,
+                        "child": []
+                    }
+                ]
+            },
+            {
+                "name": "乐亭县",
+                "child": [
+                    {
+                        "name": "乐亭县",
+                        "userName": "苏惠芳",
+                        "userId": 225,
+                        "child": []
+                    }
+                ]
+            },
+            {
+                "name": "迁西县",
+                "child": [
+                    {
+                        "name": "迁西县",
+                        "userName": "程成",
+                        "userId": 220,
+                        "child": []
+                    }
+                ]
+            },
+            {
+                "name": "玉田县",
+                "child": [
+                    {
+                        "name": "玉田县",
+                        "userName": "高振宇",
+                        "userId": 221,
+                        "child": []
+                    }
+                ]
+            },
+            {
+                "name": "遵化市",
+                "child": [
+                    {
+                        "name": "遵化市",
+                        "userName": "张灵芝",
+                        "userId": 230,
+                        "child": []
+                    }
+                ]
+            },
+            {
+                "name": "迁安市",
+                "child": [
+                    {
+                        "name": "迁安市",
+                        "userName": "訾悦馨",
+                        "userId": 233,
+                        "child": []
+                    }
+                ]
+            },
+            {
+                "name": "滦州市",
+                "child": [
+                    {
+                        "name": "滦州市",
+                        "userName": "张望然",
+                        "userId": 231,
+                        "child": []
+                    }
+                ]
+            },
+            {
+                "name": "海港区",
+                "child": [
+                    {
+                        "name": "海港区",
+                        "userName": "颜君明",
+                        "userId": 229,
+                        "child": []
+                    }
+                ]
+            },
+            {
+                "name": "高开区",
+                "child": [
+                    {
+                        "name": "高开区",
+                        "userName": "王梦云",
+                        "userId": 227,
+                        "child": []
+                    }
+                ]
+            }
+        ]
+    }
+]

doc/部署文档/正式环境/bin/application.properties

@@ -0,0 +1,42 @@
+# web服务端口号
+server.port=12128
+
+# log配置
+logging.level.root=info
+logging.level.com.nokia=debug
+# logging.file.name=log/acl.log
+
+# 测试环境数据库配置
+spring.datasource.driver-class-name=org.postgresql.Driver
+spring.datasource.url=jdbc:postgresql://192.168.50.5:5432/sqmmt
+spring.datasource.username=sqmdb
+spring.datasource.password=sqmdb_1QAZ
+
+# 测试环境redis配置 由于测试环境redis尚不具备，暂时先用正式环境的 10 顶替一下，具备后再调整
+spring.redis.host=192.168.70.125
+spring.redis.port=6379
+spring.redis.database=10
+spring.redis.password=Richr00t
+redis.timeoutSeconds=600
+
+# 正式环境数据源GP数据库配置
+# spring.datasource.driver-class-name=org.postgresql.Driver
+# spring.datasource.url=jdbc:postgresql://192.168.70.109:5432/sqmmt
+# spring.datasource.username=sqmdb
+# spring.datasource.password=sqmdb_1QAZ
+
+# 正式环境Redis配置
+# spring.redis.host=192.168.70.125
+# spring.redis.port=6379
+# spring.redis.database=0
+# spring.redis.password=Richr00t
+# redis.timeoutSeconds=600
+
+top.url=http://10.17.180.3/prod-api/verifySystem
+dop.url=http://10.17.180.5:8089/prod-api/verifySystem
+top.api.fromSystem=dh
+dop.api.fromSystem=dh
+top.redirect.url=https://133.96.90.208/login
+dop.redirect.url=http://133.96.90.210:8089/login
+
+mybatis.mapper-locations=classpath*:mapper/**/**Mapper.xml

doc/部署文档/测试环境/bin/application.properties

@@ -0,0 +1,42 @@
+# web服务端口号
+server.port=12128
+
+# log配置
+logging.level.root=info
+logging.level.com.nokia=debug
+# logging.file.name=log/acl.log
+
+# 测试环境数据库配置
+spring.datasource.driver-class-name=org.postgresql.Driver
+spring.datasource.url=jdbc:postgresql://192.168.50.5:5432/sqmmt
+spring.datasource.username=sqmdb
+spring.datasource.password=sqmdb_1QAZ
+
+# 测试环境redis配置 由于测试环境redis尚不具备，暂时先用正式环境的 10 顶替一下，具备后再调整
+spring.redis.host=192.168.70.125
+spring.redis.port=6379
+spring.redis.database=10
+spring.redis.password=Richr00t
+redis.timeoutSeconds=600
+
+# 正式环境数据源GP数据库配置
+# spring.datasource.driver-class-name=org.postgresql.Driver
+# spring.datasource.url=jdbc:postgresql://192.168.70.109:5432/sqmmt
+# spring.datasource.username=sqmdb
+# spring.datasource.password=sqmdb_1QAZ
+
+# 正式环境Redis配置
+# spring.redis.host=192.168.70.125
+# spring.redis.port=6379
+# spring.redis.database=0
+# spring.redis.password=Richr00t
+# redis.timeoutSeconds=600
+
+top.url=http://10.17.180.3/prod-api/verifySystem
+dop.url=http://10.17.180.5:8089/prod-api/verifySystem
+top.api.fromSystem=dh
+dop.api.fromSystem=dh
+top.redirect.url=https://133.96.90.208/login
+dop.redirect.url=http://133.96.90.210:8089/login
+
+mybatis.mapper-locations=classpath*:mapper/**/**Mapper.xml

doc/部署文档/测试环境/bin/run.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+nohup java -jar /data1/acl/aclTousu.jar > /data1/acl/output.out 2>&1 &

doc/部署文档/测试环境/bin/stop.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+for i in $(ps -ef|grep aclTousu.jar |grep -v grep|awk '{print $2}')
+do 
+kill -9 $i;
+done

doc/部署文档/测试环境/测试环境部署文档.md

@@ -0,0 +1,424 @@
+# 测试环境部署文档
+
+bin 部署位置 192.168.50.3:/data1/acl/
+
+sudo iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 12128 -j ACCEPT
+
+## 测试环境接口测试
+
+### 鉴权接口
+
+- 黑点库
+
+```http
+POST http://192.168.50.3:12128/api/verification
+Content-Type: application/json
+
+{
+  "token": "test_token_hebei",
+  "fromSystem": "test",
+  "system": "heidianku"
+}
+```
+
+20220805 v1.9版本
+
+```json
+HTTP/1.1 200 
+Content-Type: application/json
+Transfer-Encoding: chunked
+Date: Fri, 05 Aug 2022 08:27:22 GMT
+Connection: close
+
+{
+  "success": true,
+  "code": 1,
+  "message": "成功",
+  "data": {
+    "loginName": "test_hebei",
+    "userName": "测试用户_全省",
+    "province": "河北省",
+    "belongCity": "河北省",
+    "city": "河北省",
+    "roles": [
+      "黑点库管理",
+      "黑点库查询"
+    ]
+  }
+}
+
+```
+
+- 流程
+
+```http
+POST http://192.168.50.3:12128/api/verification
+Content-Type: application/json
+
+{
+  "token": "test_token_abc",
+  "fromSystem": "test",
+  "system": "liucheng"
+}
+```
+
+```json
+HTTP/1.1 200 
+Content-Type: application/json
+Transfer-Encoding: chunked
+Date: Fri, 05 Aug 2022 08:34:07 GMT
+Connection: close
+
+{
+  "success": true,
+  "code": 1,
+  "message": "成功",
+  "data": {
+    "account": "test_abc",
+    "userId": 4,
+    "userName": "测试用户_李四喜"
+  }
+}
+
+```
+
+- 大屏
+
+```http
+POST http://192.168.50.3:12128/api/verification
+Content-Type: application/json
+
+{
+  "token": "test_token_abc",
+  "fromSystem": "test",
+  "system": "daping"
+}
+```
+
+```json
+HTTP/1.1 200 
+Content-Type: application/json
+Transfer-Encoding: chunked
+Date: Fri, 05 Aug 2022 08:35:25 GMT
+Connection: close
+
+{
+  "success": true,
+  "code": 1,
+  "message": "成功",
+  "data": {
+    "userId": 4,
+    "userName": "测试用户_李四喜",
+    "province": "河北省",
+    "city": "唐山市"
+  }
+}
+
+```
+
+- 投诉分析
+
+```http
+POST http://192.168.50.3:12128/api/verification
+Content-Type: application/json
+
+{
+  "token": "test_token_abc",
+  "fromSystem": "test",
+  "system": "fenxi"
+}
+```
+
+```json
+HTTP/1.1 200 
+Content-Type: application/json
+Transfer-Encoding: chunked
+Date: Fri, 05 Aug 2022 08:51:35 GMT
+Connection: close
+
+{
+  "success": true,
+  "code": 1,
+  "message": "成功",
+  "data": {
+    "id": 4,
+    "account": "test_abc",
+    "name": "测试用户_李四喜",
+    "status": 1,
+    "city": "唐山市"
+  }
+}
+
+```
+
+- 投诉预测
+
+```http
+POST http://192.168.50.3:12128/api/verification
+Content-Type: application/json
+
+{
+"token": "test_token_abc",
+"fromSystem": "test",
+"system": "yuce"
+}
+```
+
+```json
+HTTP/1.1 200 
+Content-Type: application/json
+Transfer-Encoding: chunked
+Date: Fri, 05 Aug 2022 08:52:24 GMT
+Connection: close
+
+{
+  "success": true,
+  "code": 1,
+  "message": "成功",
+  "data": {
+    "userId": 4,
+    "userName": "测试用户_李四喜",
+    "province": "河北省",
+    "city": 130200
+  }
+}
+
+```
+
+### 提供给流程系统的接口
+
+- 角色列表接口
+
+```http
+POST http://192.168.50.3:12128/rest/flow/api
+Content-Type: application/json
+
+{
+  "callType": "findRoleList",
+  "userName": "王"
+}
+```
+
+```json
+HTTP/1.1 200 
+Content-Type: application/json
+Transfer-Encoding: chunked
+Date: Fri, 05 Aug 2022 08:58:32 GMT
+Connection: close
+
+{
+  "success": true,
+  "code": 1,
+  "message": "成功",
+  "data": [
+    {
+      "roleId": 3,
+      "roleName": "工单查询"
+    },
+    {
+      "roleId": 4,
+      "roleName": "工单处理(投诉分析)"
+    },
+    {
+      "roleId": 6,
+      "roleName": "工单处理(维护处理)"
+    },
+    {
+      "roleId": 7,
+      "roleName": "工单处理(建设处理)"
+    },
+    {
+      "roleId": 8,
+      "roleName": "工单处理(归档审核)"
+    },
+    {
+      "roleId": 13,
+      "roleName": "工单处理(处理核查)"
+    },
+    {
+      "roleId": 5,
+      "roleName": "工单处理(优化处理)"
+    },
+    {
+      "roleId": 12,
+      "roleName": "工单答复"
+    }
+  ]
+}
+
+```
+
+- 用户列表接口
+
+```http
+POST http://192.168.50.3:12128/rest/flow/api
+Content-Type: application/json
+
+{
+  "callType": "findToPage"
+}
+```
+
+- 根据登录账号获取用户
+
+```http
+POST http://192.168.50.3:12128/rest/flow/api
+Content-Type: application/json
+
+{
+  "callType": "getByLoginId",
+  "loginId": "test_handan"
+}
+```
+
+```json
+HTTP/1.1 200 
+Content-Type: application/json
+Transfer-Encoding: chunked
+Date: Fri, 05 Aug 2022 09:01:27 GMT
+Connection: close
+
+{
+  "success": true,
+  "code": 1,
+  "message": "成功",
+  "data": {
+    "userId": 21,
+    "loginId": "test_handan",
+    "userName": "测试用户_邯郸市",
+    "mobile": "13231899751",
+    "email": "",
+    "org": {
+      "orgId": 130400,
+      "orgName": "邯郸市"
+    },
+    "area": null
+  }
+}
+
+```
+
+- 根据用户ID获取用户接口
+
+```http
+POST http://192.168.50.3:12128/rest/flow/api
+Content-Type: application/json
+
+{
+  "callType": "get",
+  "userId": "4"
+}
+```
+
+```json
+HTTP/1.1 200 
+Content-Type: application/json
+Transfer-Encoding: chunked
+Date: Fri, 05 Aug 2022 09:02:11 GMT
+Connection: close
+
+{
+  "success": true,
+  "code": 1,
+  "message": "成功",
+  "data": {
+    "userId": 4,
+    "loginId": "test_abc",
+    "userName": "测试用户_李四喜",
+    "mobile": "13444444444",
+    "email": "@163.com",
+    "org": {
+      "orgId": 130200,
+      "orgName": "唐山市"
+    },
+    "area": null
+  }
+}
+
+```
+
+- 根据用户id获取角色id列表
+
+```http
+POST http://192.168.50.3:12128/rest/flow/api
+Content-Type: application/json
+
+{
+  "callType": "findRoleIdByUserId",
+  "userId": "4"
+}
+```
+
+```json
+HTTP/1.1 200 
+Content-Type: application/json
+Transfer-Encoding: chunked
+Date: Fri, 05 Aug 2022 09:07:08 GMT
+Connection: close
+
+{
+  "success": true,
+  "code": 1,
+  "message": "成功",
+  "data": [
+    12,
+    5,
+    7,
+    13,
+    6,
+    3,
+    4,
+    8
+  ]
+}
+
+```
+
+- 根据角色id获取用户id列表
+
+```http
+POST http://192.168.50.3:12128/rest/flow/api
+Content-Type: application/json
+
+{
+  "callType": "findUserIdByRoleId",
+  "roleId": "3"
+}
+```
+
+- 多条件搜索用户
+
+```http
+POST http://192.168.50.3:12128/rest/flow/api
+Content-Type: application/json
+
+{
+  "callType": "findAuthorizedUser",
+  "roleId": "3"
+}
+```
+
+- 根据用户查找角色+城市信息
+
+```http
+POST http://192.168.50.3:12128/rest/flow/api
+Content-Type: application/json
+
+{
+  "callType": "getRoleCityByUserId",
+  "userId": "4"
+}
+```
+
+- 用户树形结构接口
+
+```http
+POST http://192.168.50.3:12128/rest/flow/api/userTree
+Content-Type: application/json
+
+{
+  "city": 130200,
+  "role": [4],
+  "user": []
+}
+```

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.nokia</groupId>
     <artifactId>acl_tousu</artifactId>
-    <version>1.8</version>
+    <version>1.9</version>
 
     <parent>
         <groupId>com.nokia</groupId>

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

@@ -134,34 +134,58 @@ public class FlowService {
                 second.put(areas.get(i).getAreaId(), list.size() - 1);
             }
         }
+        System.out.println(result);
+        System.out.println(second);
+        System.out.println("---------------");
         List<User> users = userDao.getByRoleIds(userTreeReq.getRole(), cityIds);
+        System.out.println(users);
+        System.out.println("---------------");
+        // key 区域（市公司或区域） value 一个列表，列表内放区域内全部的用户信息
         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());
+            // 获取用户区县，如果区县为空则获取用户地市
+            Area area = user.getArea() == null ? user.getCity() : user.getArea();
+            map.put("name", area.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<>()));
+            List<Object> userList = ((List<Object>) userMap.getOrDefault(area, new ArrayList<>()));
             userList.add(map);
-            userMap.put(user.getCity(), userList);
+            userMap.put(area, userList);
         }
+        System.out.println(userMap);
+        System.out.println("---------------");
         // 把归类后的用户放入第三层
         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) {
+                // 第一层的child
+                List<Map<String, Object>> list = (List<Map<String, Object>>) result
+                        .get(top.get(entry.getKey().getAreaId())).get("child");
                 // 省级和地市级用户
                 list.get(0).put("child", entry.getValue());
             } else {
+                // 第一层的child
+                List<Map<String, Object>> list = (List<Map<String, Object>>) result
+                        .get(top.get(entry.getKey().getParentId())).get("child");
                 // 区县级用户
                 list.get(second.get(entry.getKey().getAreaId())).put("child", entry.getValue());
             }
         }
+        // 只保留叶子节点不为空的
+        // 组织结果
+        for (Map<String, Object> map1 : result) {
+            List<Map<String, Object>> list1 = (List<Map<String, Object>>) map1.get("child");
+            for (int i = 0; i < list1.size(); i++) {
+                List<Map<String, Object>> list2 = (List<Map<String, Object>>) list1.get(i).get("child");
+                if (list2.size() == 0) {
+                    list1.remove(i);
+                    i--;
+                }
+            }
+        }
         return result;
     }
 }

src/main/resources/application.properties

@@ -12,10 +12,11 @@ spring.datasource.url=jdbc:postgresql://192.168.50.5:5432/sqmmt
 spring.datasource.username=sqmdb
 spring.datasource.password=sqmdb_1QAZ
 
-# 测试环境redis配置
-spring.redis.host=localhost
+# 测试环境redis配置 由于测试环境redis尚不具备，暂时先用正式环境的 10 顶替一下，具备后再调整
+spring.redis.host=192.168.70.125
 spring.redis.port=6379
-spring.redis.database=0
+spring.redis.database=10
+spring.redis.password=Richr00t
 redis.timeoutSeconds=600
 
 # 正式环境数据源GP数据库配置

src/main/resources/mapper/UserMapper.xml

@@ -18,10 +18,13 @@
             <id column="city_id" property="areaId"></id>
             <result column="city_name" property="areaName" />
             <result column="type_code" property="typeCode" />
+            <result column="city_parent_id" property="parentId" />
         </association>
         <association column="area_id" property="area">
             <id column="area_id" property="areaId"></id>
             <result column="area_name" property="areaName" />
+            <result column="area_type_code" property="typeCode" />
+            <result column="area_parent_id" property="parentId" />
         </association>
         <collection property="roles" resultMap="RoleResultMap" />
     </resultMap>
@@ -43,9 +46,9 @@
     </select>
 
     <select id="getByLoginName" resultMap="UserResultMap">
-        select tmp.*, ac4.area_name 
+        select tmp.*, ac4.area_name, ac4.parent_id as area_parent_id
             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,
+                ac.area_name as province_name, au.city_id, ac2.area_name as city_name, ac2.parent_id as city_parent_id,
                 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
@@ -63,10 +66,10 @@
     </select>
 
     <select id="getByRoleIds" resultMap="UserResultMap">
-        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", 
+        select tmp.*, ac4.area_name, ac4.type_code as area_type_code, ac4.parent_id as area_parent_id
+            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.parent_id as city_parent_id,
+                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,

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

@@ -62,8 +62,8 @@ public class FlowServiceTest {
     @Test
     void testGetUserTree() {
         UserTreeReq req = new UserTreeReq();
-        req.setCity(130100);
-        req.getRole().add(4);
+        req.setCity(130300);
+        req.getRole().add(6);
         List<Map<String, Object>> userTree = service.getUserTree(req);
         System.out.println(userTree);
     }