20220805

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

@@ -11,6 +11,34 @@ token 从top系统带来的token
 fromSystem 参数是从top系统带过来的 投诉预测应为 top
 system 固定为fenxi
 
+- 开发环境
+
+```http
+POST http://127.0.0.1:12128/api/verification
+Content-Type: application/json
+
+{
+  "token": "test_token_abc",
+  "fromSystem": "test",
+  "system": "fenxi"
+}
+```
+
+- 测试环境
+
+```http
+POST http://192.168.50.5:12128/api/verification
+Content-Type: application/json
+
+{
+  "token": "test_token_abc",
+  "fromSystem": "test",
+  "system": "fenxi"
+}
+```
+
+- 正式环境
+
 ```http
 POST http://133.96.94.176:12128/api/verification
 Content-Type: application/json

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

@@ -9,7 +9,35 @@ token  测试token test_token_*** 正式token来自入口url
 fromSystem 测试token为test 正式token是dop
 system 是固定值 daping
 
-###  system 由调用接口的系统确定
+### system 由调用接口的系统确定
+
+- 开发环境
+
+```http
+POST http://127.0.0.1:12128/api/verification
+Content-Type: application/json
+
+{
+  "token": "test_token_abc",
+  "fromSystem": "test",
+  "system": "daping"
+}
+```
+
+- 测试环境
+
+```http
+POST http://192.168.50.5:12128/api/verification
+Content-Type: application/json
+
+{
+  "token": "test_token_abc",
+  "fromSystem": "test",
+  "system": "daping"
+}
+```
+
+- 正式环境
 
 ```http
 POST http://133.96.94.176:12128/api/verification
@@ -41,4 +69,4 @@ Connection: close
   }
 }
 
-```
+```

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

@@ -10,6 +10,34 @@ token 从top系统带来的token
 fromSystem 参数是从top系统带过来的 投诉预测应为 top
 system 投诉预测固定为 yuce
 
+- 开发环境
+
+```http
+POST http://127.0.0.1:12128/api/verification
+Content-Type: application/json
+
+{
+"token": "test_token_abc",
+"fromSystem": "test",
+"system": "yuce"
+}
+```
+
+- 测试环境
+
+```http
+POST http://133.96.94.176:12128/api/verification
+Content-Type: application/json
+
+{
+"token": "test_token_abc",
+"fromSystem": "test",
+"system": "yuce"
+}
+```
+
+- 正式环境
+
 ```http
 POST http://133.96.94.176:12128/api/verification
 Content-Type: application/json

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

@@ -9,6 +9,34 @@ token  测试token test_token_*** 正式token来自入口url
 fromSystem 测试token为test 正式token是top
 system 是固定值 heidianku
 
+- 开发环境
+
+```http
+POST http://127.0.0.1:12128/api/verification
+Content-Type: application/json
+
+{
+  "token": "test_token_abc",
+  "fromSystem": "test",
+  "system": "heidianku"
+}
+```
+
+- 测试环境
+
+```http
+POST http://133.96.94.176:12128/api/verification
+Content-Type: application/json
+
+{
+  "token": "test_token_abc",
+  "fromSystem": "test",
+  "system": "heidianku"
+}
+```
+
+- 正式环境
+
 ```http
 POST http://133.96.94.176:12128/api/verification
 Content-Type: application/json

other/192.168.70.125部署/http测试/20220513测试投诉流程各接口.http

@@ -1,76 +0,0 @@
-POST http://192.168.70.125:12128/rest/flow/api
-Content-Type: application/json
-
-{
-  "callType": "findRoleList",
-  "userName": "张"
-}
-
-###
-
-POST http://192.168.70.125:12128/rest/flow/api
-Content-Type: application/json
-
-{
-  "callType": "findToPage"
-}
-
-###
-
-POST http://192.168.70.125:12128/rest/flow/api
-Content-Type: application/json
-
-{
-  "callType": "getByLoginId",
-  "loginId": "13333333333"
-}
-
-###
-
-POST http://192.168.70.125:12128/rest/flow/api
-Content-Type: application/json
-
-{
-  "callType": "get",
-  "userId": "3"
-}
-
-###
-
-POST http://192.168.70.125:12128/rest/flow/api
-Content-Type: application/json
-
-{
-  "callType": "findRoleIdByUserId",
-  "userId": "3"
-}
-
-###
-
-POST http://192.168.70.125:12128/rest/flow/api
-Content-Type: application/json
-
-{
-  "callType": "findUserIdByRoleId",
-  "roleId": "3"
-}
-
-###
-
-POST http://192.168.70.125:12128/rest/flow/api
-Content-Type: application/json
-
-{
-  "callType": "findAuthorizedUser",
-  "roleId": "3"
-}
-
-###
-
-POST http://localhost:12128/rest/flow/api
-Content-Type: application/json
-
-{
-  "callType": "findAuthorizedUser",
-  "roleId": "3"
-}

other/192.168.70.125部署/http测试/20220513测试鉴权.http

@@ -1,42 +0,0 @@
-### 大屏鉴权
-POST http://192.168.70.125:12128/api/verification
-Content-Type: application/json
-
-{
-  "token": "abcdef",
-  "fromSystem": "dop",
-  "system": "daping"
-}
-
-### 预测
-
-POST http://192.168.70.125:12128/api/verification
-Content-Type: application/json
-
-{
-  "token": "abcdefeee",
-  "fromSystem": "top",
-  "system": "yuce"
-}
-
-### 工单流转
-
-POST http://192.168.70.125:12128/api/verification
-Content-Type: application/json
-
-{
-  "token": "abcdefeee",
-  "fromSystem": "top",
-  "system": "liucheng"
-}
-
-### 投诉分析
-
-POST http://133.96.94.176:12128/api/verification
-Content-Type: application/json
-
-{
-  "token": "test_token_handan",
-  "fromSystem": "test",
-  "system": "fenxi"
-}

other/192.168.70.125部署/http测试/20220516增删改查测试.http

@@ -1,81 +0,0 @@
-POST http://localhost:12128/rest/api/city/list
-Content-Type: application/json
-
-{}
-
-###
-POST http://localhost:12128/rest/api/role/list
-Content-Type: application/json
-
-{}
-
-###
-POST http://localhost:12128/rest/api/role/add
-Content-Type: application/json
-
-{
-  "roleName": "测试--请不要创建用户"
-}
-
-###
-POST http://localhost:12128/rest/api/role/delete/id/9
-Content-Type: application/json
-
-###
-POST http://localhost:12128/rest/api/role/select/id/9
-Content-Type: application/json
-
-###
-POST http://localhost:12128/rest/api/role/update/id/10
-Content-Type: application/json
-
-{
-  "roleName": "测试--请不要创建用户222"
-}
-
-###
-POST http://localhost:12128/rest/api/user/list
-Content-Type: application/json
-
-###
-POST http://localhost:12128/rest/api/user/add
-Content-Type: application/json
-
-{
-  "loginName":"13866666666",
-  "userName":"赵六",
-  "phone":"13866666666",
-  "email":"6324124512@163.com",
-  "province":"河北省",
-  "roleIdList":[
-    3,
-    5,
-    7
-  ],
-  "cityId":-1
-}
-
-###
-POST http://localhost:12128/rest/api/user/delete/id/6
-Content-Type: application/json
-
-###
-POST http://localhost:12128/rest/api/user/select/id/4
-Content-Type: application/json
-
-###
-POST http://localhost:12128/rest/api/user/update/id/7
-Content-Type: application/json
-
-{
-  "loginName":"13866666666",
-  "userName":"赵六宝",
-  "phone":"13866666666",
-  "email":"6324124512@163.com",
-  "province":"河北省",
-  "roleIdList":[
-    3,
-    5
-  ],
-  "cityId":-1
-}

other/192.168.70.125部署/http测试/20220516投诉流程接口修改测试.http

@@ -1,24 +0,0 @@
-POST http://localhost:12128/rest/flow/api
-Content-Type: application/json
-
-{
-  "callType": "findRoleList",
-  "userName": "张"
-}
-
-###
-POST http://localhost:12128/rest/flow/api
-Content-Type: application/json
-
-{
-"callType": "findRoleList",
-"userName": ""
-}
-
-###
-POST http://localhost:12128/rest/flow/api
-Content-Type: application/json
-
-{
-  "callType": "findRoleList"
-}

other/192.168.70.125部署/http测试/20220517测试端口调整.http

@@ -1,8 +0,0 @@
-### 本地测试
-POST http://192.168.70.125:12128/rest/flow/api
-Content-Type: application/json
-
-{
-  "callType": "get",
-  "userId": "3"
-}

other/192.168.70.125部署/http测试/20220524端口调整测试.http

@@ -1,30 +0,0 @@
-### token是两个固定值 fromSystem 是test
-###  system 由调用接口的系统确定
-POST http://192.168.70.125:12128/api/verification
-Content-Type: application/json
-
-{
-  "token": "test_token_123",
-  "fromSystem": "test",
-  "system": "daping"
-}
-
-### token是两个固定值 fromSystem 是test
-###  system 由调用接口的系统确定
-POST http://192.168.70.125:12128/api/verification
-Content-Type: application/json
-
-{
-  "token": "test_token_abc",
-  "fromSystem": "test",
-  "system": "liucheng"
-}
-
-###
-POST http://192.168.70.125:12128/rest/flow/api
-Content-Type: application/json
-
-{
-"callType": "get",
-"userId": "3"
-}

other/192.168.70.125部署/http测试/20220525与DOP对接测试.http

@@ -1,28 +0,0 @@
-### 通过dop验证token
-POST http://10.17.180.5:8089/prod-api/verifySystem
-Content-Type: application/json
-
-{
-  "token": "eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjMxYzFmMjM0LTkyYTctNGQ5Yi1iZjBkLWFhOWJlZjUxZjg2NyJ9.FySTTQXWMIKdGp9s9DMTKQjfe9-m0CsXPj-RS5cT4d7kXp_heGor3YHHy6Ru5qQmnOLpRAdFd1ud_Vq9s6Ed1Q",
-  "fromSystem":"dop"
-}
-
-###
-POST http://192.168.70.125:12128/api/verification
-Content-Type: application/json
-
-{
-  "token": "eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjMxYzFmMjM0LTkyYTctNGQ5Yi1iZjBkLWFhOWJlZjUxZjg2NyJ9.FySTTQXWMIKdGp9s9DMTKQjfe9-m0CsXPj-RS5cT4d7kXp_heGor3YHHy6Ru5qQmnOLpRAdFd1ud_Vq9s6Ed1Q",
-  "fromSystem": "dop",
-  "system": "daping"
-}
-
-###
-POST http://localhost:12128/api/verification
-Content-Type: application/json
-
-{
-  "token": "eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjMxYzFmMjM0LTkyYTctNGQ5Yi1iZjBkLWFhOWJlZjUxZjg2NyJ9.FySTTQXWMIKdGp9s9DMTKQjfe9-m0CsXPj-RS5cT4d7kXp_heGor3YHHy6Ru5qQmnOLpRAdFd1ud_Vq9s6Ed1Q",
-  "fromSystem": "dop",
-  "system": "daping"
-}

other/192.168.70.125部署/http测试/20220525端口调整测试.http

@@ -1,20 +0,0 @@
-
-###  system 由调用接口的系统确定
-POST http://192.168.70.125:12128/api/verification
-Content-Type: application/json
-
-{
-  "token": "这是一个不存在或者无效的token",
-  "fromSystem": "dop",
-  "system": "daping"
-}
-
-###
-POST http://192.168.70.125:12128/api/verification
-Content-Type: application/json
-
-{
-"token": "",
-"fromSystem": "",
-"system": "daping"
-}

other/192.168.70.125部署/http测试/20220606-cityusertest.http

@@ -1,9 +0,0 @@
-###  system 由调用接口的系统确定
-POST http://133.96.94.176:12128/api/verification
-Content-Type: application/json
-
-{
-  "token": "test_token_handan",
-  "fromSystem": "test",
-  "system": "liucheng"
-}

other/192.168.70.125部署/sql/sql_back.sql

@@ -1,78 +0,0 @@
--- 建表语句
-create table sqmdb_rpt.acl_city
-(
-    city_id      serial not null
-        constraint city_pk
-            primary key,
-    city_name_zh varchar,
-    city_name_en varchar,
-    ord          integer
-);
-
-alter table sqmdb_rpt.acl_city
-    owner to sqmdb;
-
-create table sqmdb_rpt.acl_role
-(
-    role_id     serial not null
-        constraint role_pk
-            primary key,
-    role_name   varchar,
-    create_time date,
-    update_time date
-);
-
-alter table sqmdb_rpt.acl_role
-    owner to sqmdb;
-
-drop table sqmdb_rpt.acl_user;
-
-create table sqmdb_rpt.acl_user
-(
-    user_id    serial not null
-        constraint user_pk
-            primary key,
-    login_name  varchar,
-    user_name   varchar,
-    phone       varchar,
-    email       varchar,
-    province    varchar,
-    city        varchar,
-    county      varchar,
-    tsfx_per    integer,
-    tsys_per    integer,
-    tsdp_per    integer,
-    tsgdlz_per  integer,
-    ceate_time  date,
-    update_time date
-);
-
-alter table sqmdb_rpt.acl_user
-    owner to sqmdb;
-
-create table sqmdb_rpt.acl_user_role
-(
-    id          serial not null
-        constraint user_role_pk
-            primary key,
-    user_id     integer,
-    role_id     integer,
-    create_time date,
-    update_time date
-);
-
-alter table sqmdb_rpt.acl_user_role
-    owner to sqmdb;
-
-create table sqmdb_rpt.acl_org
-(
-    org_id      serial not null
-        constraint org_pk
-            primary key,
-    org_name    varchar,
-    create_time date,
-    update_time date
-);
-
-alter table sqmdb_rpt.acl_org
-    owner to sqmdb;

other/192.168.70.125部署/sql/sql_bak2.sql

@@ -1 +0,0 @@
--- 测试数据

other/192.168.70.125部署/用户管理与其他系统对接端口样例.md

@@ -1,561 +0,0 @@
-# 端口规范
-
-## 部署信息
-
-当前版本： 1.0
-部署位置： 192.168.70.125 目录/data1/acl/aclTousu-1.0.jar
-启动用户： do  nohup java -jar aclTousu-1.0.jar &
-访问ip+端口号： http://192.168.70.125:12128
-数据库：192.168.70.109:5432/sqmmt 
-schema：sqmdb_rpt
-其中以acl开头的几个表就是
-
-## 20220524 v1.3 更新说明
-
-- 新增了两个测试token
-
-```http request
-POST http://192.168.70.125:12128/api/verification
-Content-Type: application/json
-
-{
-  "token": "test_token_abc",
-  "fromSystem": "test",
-  "system": "daping"
-}
-```
-
-```json
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": {
-    "userId": 4,
-    "userName": "李四喜",
-    "province": "河北省",
-    "city": "唐山市"
-  }
-}
-```
-
-```http request
-### token是两个固定值 fromSystem 是test
-###  system 由调用接口的系统确定
-POST http://192.168.70.125:12128/api/verification
-Content-Type: application/json
-
-{
-  "token": "test_token_abc",
-  "fromSystem": "test",
-  "system": "liucheng"
-}
-```
-
-```json
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": {
-    "account": "13444444444",
-    "userId": 4,
-    "userName": "李四喜"
-  }
-}
-```
-
-- 流程需求的get接口中orgId修改为org对象
-
-```http request
-POST http://192.168.70.125:12128/rest/flow/api
-Content-Type: application/json
-
-{
-"callType": "get",
-"userId": "3"
-}
-```
-
-```json
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": {
-    "userId": 3,
-    "loginId": "13111111111",
-    "userName": "张三",
-    "mobile": "13111111111",
-    "email": null,
-    "org": {
-      "orgId": 130100,
-      "orgName": "石家庄市"
-    }
-  }
-}
-```
-
-## 鉴权接口
-
-- ***大屏鉴权***
-
-```http request
-### 入参说明
-### token 从dop系统带来的token
-### fromSystem 参数是从dop系统带过来的 大屏应为dop
-### system 大屏固定为 daping
-POST http://192.168.70.125:12128/api/verification
-Content-Type: application/json
-
-{
-"token": "abcdef",
-"fromSystem": "dop",
-"system": "daping"
-}
-```
-
-正常返回值
-
-```json
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": {
-    "userId": 3,
-    "userName": "张三",
-    "province": "河北省",
-    "city": "石家庄市"
-  }
-}
-```
-
-- ***投诉预测鉴权***
-
-```http request
-### 入参说明
-### token 从top系统带来的token
-### fromSystem 参数是从top系统带过来的 投诉预测应为 top
-### system 投诉预测固定为 yuce
-
-POST http://192.168.70.125:12128/api/verification
-Content-Type: application/json
-
-{
-"token": "abcdefeee",
-"fromSystem": "top",
-"system": "yuce"
-}
-```
-
-正常返回值
-
-```json
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": {
-    "userId": 3,
-    "userName": "张三",
-    "province": "河北省",
-    "city": "石家庄市"
-  }
-}
-```
-
-***投诉工单流转系统鉴权***
-
-```http request
-### 入参说明
-### token 从top系统带来的token
-### fromSystem 参数是从top系统带过来的 工单流转应为 top
-### system 工单流转固定为 liucheng
-POST http://192.168.70.125:12128/api/verification
-Content-Type: application/json
-
-{
-  "token": "abcdefeee",
-  "fromSystem": "top",
-  "system": "liucheng"
-}
-```
-
-正常返回值
-
-```json
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": {
-    "account": "13111111111",
-    "userId": 3,
-    "userName": "张三"
-  }
-}
-```
-
-***投诉分析系统鉴权***
-
-```http request
-### 入参说明
-### token 从top系统带来的token
-### fromSystem 参数是从top系统带过来的 工单流转应为 top
-### system 投诉分析固定为 fenxi
-POST http://192.168.70.125:12128/api/verification
-Content-Type: application/json
-
-{
-  "token": "abcdefeee",
-  "fromSystem": "top",
-  "system": "fenxi"
-}
-```
-
-正常返回值
-
-````json
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": {
-    "id": 3,
-    "account": "13111111111",
-    "name": "张三",
-    "status": 1,
-    "city": 130100
-  }
-}
-````
-
-## 投诉流程用的其他接口
-
-- ***角色列表接口***
-
-```http request
-### 入参：
-### callType  findRoleList
-### userName  用户名，支持模糊搜索
-POST http://192.168.70.125:12128/rest/flow/api
-Content-Type: application/json
-
-{
-  "callType": "findRoleList",
-  "userName": "张"
-}
-```
-
-正常返回值
-
-```json
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": [
-    {
-      "roleId": 3,
-      "roleName": "管理"
-    },
-    {
-      "roleId": 4,
-      "roleName": "分析组"
-    }
-  ]
-}
-```
-
-- ***用户列表接口***
-
-```http
-### 入参：
-### callType  findToPage
-POST http://133.96.94.176:12128/rest/flow/api
-Content-Type: application/json
-
-{
-  "callType": "findToPage"
-}
-```
-
-正常返回值
-
-```json
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": [
-    {
-      "userId": 1,
-      "loginId": "13222222222",
-      "userName": "张三丰",
-      "mobile": "13222222222",
-      "email": "3453543543",
-      "orgId": "130100"
-    },
-    {
-      "userId": 3,
-      "loginId": "13111111111",
-      "userName": "张三",
-      "mobile": "13111111111",
-      "email": null,
-      "orgId": "130100"
-    },
-    {
-      "userId": 4,
-      "loginId": "13444444444",
-      "userName": "李四喜",
-      "mobile": "13444444444",
-      "email": "@163.com",
-      "orgId": "130200"
-    },
-    {
-      "userId": 2,
-      "loginId": "13333333333",
-      "userName": "李小明",
-      "mobile": "13333333333",
-      "email": null,
-      "orgId": "130100"
-    }
-  ]
-}
-```
-
-- ***根据登录账号获取用户***
-
-```http request
-POST http://192.168.70.125:12128/rest/flow/api
-Content-Type: application/json
-
-{
-  "callType": "getByLoginId",
-  "loginId": "13333333333"
-}
-```
-
-正常返回值
-
-```json
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": {
-    "userId": 2,
-    "loginId": "13333333333",
-    "userName": "李小明",
-    "mobile": "13333333333",
-    "email": null,
-    "orgId": "130100"
-  }
-}
-```
-
-- ***根据用户ID获取用户接口***
-
-```http request
-POST http://192.168.70.125:12128/rest/flow/api
-Content-Type: application/json
-
-{
-  "callType": "get",
-  "userId": "3"
-}
-```
-
-正常返回值
-
-```json
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": {
-    "userId": 3,
-    "loginId": "13111111111",
-    "userName": "张三",
-    "mobile": "13111111111",
-    "email": null,
-    "orgId": "130100"
-  }
-}
-```
-
-- ***根据角色id获取用户***
-
-```http request
-POST http://192.168.70.125:12128/rest/flow/api
-Content-Type: application/json
-
-{
-  "callType": "findRoleIdByUserId",
-  "userId": "3"
-}
-```
-
-正常返回值
-
-```json
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": [
-    4,
-    3
-  ]
-}
-```
-
-- ***根据角色id获取用户***
-
-```http request
-POST http://192.168.70.125:12128/rest/flow/api
-Content-Type: application/json
-
-{
-  "callType": "findUserIdByRoleId",
-  "roleId": "3"
-}
-```
-
-正常返回值
-
-```json
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": [
-    1,
-    3,
-    4
-  ]
-}
-```
-
-- ***多条件搜索用户***
-
-```http request
-### 入参说明：
-### callType findAuthorizedUser
-### roleId 可选 为空字符串与不传这个参数相同处理
-### userName 可选 为空字符串与不传这个参数相同处理  可模糊查询
-### loginId  可选 为空字符串与不传这个参数相同处理
-POST http://192.168.70.125:12128/rest/flow/api
-Content-Type: application/json
-
-{
-  "callType": "findAuthorizedUser",
-  "roleId": "3",
-  "userName": "张",
-  "loginId": "13222222222"
-}
-```
-
-正常返回值
-
-```json
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": [
-    {
-      "userId": 1,
-      "loginId": "13222222222",
-      "userName": "张三丰",
-      "mobile": "13222222222",
-      "email": "3453543543",
-      "orgId": "130100"
-    }
-  ]
-}
-```
-
-```http request
-POST http://192.168.70.125:12128/rest/flow/api
-Content-Type: application/json
-
-{
-  "callType": "findAuthorizedUser",
-  "roleId": "3"
-}
-```
-
-返回值
-
-```json
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": [
-    {
-      "userId": 1,
-      "loginId": "13222222222",
-      "userName": "张三丰",
-      "mobile": "13222222222",
-      "email": "3453543543",
-      "orgId": "130100"
-    },
-    {
-      "userId": 3,
-      "loginId": "13111111111",
-      "userName": "张三",
-      "mobile": "13111111111",
-      "email": null,
-      "orgId": "130100"
-    },
-    {
-      "userId": 4,
-      "loginId": "13444444444",
-      "userName": "李四喜",
-      "mobile": "13444444444",
-      "email": "@163.com",
-      "orgId": "130200"
-    }
-  ]
-}
-```
-
-```http request
-POST http://192.168.70.125:12128/rest/flow/api
-Content-Type: application/json
-
-{
-  "callType": "findAuthorizedUser",
-  "roleId": "3",
-  "userName": "张"
-}
-```
-
-```json
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": [
-    {
-      "userId": 1,
-      "loginId": "13222222222",
-      "userName": "张三丰",
-      "mobile": "13222222222",
-      "email": "3453543543",
-      "orgId": "130100"
-    },
-    {
-      "userId": 3,
-      "loginId": "13111111111",
-      "userName": "张三",
-      "mobile": "13111111111",
-      "email": null,
-      "orgId": "130100"
-    }
-  ]
-}
-```

other/开发阶段/http/acl/T3.http

@@ -1,17 +0,0 @@
-### T3查找不存在用户
-POST http://localhost:8080/rest/t3/api
-Content-Type: application/json
-
-{
-  "loginId": "admin"
-}
-
-### T3查找正常用户
-POST http://localhost:8080/rest/t3/api
-Content-Type: application/json
-
-{
-  "loginId": "admin123"
-}
-
-###

other/开发阶段/http/acl/city.http

@@ -1,4 +0,0 @@
-### T3查找不存在用户
-POST http://localhost:8080/rest/api/city/list
-Content-Type: application/json
-

other/开发阶段/http/acl/flow.http

@@ -1,79 +0,0 @@
-### Flow角色列表接口
-POST http://localhost:8080/rest/flow/api
-Content-Type: application/json
-
-{
-  "userName": "张三",
-  "callType": "findRoleList"
-}
-
-### Flow用户列表接口
-POST http://localhost:8080/rest/flow/api
-Content-Type: application/json
-
-{
-  "callType": "findToPage"
-}
-
-### Flow根据登录帐号获取用户接口
-POST http://localhost:8080/rest/flow/api
-Content-Type: application/json
-
-{
-  "loginId": "admin123",
-  "callType": "getByLoginId"
-}
-
-### Flow根据用户ID获取用户接口
-POST http://localhost:8080/rest/flow/api
-Content-Type: application/json
-
-{
-  "userId": "4",
-  "callType": "get"
-}
-
-### Flow根据用户ID获取角色接口
-POST http://localhost:8080/rest/flow/api
-Content-Type: application/json
-
-{
-  "userId": 4,
-  "callType": "findRoleIdByUserId"
-}
-
-### Flow查找不存在用户
-POST http://localhost:8080/rest/flow/api
-Content-Type: application/json
-
-{
-  "roleId": 1,
-  "callType": "findUserIdByRoleId"
-}
-
-### Flow多条件搜索用户接口 -1
-POST http://localhost:8080/rest/flow/api
-Content-Type: application/json
-
-{
-  "loginId": "admin123",
-  "callType": "findAuthorizedUser"
-}
-
-### Flow多条件搜索用户接口 -2
-POST http://localhost:8080/rest/flow/api
-Content-Type: application/json
-
-{
-  "roleId": 1,
-  "callType": "findAuthorizedUser"
-}
-
-### Flow多条件搜索用户接口 -3
-POST http://localhost:8080/rest/flow/api
-Content-Type: application/json
-
-{
-  "userName": "张三",
-  "callType": "findAuthorizedUser"
-}

other/开发阶段/http/acl/user.http

@@ -1,29 +0,0 @@
-### 查询全部用户
-POST http://localhost:8080/rest/api/userEntity/list
-Content-Type: application/json
-
-### 添加用户-1
-POST http://localhost:8080/rest/api/userEntity/add
-Content-Type: application/json
-
-{
-  "username": "李四",
-  "mobile": "13111112222",
-  "email": "lisi@123.com",
-  "cityId": "130100",
-  "status": 1,
-  "loginId": "lisizhanghao"
-}
-
-### 添加用户-2
-POST http://localhost:8080/rest/api/userEntity/add
-Content-Type: application/json
-
-{
-  "username": "王五",
-  "mobile": "13111112222",
-  "email": "lisi@123.com",
-  "cityId": "130100",
-  "status": 1,
-  "loginId": "wangwuzhanghao"
-}

other/开发阶段/http/portal.http

@@ -1,9 +0,0 @@
-### 这是portal提供给工作流的接口,现在现场的portal是没有的
-POST http://10.107.42.90:12000/portal/rest/flow/api
-Content-Type: application/json
-
-{
-  "callType": "findRoleList"
-}
-
-###

other/开发阶段/sql/login_public_city.sql

@@ -1,3 +0,0 @@
-INSERT INTO public.city (city_id, city_name_zh, city_name_en, ord) VALUES (1, '大萨达撒', '的双方各', 1);
-INSERT INTO public.city (city_id, city_name_zh, city_name_en, ord) VALUES (2, '哈哈哈哈', '略略', 2);
-INSERT INTO public.city (city_id, city_name_zh, city_name_en, ord) VALUES (3, '啦啦啦啦', '打完带我多', 3);

other/开发阶段/sql/login_public_department.sql

@@ -1 +0,0 @@
-INSERT INTO public. (org_id, org_name, create_time, update_time) VALUES ('1', '红红孩儿', '2022-05-12', '2022-05-12');

other/开发阶段/sql/login_public_role.sql

@@ -1,2 +0,0 @@
-INSERT INTO public.role (role_id, role_name, create_time, update_time) VALUES (1, '哈哈', null, null);
-INSERT INTO public.role (role_id, role_name, create_time, update_time) VALUES (2, '略略路', null, null);

other/开发阶段/sql/login_public_table2_user.sql

@@ -1,4 +0,0 @@
-INSERT INTO public.acl_user (user_id, login_name, user_name, phone, email, province, city, county, tsfx_per, tsys_per, tsdp_per, tsgdlz_per, ceate_time, update_time) VALUES (1, '哈哈', '略略', '15341056254', '3453543543', '1', '2', '3', null, null, null, null, null, null);
-INSERT INTO public.table2_user (user_id, login_name, user_name, phone, email, province, city, county, tsfx_per, tsys_per, tsdp_per, tsgdlz_per, ceate_time, update_time) VALUES (2, '嘿额嘿嘿', null, null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO public.table2_user (user_id, login_name, user_name, phone, email, province, city, county, tsfx_per, tsys_per, tsdp_per, tsgdlz_per, ceate_time, update_time) VALUES (3, '哇哈哈哈', null, null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO public.table2_user (user_id, login_name, user_name, phone, email, province, city, county, tsfx_per, tsys_per, tsdp_per, tsgdlz_per, ceate_time, update_time) VALUES (4, '2222', '小明', '15324104774', '@163.com', null, '1', null, null, null, null, null, null, '2022-05-12');

other/开发阶段/sql/login_public_table_user.sql

@@ -1,2 +0,0 @@
-INSERT INTO public.table_user (user_id, login_id, user_name, mobile, email, city_id, status, remark, create_time, update_time) VALUES (1, '11111', null, '15324104774', '@163.com', 1, 1, '谷铜锏', '2022-05-11', '2022-05-11');
-INSERT INTO public.table_user (user_id, login_id, user_name, mobile, email, city_id, status, remark, create_time, update_time) VALUES (2, '2222', null, '15324104774', '@163.com', 1, 1, '谷铜锏', '2022-05-11', '2022-05-11');

other/开发阶段/sql/login_public_user_role.sql

@@ -1,2 +0,0 @@
-INSERT INTO public.user_role (id, user_id, role_id, create_time, update_time) VALUES (1, 1, 1, null, null);
-INSERT INTO public.user_role (id, user_id, role_id, create_time, update_time) VALUES (2, 2, 2, null, null);

other/开发阶段/sql/sql.sql

@@ -1,126 +0,0 @@
-create table city
-(
-    city_id      serial not null
-        constraint city_pk
-            primary key,
-    city_name_zh varchar,
-    city_name_en varchar,
-    ord          integer
-);
-
-alter table city
-    owner to postgres;
-
-
-create table role
-(
-    role_id     serial not null
-        constraint role_pk
-            primary key,
-    role_name   varchar,
-    create_time date,
-    update_time date
-);
-
-alter table role
-    owner to postgres;
-
-create table table_user
-(
-    user_id     serial not null
-        constraint user_pk
-            primary key,
-    login_id    varchar,
-    user_name   varchar,
-    mobile      varchar,
-    email       varchar,
-    city_id     integer,
-    status      integer,
-    remark      varchar,
-    create_time date,
-    update_time date
-);
-
-alter table table_user
-    owner to postgres;
-
-create table user_role
-(
-    id          serial not null
-        constraint user_role_pk
-            primary key,
-    user_id     integer,
-    role_id     integer,
-    create_time date,
-    update_time date
-);
-
-alter table user_role
-    owner to postgres;
-
-create table table2_user
-(
-    login_id    serial not null
-        constraint table2_user_pk
-            primary key,
-    login_name  varchar,
-    user_name   varchar,
-    phone       varchar,
-    email       varchar,
-    province    varchar,
-    city        varchar,
-    county      varchar,
-    tsfx_per    integer,
-    tsys_per    integer,
-    tsdp_per    integer,
-    tsgdlz_per  integer,
-    ceate_time  date,
-    update_time date
-);
-
-comment on column table2_user.login_id is '主键自增';
-
-comment on column table2_user.login_name is '登录用户名';
-
-comment on column table2_user.user_name is '用户姓名';
-
-comment on column table2_user.phone is '手机号码';
-
-comment on column table2_user.email is '邮箱';
-
-comment on column table2_user.province is '归属省份';
-
-comment on column table2_user.city is '归属地市';
-
-comment on column table2_user.county is '归属区县';
-
-comment on column table2_user.tsfx_per is ' 投诉工单分析权限   0,1,2 	0无权限	1地市级	2省级
-';
-
-comment on column table2_user.tsys_per is '投诉预测权限     0,1,2	0无权限	1地市级	2省级
-';
-
-comment on column table2_user.tsdp_per is '是否具备投诉大屏权限   0,1,2	0无权限	1地市级	2省级
-';
-
-comment on column table2_user.tsgdlz_per is '是否投诉工单流转流程权限   0,1	0否	1有	
-';
-
-comment on column table2_user.ceate_time is '用户创建时间';
-
-comment on column table2_user.update_time is '用户修改时间';
-
-alter table table2_user
-    owner to postgres;
-
-create table role_middle
-(
-    role_middle_id serial not null
-        constraint role_middle_pk
-            primary key,
-    user_id        integer,
-    role_id        integer
-);
-
-alter table role_middle
-    owner to postgres;

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

@@ -1,12 +1,14 @@
 package com.nokia.pojo;
 
+import java.io.Serializable;
+
 import lombok.Data;
 
 /*
  * 行政区划
  */
 @Data
-public class Area {
+public class Area implements Serializable {
     // 每个区域会有1个唯一Id
     private Integer areaId;
     // 行政区中文名

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

@@ -16,6 +16,7 @@ public class User implements Serializable {
     private String userName;
     private String phone;
     private String email;
+    private String org;
     // 所属省
     private Integer provinceId;
     @TableField(exist = false)

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

@@ -19,7 +19,7 @@ public class HeidiankuUserVo {
     // 省
     private String province;
     // 归属地市
-    // private String belongCity;
+    private String belongCity;
     // 赋权地市
     private String city;
     // 赋权信息
@@ -29,7 +29,7 @@ public class HeidiankuUserVo {
         this.loginName = userEntity.getLoginName();
         this.userName = userEntity.getUserName();
         this.province = userEntity.getProvince().getAreaName();
-        // this.belongCity = userEntity.getCity().getCityNameZh();
+        this.belongCity = userEntity.getCity().getAreaName();
         List<String> roles = new ArrayList<>();
         userEntity.getRoles().forEach(role -> {
             if ("heidianku".equals(role.getSystem())) {

src/main/resources/application.properties

@@ -8,9 +8,9 @@ logging.level.com.nokia=debug
 
 # 测试环境数据库配置
 spring.datasource.driver-class-name=org.postgresql.Driver
-spring.datasource.url=jdbc:postgresql://localhost:5432/postgres
-spring.datasource.username=postgres
-spring.datasource.password=fantuan1985
+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