feat: parent改为spring-boot-starter-parent

doc/开发测试文档/接口开发/acl提供给web的接口.md

@@ -1,1639 +0,0 @@
-# acl提供给web的接口
-
-**测试环境**: http://192.168.50.3:12128
-
-**正式环境**: http://192.168.70.125:12128
-
-[TOC]
-
-# 用户
-
-
-## 修改用户
-
-
-**接口地址**:`/api/web/user/update`
-
-
-**请求方式**:`POST`
-
-
-**请求数据类型**:`application/x-www-form-urlencoded,application/json`
-
-
-**响应数据类型**:`*/*`
-
-
-**接口描述**:
-
-
-**请求示例**:
-
-
-```javascript
-{
-  "email": "",
-  "userId": 0,
-  "roles": [
-    {
-      "roleId": 0,
-      "cityId": 0,
-      "roleName": "工单查询",
-      "cityName": "石家庄市",
-      "functionId": 0
-    }
-  ]
-}
-```
-
-
-**请求参数**:
-
-
-| 参数名称 | 参数说明 | 请求类型    | 是否必须 | 数据类型 | schema |
-| -------- | -------- | ----- | -------- | -------- | ------ |
-|updateUserDto|UpdateUserDto|body|true|UpdateUserDto|UpdateUserDto|
-|  email|邮箱||false|string||
-|  userId|用户id||true|integer(int32)||
-|  roles|角色列表||false|array|AddUserRoleDto|
-|    roleId|角色id||true|integer||
-|    cityId|地市id||true|integer||
-|    roleName|角色名称||true|string||
-|    cityName|地市名称||true|string||
-|    functionId|功能id||false|integer||
-
-
-**响应状态**:
-
-
-| 状态码 | 说明 | schema |
-| -------- | -------- | ----- | 
-|default|default response|RObject|
-|无法修改非本地市用户|{"success":false,"code":0,"message":"无法修改非本地市用户","data":null}||
-
-
-**响应参数**:
-
-
-| 参数名称 | 参数说明 | 类型 | schema |
-| -------- | -------- | ----- |----- | 
-|success|是否成功|boolean||
-|code|业务码|integer(int32)|integer(int32)|
-|message|提示信息|string||
-|data|数据|object||
-
-
-**响应示例**:
-```javascript
-{
-	"success": true,
-	"code": 0,
-	"message": "成功",
-	"data": {}
-}
-```
-
-
-## 查询用户列表接口
-
-
-**接口地址**:`/api/web/user/list`
-
-
-**请求方式**:`POST`
-
-
-**请求数据类型**:`application/x-www-form-urlencoded,application/json`
-
-
-**响应数据类型**:`*/*`
-
-
-**接口描述**:
-
-
-**请求示例**:
-
-
-```javascript
-{
-  "current": 1,
-  "pageSize": 10,
-  "loginName": "zhangsan",
-  "userName": "张三",
-  "org": "河北",
-  "areaId": -1
-}
-```
-
-
-**请求参数**:
-
-
-| 参数名称 | 参数说明 | 请求类型    | 是否必须 | 数据类型 | schema |
-| -------- | -------- | ----- | -------- | -------- | ------ |
-|listUserDto|ListUserDto|body|true|ListUserDto|ListUserDto|
-|  current|页码，最小值1||true|integer(int32)||
-|  pageSize|每页个数，最小值1||true|integer(int32)||
-|  loginName|账号||false|string||
-|  userName|用户名||false|string||
-|  org|组织||false|string||
-|  areaId|地区id||false|integer(int32)||
-
-
-**响应状态**:
-
-
-| 状态码 | 说明 | schema |
-| -------- | -------- | ----- | 
-|200|OK|RPageVoListUserVo|
-
-
-**响应参数**:
-
-
-| 参数名称 | 参数说明 | 类型 | schema |
-| -------- | -------- | ----- |----- | 
-|success|是否成功|boolean||
-|code|业务码|integer(int32)|integer(int32)|
-|message|提示信息|string||
-|data||PageVoListUserVo|PageVoListUserVo|
-|  total|数据总条数|integer(int64)||
-|  list|数据列表|array|ListUserVo|
-|    userId|用户id|integer||
-|    loginName|账号|string||
-|    userName|用户名|string||
-|    phone|手机号|string||
-|    email|邮箱|string||
-|    org|河北省分公司云网运营中心|string||
-|    provinceName|省份名称|string||
-|    cityName|地市名称|string||
-|    areaName|区县名称|string||
-
-
-**响应示例**:
-```javascript
-{
-	"success": true,
-	"code": 0,
-	"message": "成功",
-	"data": {
-		"total": 1000,
-		"list": [
-			{
-				"userId": 0,
-				"loginName": "zhangsan",
-				"userName": "张三",
-				"phone": "12345678901",
-				"email": "",
-				"org": "",
-				"provinceName": "河北省",
-				"cityName": "石家庄市",
-				"areaName": "长安区"
-			}
-		]
-	}
-}
-```
-
-
-## 查询top用户信息
-
-
-**接口地址**:`/api/web/user/getTopUserByLoginName`
-
-
-**请求方式**:`POST`
-
-
-**请求数据类型**:`application/x-www-form-urlencoded,application/json`
-
-
-**响应数据类型**:`*/*`
-
-
-**接口描述**:
-
-
-**请求示例**:
-
-
-```javascript
-{
-  "loginName": "zhangsan"
-}
-```
-
-
-**请求参数**:
-
-
-| 参数名称 | 参数说明 | 请求类型    | 是否必须 | 数据类型 | schema |
-| -------- | -------- | ----- | -------- | -------- | ------ |
-|topUserDto|TopUserDto|body|true|TopUserDto|TopUserDto|
-|  loginName|账号||true|string||
-
-
-**响应状态**:
-
-
-| 状态码 | 说明 | schema |
-| -------- | -------- | ----- | 
-|default|default response|RTopUserVo|
-|没有查询到top用户信息|{"success":false,"code":0,"message":"没有查询到top用户信息","data":null}||
-|非本地市用户|{"success":false,"code":0,"message":"非本地市用户","data":null}||
-|用户已存在系统中|{"success":false,"code":0,"message":"用户已存在系统中","data":null}||
-
-
-**响应参数**:
-
-
-| 参数名称 | 参数说明 | 类型 | schema |
-| -------- | -------- | ----- |----- | 
-|success|是否成功|boolean||
-|code|业务码|integer(int32)|integer(int32)|
-|message|提示信息|string||
-|data||TopUserVo|TopUserVo|
-|  loginName|账号|string||
-|  userName|用户名|string||
-|  phone|手机号|string||
-|  orgName|组织|string||
-|  provinceId|省份id|integer(int32)||
-|  cityId|地市id|integer(int32)||
-|  areaId|区县id|integer(int32)||
-|  provinceName|省份名称|string||
-|  cityName|地市名称|string||
-|  areaName|区县名称|string||
-
-
-**响应示例**:
-```javascript
-{
-	"success": true,
-	"code": 0,
-	"message": "成功",
-	"data": {
-		"loginName": "zhangsan",
-		"userName": "张三",
-		"phone": "12345678901",
-		"orgName": "河北省分公司云网运营中心",
-		"provinceId": 0,
-		"cityId": 0,
-		"areaId": 0,
-		"provinceName": "河北省",
-		"cityName": "石家庄市",
-		"areaName": "长安区"
-	}
-}
-```
-
-
-## 查询用户权限
-
-
-**接口地址**:`/api/web/user/getRoleByLoginName`
-
-
-**请求方式**:`POST`
-
-
-**请求数据类型**:`application/x-www-form-urlencoded,application/json`
-
-
-**响应数据类型**:`*/*`
-
-
-**接口描述**:
-
-
-**请求示例**:
-
-
-```javascript
-{
-  "loginName": "zhangsan"
-}
-```
-
-
-**请求参数**:
-
-
-| 参数名称 | 参数说明 | 请求类型    | 是否必须 | 数据类型 | schema |
-| -------- | -------- | ----- | -------- | -------- | ------ |
-|getRoleByLoginNameDto|GetRoleByLoginNameDto|body|true|GetRoleByLoginNameDto|GetRoleByLoginNameDto|
-|  loginName|账号||true|string||
-
-
-**响应状态**:
-
-
-| 状态码 | 说明 | schema |
-| -------- | -------- | ----- | 
-|用户不存在|{"success":false,"code":0,"message":"用户不存在","data":null}||
-|default|default response|RListGetRoleByLoginNameVo|
-|非本地市用户|{"success":false,"code":0,"message":"非本地市用户","data":null}||
-
-
-**响应参数**:
-
-
-| 参数名称 | 参数说明 | 类型 | schema |
-| -------- | -------- | ----- |----- | 
-|success|是否成功|boolean||
-|code|业务码|integer(int32)|integer(int32)|
-|message|提示信息|string||
-|data|数据|array|GetRoleByLoginNameVo|
-|  roleId|角色id|integer(int32)||
-|  roleName|角色名称|string||
-|  system|系统id|string||
-|  systemName|系统名称|string||
-|  cityId|地区id|integer(int32)||
-|  cityName|地市名称|string||
-
-
-**响应示例**:
-```javascript
-{
-	"success": true,
-	"code": 0,
-	"message": "成功",
-	"data": [
-		{
-			"roleId": 0,
-			"roleName": "工单查询",
-			"system": "flow",
-			"systemName": "流程",
-			"cityId": 0,
-			"cityName": "石家庄市"
-		}
-	]
-}
-```
-
-
-## 查询用户详情
-
-
-**接口地址**:`/api/web/user/detail`
-
-
-**请求方式**:`POST`
-
-
-**请求数据类型**:`application/x-www-form-urlencoded,application/json`
-
-
-**响应数据类型**:`*/*`
-
-
-**接口描述**:
-
-
-**请求示例**:
-
-
-```javascript
-{
-  "userId": 0
-}
-```
-
-
-**请求参数**:
-
-
-| 参数名称 | 参数说明 | 请求类型    | 是否必须 | 数据类型 | schema |
-| -------- | -------- | ----- | -------- | -------- | ------ |
-|getUserDetailDto|GetUserDetailDto|body|true|GetUserDetailDto|GetUserDetailDto|
-|  userId|用户id||true|integer(int32)||
-
-
-**响应状态**:
-
-
-| 状态码 | 说明 | schema |
-| -------- | -------- | ----- | 
-|200|OK|RGetUserDetailVo|
-
-
-**响应参数**:
-
-
-| 参数名称 | 参数说明 | 类型 | schema |
-| -------- | -------- | ----- |----- | 
-|success|是否成功|boolean||
-|code|业务码|integer(int32)|integer(int32)|
-|message|提示信息|string||
-|data||GetUserDetailVo|GetUserDetailVo|
-|  userId|用户id|integer(int32)||
-|  loginName|账号|string||
-|  userName|用户名|string||
-|  phone|手机号|string||
-|  orgName|组织|string||
-|  provinceName|省份名称|string||
-|  cityName|地市名称|string||
-|  areaName|区县名称|string||
-|  email|邮箱|string||
-|  roles|角色列表|array|GetUserDetailRoleVo|
-|    roleId|角色id|integer||
-|    cityId|地区id|integer||
-|    roleName|角色名称|string||
-|    cityName|地市名称|string||
-|    system|系统id|string||
-|    systemName|系统名称|string||
-
-
-**响应示例**:
-```javascript
-{
-	"success": true,
-	"code": 0,
-	"message": "成功",
-	"data": {
-		"userId": 0,
-		"loginName": "zhangsan",
-		"userName": "张三",
-		"phone": "12345678901",
-		"orgName": "河北省分公司云网运营中心",
-		"provinceName": "河北省",
-		"cityName": "石家庄市",
-		"areaName": "长安区",
-		"email": "",
-		"roles": [
-			{
-				"roleId": 0,
-				"cityId": 0,
-				"roleName": "工单查询",
-				"cityName": "石家庄市",
-				"system": "flow",
-				"systemName": "流程"
-			}
-		]
-	}
-}
-```
-
-
-## 删除用户
-
-
-**接口地址**:`/api/web/user/del`
-
-
-**请求方式**:`POST`
-
-
-**请求数据类型**:`application/x-www-form-urlencoded,application/json`
-
-
-**响应数据类型**:`*/*`
-
-
-**接口描述**:
-
-
-**请求示例**:
-
-
-```javascript
-{
-  "userIds": []
-}
-```
-
-
-**请求参数**:
-
-
-| 参数名称 | 参数说明 | 请求类型    | 是否必须 | 数据类型 | schema |
-| -------- | -------- | ----- | -------- | -------- | ------ |
-|deleteUserDto|DeleteUserDto|body|true|DeleteUserDto|DeleteUserDto|
-|  userIds|用户id列表||true|array|integer(int32)|
-
-
-**响应状态**:
-
-
-| 状态码 | 说明 | schema |
-| -------- | -------- | ----- | 
-|无法删除非本地市用户|{"success":false,"code":0,"message":"无法删除非本地市用户","data":null}||
-|default|default response|RObject|
-
-
-**响应参数**:
-
-
-| 参数名称 | 参数说明 | 类型 | schema |
-| -------- | -------- | ----- |----- | 
-|success|是否成功|boolean||
-|code|业务码|integer(int32)|integer(int32)|
-|message|提示信息|string||
-|data|数据|object||
-
-
-**响应示例**:
-```javascript
-{
-	"success": true,
-	"code": 0,
-	"message": "成功",
-	"data": {}
-}
-```
-
-
-## 批量复制权限
-
-
-**接口地址**:`/api/web/user/copyRole`
-
-
-**请求方式**:`POST`
-
-
-**请求数据类型**:`application/x-www-form-urlencoded,application/json`
-
-
-**响应数据类型**:`*/*`
-
-
-**接口描述**:
-
-
-**请求示例**:
-
-
-```javascript
-{
-  "userIds": [],
-  "roles": [
-    {
-      "roleId": 0,
-      "cityId": 0,
-      "roleName": "工单查询",
-      "cityName": "石家庄市",
-      "functionId": 0
-    }
-  ]
-}
-```
-
-
-**请求参数**:
-
-
-| 参数名称 | 参数说明 | 请求类型    | 是否必须 | 数据类型 | schema |
-| -------- | -------- | ----- | -------- | -------- | ------ |
-|copyRolesDto|CopyRolesDto|body|true|CopyRolesDto|CopyRolesDto|
-|  userIds|用户id列表||true|array|integer(int32)|
-|  roles|角色列表||true|array|AddUserRoleDto|
-|    roleId|角色id||true|integer||
-|    cityId|地市id||true|integer||
-|    roleName|角色名称||true|string||
-|    cityName|地市名称||true|string||
-|    functionId|功能id||false|integer||
-
-
-**响应状态**:
-
-
-| 状态码 | 说明 | schema |
-| -------- | -------- | ----- | 
-|default|default response|RObject|
-|无法修改非本地市用户|{"success":false,"code":0,"message":"无法修改非本地市用户","data":null}||
-
-
-**响应参数**:
-
-
-| 参数名称 | 参数说明 | 类型 | schema |
-| -------- | -------- | ----- |----- | 
-|success|是否成功|boolean||
-|code|业务码|integer(int32)|integer(int32)|
-|message|提示信息|string||
-|data|数据|object||
-
-
-**响应示例**:
-```javascript
-{
-	"success": true,
-	"code": 0,
-	"message": "成功",
-	"data": {}
-}
-```
-
-
-## 添加用户
-
-
-**接口地址**:`/api/web/user/add`
-
-
-**请求方式**:`POST`
-
-
-**请求数据类型**:`application/x-www-form-urlencoded,application/json`
-
-
-**响应数据类型**:`*/*`
-
-
-**接口描述**:
-
-
-**请求示例**:
-
-
-```javascript
-{
-  "loginName": "zhangsan",
-  "email": "",
-  "roles": [
-    {
-      "roleId": 0,
-      "cityId": 0,
-      "roleName": "工单查询",
-      "cityName": "石家庄市",
-      "functionId": 0
-    }
-  ]
-}
-```
-
-
-**请求参数**:
-
-
-| 参数名称 | 参数说明 | 请求类型    | 是否必须 | 数据类型 | schema |
-| -------- | -------- | ----- | -------- | -------- | ------ |
-|addUserDto|AddUserDto|body|true|AddUserDto|AddUserDto|
-|  loginName|账号||true|string||
-|  email|邮箱||false|string||
-|  roles|角色列表||false|array|AddUserRoleDto|
-|    roleId|角色id||true|integer||
-|    cityId|地市id||true|integer||
-|    roleName|角色名称||true|string||
-|    cityName|地市名称||true|string||
-|    functionId|功能id||false|integer||
-
-
-**响应状态**:
-
-
-| 状态码 | 说明 | schema |
-| -------- | -------- | ----- | 
-|无法添加非本地市用户|{"success":false,"code":0,"message":"无法添加非本地市用户","data":null}||
-|default|default response|RObject|
-|用户已存在系统中|{"success":false,"code":0,"message":"用户已存在系统中","data":null}||
-
-
-**响应参数**:
-
-
-| 参数名称 | 参数说明 | 类型 | schema |
-| -------- | -------- | ----- |----- | 
-|success|是否成功|boolean||
-|code|业务码|integer(int32)|integer(int32)|
-|message|提示信息|string||
-|data|数据|object||
-
-
-**响应示例**:
-```javascript
-{
-	"success": true,
-	"code": 0,
-	"message": "成功",
-	"data": {}
-}
-```
-
-
-# 系统
-
-
-## 查询系统列表
-
-
-**接口地址**:`/api/web/system/list`
-
-
-**请求方式**:`POST`
-
-
-**请求数据类型**:`application/x-www-form-urlencoded`
-
-
-**响应数据类型**:`*/*`
-
-
-**接口描述**:
-
-
-**请求参数**:
-
-
-暂无
-
-
-**响应状态**:
-
-
-| 状态码 | 说明 | schema |
-| -------- | -------- | ----- | 
-|200|OK|RListAclSystem|
-
-
-**响应参数**:
-
-
-| 参数名称 | 参数说明 | 类型 | schema |
-| -------- | -------- | ----- |----- | 
-|success|是否成功|boolean||
-|code|业务码|integer(int32)|integer(int32)|
-|message|提示信息|string||
-|data|数据|array|AclSystem|
-|  system|系统id|string||
-|  systemName|系统名称|string||
-
-
-**响应示例**:
-```javascript
-{
-	"success": true,
-	"code": 0,
-	"message": "成功",
-	"data": [
-		{
-			"system": "flow",
-			"systemName": "流程"
-		}
-	]
-}
-```
-
-
-# 角色
-
-
-## 查询角色说明列表
-
-
-**接口地址**:`/api/web/role/list`
-
-
-**请求方式**:`POST`
-
-
-**请求数据类型**:`application/x-www-form-urlencoded,application/json`
-
-
-**响应数据类型**:`*/*`
-
-
-**接口描述**:
-
-
-**请求示例**:
-
-
-```javascript
-{
-  "current": 1,
-  "pageSize": 10,
-  "roleName": "工单",
-  "system": "flow"
-}
-```
-
-
-**请求参数**:
-
-
-| 参数名称 | 参数说明 | 请求类型    | 是否必须 | 数据类型 | schema |
-| -------- | -------- | ----- | -------- | -------- | ------ |
-|listRoleDto|ListRoleDto|body|true|ListRoleDto|ListRoleDto|
-|  current|页码，最小值1||true|integer(int32)||
-|  pageSize|每页个数，最小值1||true|integer(int32)||
-|  roleName|角色名称||false|string||
-|  system|系统id||false|string||
-
-
-**响应状态**:
-
-
-| 状态码 | 说明 | schema |
-| -------- | -------- | ----- | 
-|200|OK|RPageVoListRoleVo|
-
-
-**响应参数**:
-
-
-| 参数名称 | 参数说明 | 类型 | schema |
-| -------- | -------- | ----- |----- | 
-|success|是否成功|boolean||
-|code|业务码|integer(int32)|integer(int32)|
-|message|提示信息|string||
-|data||PageVoListRoleVo|PageVoListRoleVo|
-|  total|数据总条数|integer(int64)||
-|  list|数据列表|array|ListRoleVo|
-|    roleName|角色名称|string||
-|    system|系统id|string||
-|    systemName|系统名称|string||
-|    roleDescription|角色说明|string||
-
-
-**响应示例**:
-```javascript
-{
-	"success": true,
-	"code": 0,
-	"message": "成功",
-	"data": {
-		"total": 1000,
-		"list": [
-			{
-				"roleName": "工单查询",
-				"system": "flow",
-				"systemName": "流程",
-				"roleDescription": ""
-			}
-		]
-	}
-}
-```
-
-
-## 查询所有角色
-
-
-**接口地址**:`/api/web/role/all`
-
-
-**请求方式**:`POST`
-
-
-**请求数据类型**:`application/x-www-form-urlencoded`
-
-
-**响应数据类型**:`*/*`
-
-
-**接口描述**:
-
-
-**请求参数**:
-
-
-暂无
-
-
-**响应状态**:
-
-
-| 状态码 | 说明 | schema |
-| -------- | -------- | ----- | 
-|200|OK|RListAllRoleVo|
-
-
-**响应参数**:
-
-
-| 参数名称 | 参数说明 | 类型 | schema |
-| -------- | -------- | ----- |----- | 
-|success|是否成功|boolean||
-|code|业务码|integer(int32)|integer(int32)|
-|message|提示信息|string||
-|data|数据|array|AllRoleVo|
-|  roleId|角色id|integer(int32)||
-|  functionId|功能id|integer(int32)||
-|  roleName|角色名称|string||
-|  system|系统id|string||
-|  systemName|系统名称|string||
-
-
-**响应示例**:
-```javascript
-{
-	"success": true,
-	"code": 0,
-	"message": "成功",
-	"data": [
-		{
-			"roleId": 0,
-			"functionId": 0,
-			"roleName": "工单查询",
-			"system": "flow",
-			"systemName": "流程"
-		}
-	]
-}
-```
-
-
-# 日志
-
-
-## 查询登录日志列表
-
-
-**接口地址**:`/api/web/log/verificationLog/list`
-
-
-**请求方式**:`POST`
-
-
-**请求数据类型**:`application/x-www-form-urlencoded,application/json`
-
-
-**响应数据类型**:`*/*`
-
-
-**接口描述**:
-
-
-**请求示例**:
-
-
-```javascript
-{
-  "current": 1,
-  "pageSize": 10,
-  "userId": 0,
-  "loginName": "zhangsan",
-  "userName": "张三",
-  "startTime": "",
-  "endTime": "",
-  "system": "flow",
-  "cityId": 0
-}
-```
-
-
-**请求参数**:
-
-
-| 参数名称 | 参数说明 | 请求类型    | 是否必须 | 数据类型 | schema |
-| -------- | -------- | ----- | -------- | -------- | ------ |
-|listVerificationLogDto|ListVerificationLogDto|body|true|ListVerificationLogDto|ListVerificationLogDto|
-|  current|页码，最小值1||true|integer(int32)||
-|  pageSize|每页个数，最小值1||true|integer(int32)||
-|  userId|用户id||false|integer(int32)||
-|  loginName|账号||false|string||
-|  userName|用户名||false|string||
-|  startTime|起始时间||false|string(date-time)||
-|  endTime|截至时间||false|string(date-time)||
-|  system|系统id||false|string||
-|  cityId|地区id||false|integer(int32)||
-
-
-**响应状态**:
-
-
-| 状态码 | 说明 | schema |
-| -------- | -------- | ----- | 
-|200|OK|RPageVoListVerificationLogVo|
-
-
-**响应参数**:
-
-
-| 参数名称 | 参数说明 | 类型 | schema |
-| -------- | -------- | ----- |----- | 
-|success|是否成功|boolean||
-|code|业务码|integer(int32)|integer(int32)|
-|message|提示信息|string||
-|data||PageVoListVerificationLogVo|PageVoListVerificationLogVo|
-|  total|数据总条数|integer(int64)||
-|  list|数据列表|array|ListVerificationLogVo|
-|    userId|用户id|integer||
-|    loginName|账号|string||
-|    userName|用户名|string||
-|    cityName|地市名称|string||
-|    systemName|系统名称|string||
-|    loginTime||string||
-
-
-**响应示例**:
-```javascript
-{
-	"success": true,
-	"code": 0,
-	"message": "成功",
-	"data": {
-		"total": 1000,
-		"list": [
-			{
-				"userId": 0,
-				"loginName": "zhangsan",
-				"userName": "张三",
-				"cityName": "石家庄市",
-				"systemName": "流程",
-				"loginTime": ""
-			}
-		]
-	}
-}
-```
-
-
-## 导出登录日志
-
-
-**接口地址**:`/api/web/log/verificationLog/export`
-
-
-**请求方式**:`POST`
-
-
-**请求数据类型**:`application/x-www-form-urlencoded,application/json`
-
-
-**响应数据类型**:`*/*`
-
-
-**接口描述**:
-
-
-**请求示例**:
-
-
-```javascript
-{
-  "userId": 0,
-  "loginName": "zhangsan",
-  "userName": "张三",
-  "operationName": "修改用户",
-  "startTime": "",
-  "endTime": "",
-  "system": "flow",
-  "cityId": 0
-}
-```
-
-
-**请求参数**:
-
-
-| 参数名称 | 参数说明 | 请求类型    | 是否必须 | 数据类型 | schema |
-| -------- | -------- | ----- | -------- | -------- | ------ |
-|exportVerificationLogDto|ExportVerificationLogDto|body|true|ExportVerificationLogDto|ExportVerificationLogDto|
-|  userId|用户id||false|integer(int32)||
-|  loginName|账号||false|string||
-|  userName|用户名||false|string||
-|  operationName|操作名称||false|string||
-|  startTime|||false|string(date-time)||
-|  endTime|||false|string(date-time)||
-|  system|系统id||false|string||
-|  cityId|地区id||false|integer(int32)||
-
-
-**响应状态**:
-
-
-| 状态码 | 说明 | schema |
-| -------- | -------- | ----- | 
-|200|OK|RExportVerificationLogVo|
-
-
-**响应参数**:
-
-
-| 参数名称 | 参数说明 | 类型 | schema |
-| -------- | -------- | ----- |----- | 
-|success|是否成功|boolean||
-|code|业务码|integer(int32)|integer(int32)|
-|message|提示信息|string||
-|data||ExportVerificationLogVo|ExportVerificationLogVo|
-|  url|导出文件链接|string||
-
-
-**响应示例**:
-```javascript
-{
-	"success": true,
-	"code": 0,
-	"message": "成功",
-	"data": {
-		"url": ""
-	}
-}
-```
-
-
-## 查询操作日志列表
-
-
-**接口地址**:`/api/web/log/operationLog/list`
-
-
-**请求方式**:`POST`
-
-
-**请求数据类型**:`application/x-www-form-urlencoded,application/json`
-
-
-**响应数据类型**:`*/*`
-
-
-**接口描述**:
-
-
-**请求示例**:
-
-
-```javascript
-{
-  "current": 1,
-  "pageSize": 10,
-  "operatorId": 0,
-  "operatorAccount": "zhangsan",
-  "operatorName": "张三",
-  "operationName": "修改用户",
-  "startTime": "",
-  "endTime": ""
-}
-```
-
-
-**请求参数**:
-
-
-| 参数名称 | 参数说明 | 请求类型    | 是否必须 | 数据类型 | schema |
-| -------- | -------- | ----- | -------- | -------- | ------ |
-|listOperationLogDto|ListOperationLogDto|body|true|ListOperationLogDto|ListOperationLogDto|
-|  current|页码，最小值1||true|integer(int32)||
-|  pageSize|每页个数，最小值1||true|integer(int32)||
-|  operatorId|用户id||false|integer(int32)||
-|  operatorAccount|账号||false|string||
-|  operatorName|用户名||false|string||
-|  operationName|操作名称||false|string||
-|  startTime|起始时间||false|string(date-time)||
-|  endTime|截至时间||false|string(date-time)||
-
-
-**响应状态**:
-
-
-| 状态码 | 说明 | schema |
-| -------- | -------- | ----- | 
-|200|OK|RPageVoListOperationLogVo|
-
-
-**响应参数**:
-
-
-| 参数名称 | 参数说明 | 类型 | schema |
-| -------- | -------- | ----- |----- | 
-|success|是否成功|boolean||
-|code|业务码|integer(int32)|integer(int32)|
-|message|提示信息|string||
-|data||PageVoListOperationLogVo|PageVoListOperationLogVo|
-|  total|数据总条数|integer(int64)||
-|  list|数据列表|array|ListOperationLogVo|
-|    operatorId|用户id|integer||
-|    operatorAccount|账号|string||
-|    operatorName|用户名|string||
-|    operationName|操作名称|string||
-|    operationContent|操作内容|string||
-|    operationTime||string||
-
-
-**响应示例**:
-```javascript
-{
-	"success": true,
-	"code": 0,
-	"message": "成功",
-	"data": {
-		"total": 1000,
-		"list": [
-			{
-				"operatorId": 0,
-				"operatorAccount": "zhangsan",
-				"operatorName": "张三",
-				"operationName": "修改用户",
-				"operationContent": "",
-				"operationTime": ""
-			}
-		]
-	}
-}
-```
-
-
-## 导出操作日志
-
-
-**接口地址**:`/api/web/log/operationLog/export`
-
-
-**请求方式**:`POST`
-
-
-**请求数据类型**:`application/x-www-form-urlencoded,application/json`
-
-
-**响应数据类型**:`*/*`
-
-
-**接口描述**:
-
-
-**请求示例**:
-
-
-```javascript
-{
-  "operatorId": 0,
-  "operatorAccount": "zhangsan",
-  "operatorName": "张三",
-  "operationName": "修改用户",
-  "startTime": "",
-  "endTime": ""
-}
-```
-
-
-**请求参数**:
-
-
-| 参数名称 | 参数说明 | 请求类型    | 是否必须 | 数据类型 | schema |
-| -------- | -------- | ----- | -------- | -------- | ------ |
-|exportOperationLogDto|ExportOperationLogDto|body|true|ExportOperationLogDto|ExportOperationLogDto|
-|  operatorId|用户id||false|integer(int32)||
-|  operatorAccount|账号||false|string||
-|  operatorName|用户名||false|string||
-|  operationName|操作名称||false|string||
-|  startTime|||false|string(date-time)||
-|  endTime|||false|string(date-time)||
-
-
-**响应状态**:
-
-
-| 状态码 | 说明 | schema |
-| -------- | -------- | ----- | 
-|200|OK|RExportOperationLogVo|
-
-
-**响应参数**:
-
-
-| 参数名称 | 参数说明 | 类型 | schema |
-| -------- | -------- | ----- |----- | 
-|success|是否成功|boolean||
-|code|业务码|integer(int32)|integer(int32)|
-|message|提示信息|string||
-|data||ExportOperationLogVo|ExportOperationLogVo|
-|  url|导出文件链接|string||
-
-
-**响应示例**:
-```javascript
-{
-	"success": true,
-	"code": 0,
-	"message": "成功",
-	"data": {
-		"url": ""
-	}
-}
-```
-
-
-# 功能
-
-
-## 查询模块列表
-
-
-**接口地址**:`/api/web/function/list`
-
-
-**请求方式**:`POST`
-
-
-**请求数据类型**:`application/x-www-form-urlencoded,application/json`
-
-
-**响应数据类型**:`*/*`
-
-
-**接口描述**:
-
-
-**请求示例**:
-
-
-```javascript
-{
-  "current": 1,
-  "pageSize": 10,
-  "functionName": "工单",
-  "client": 0,
-  "system": "flow"
-}
-```
-
-
-**请求参数**:
-
-
-| 参数名称 | 参数说明 | 请求类型    | 是否必须 | 数据类型 | schema |
-| -------- | -------- | ----- | -------- | -------- | ------ |
-|listFunctionDto|ListFunctionDto|body|true|ListFunctionDto|ListFunctionDto|
-|  current|页码，最小值1||true|integer(int32)||
-|  pageSize|每页个数，最小值1||true|integer(int32)||
-|  functionName|模块名称||false|string||
-|  client|客户端id||false|integer(int32)||
-|  system|系统id||false|string||
-
-
-**响应状态**:
-
-
-| 状态码 | 说明 | schema |
-| -------- | -------- | ----- | 
-|200|OK|RPageVoListFunctionVo|
-
-
-**响应参数**:
-
-
-| 参数名称 | 参数说明 | 类型 | schema |
-| -------- | -------- | ----- |----- | 
-|success|是否成功|boolean||
-|code|业务码|integer(int32)|integer(int32)|
-|message|提示信息|string||
-|data||PageVoListFunctionVo|PageVoListFunctionVo|
-|  total|数据总条数|integer(int64)||
-|  list|数据列表|array|ListFunctionVo|
-|    functionId|模块id|integer||
-|    functionName|模块名称|string||
-|    systemName|系统名称|string||
-|    clientName|客户端名称|string||
-|    functionDescription|模块描述|string||
-|    appPriority|app显示优先级|integer||
-|    webPriority|web显示优先级|integer||
-|    webUrl|web链接|string||
-|    appUrl|app链接|string||
-|    webIcon|web图标|string||
-|    appIcon|app图标|string||
-
-
-**响应示例**:
-```javascript
-{
-	"success": true,
-	"code": 0,
-	"message": "成功",
-	"data": {
-		"total": 1000,
-		"list": [
-			{
-				"functionId": 0,
-				"functionName": "工单查询",
-				"systemName": "流程",
-				"clientName": "app",
-				"functionDescription": "",
-				"appPriority": 0,
-				"webPriority": 0,
-				"webUrl": "",
-				"appUrl": "",
-				"webIcon": "",
-				"appIcon": ""
-			}
-		]
-	}
-}
-```
-
-
-# 地区
-
-
-## 查询省市区树形接口（用户列表地区选择框）
-
-
-**接口地址**:`/api/web/area/tree`
-
-
-**请求方式**:`POST`
-
-
-**请求数据类型**:`application/x-www-form-urlencoded`
-
-
-**响应数据类型**:`*/*`
-
-
-**接口描述**:
-
-
-**请求参数**:
-
-
-暂无
-
-
-**响应状态**:
-
-
-| 状态码 | 说明 | schema |
-| -------- | -------- | ----- | 
-|200|OK|RTreeAreaVo|
-
-
-**响应参数**:
-
-
-| 参数名称 | 参数说明 | 类型 | schema |
-| -------- | -------- | ----- |----- | 
-|success|是否成功|boolean||
-|code|业务码|integer(int32)|integer(int32)|
-|message|提示信息|string||
-|data||TreeAreaVo|TreeAreaVo|
-|  label|地区名称|string||
-|  value|地区id|integer(int32)||
-|  children|子地区列表|array|TreeAreaVo|
-
-
-**响应示例**:
-```javascript
-{
-	"success": true,
-	"code": 0,
-	"message": "成功",
-	"data": {
-		"label": "河北省",
-		"value": -1,
-		"children": [
-			{
-				"label": "河北省",
-				"value": -1,
-				"children": [
-					{}
-				]
-			}
-		]
-	}
-}
-```
-
-
-## 查询省和地市树形接口（添加修改用户、操作日志地区选择框）
-
-
-**接口地址**:`/api/web/area/treeProvinceCity`
-
-
-**请求方式**:`POST`
-
-
-**请求数据类型**:`application/x-www-form-urlencoded`
-
-
-**响应数据类型**:`*/*`
-
-
-**接口描述**:
-
-
-**请求参数**:
-
-
-暂无
-
-
-**响应状态**:
-
-
-| 状态码 | 说明 | schema |
-| -------- | -------- | ----- | 
-|200|OK|RTreeAreaVo|
-
-
-**响应参数**:
-
-
-| 参数名称 | 参数说明 | 类型 | schema |
-| -------- | -------- | ----- |----- | 
-|success|是否成功|boolean||
-|code|业务码|integer(int32)|integer(int32)|
-|message|提示信息|string||
-|data||TreeAreaVo|TreeAreaVo|
-|  label|地区名称|string||
-|  value|地区id|integer(int32)||
-|  children|子地区列表|array|TreeAreaVo|
-
-
-**响应示例**:
-```javascript
-{
-	"success": true,
-	"code": 0,
-	"message": "成功",
-	"data": {
-		"label": "河北省",
-		"value": -1,
-		"children": [
-			{
-				"label": "河北省",
-				"value": -1,
-				"children": [
-					{}
-				]
-			}
-		]
-	}
-}
-```
-
-
-# 鉴权
-
-
-## 鉴权
-
-
-**接口地址**:`/api/verification`
-
-
-**请求方式**:`POST`
-
-
-**请求数据类型**:`application/x-www-form-urlencoded,application/json`
-
-
-**响应数据类型**:`*/*`
-
-
-**接口描述**:
-
-
-**请求示例**:
-
-
-```javascript
-{
-  "token": "test_token_hebei",
-  "system": "web",
-  "fromSystem": "test"
-}
-```
-
-
-**请求参数**:
-
-
-| 参数名称 | 参数说明 | 请求类型    | 是否必须 | 数据类型 | schema |
-| -------- | -------- | ----- | -------- | -------- | ------ |
-|tokenVo|TokenVo|body|true|TokenVo|TokenVo|
-|  token|token||true|string||
-|  system|system||true|string||
-|  fromSystem|fromSystem||true|string||
-
-
-**响应状态**:
-
-
-| 状态码 | 说明 | schema |
-| -------- | -------- | ----- | 
-|用户不存在|{"success":false,"code":0,"message":"用户不存在","data":null}||
-|app|{"success":true,"code":1,"message":"成功","data":{"userName":"张三","list":[{"id":1,"name":"工单处理","url":"url","webIcon":"webIcon","priority":0},{"id":2,"name":"工单答复","url":"url","webIcon":"webIcon","priority":0}]}}|WebVerificationVo|
-
-
-**响应参数**:
-
-
-| 参数名称 | 参数说明 | 类型 | schema |
-| -------- | -------- | ----- |----- | 
-|userName|用户名|string||
-|list|入口列表|array|WebFunctionVo|
-|  id|功能id|integer(int32)||
-|  name|功能名称|string||
-|  url|web链接|string||
-|  webIcon|web图标|string||
-|  priority|显示优先级|integer(int32)||
-
-
-**响应示例**:
-```javascript
-{
-	"userName": "张三",
-	"list": [
-		{
-			"id": 0,
-			"name": "",
-			"url": "",
-			"webIcon": "",
-			"priority": 0
-		}
-	]
-}
-```

pom.xml

@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.6.14</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
     <groupId>com.nokia</groupId>
     <artifactId>acl_tousu</artifactId>
     <version>1.11</version>
 
-    <parent>
-        <groupId>com.nokia</groupId>
-        <artifactId>hb_springboot_parent</artifactId>
-        <version>1.0</version>
-        <relativePath />
-    </parent>
-
     <properties>
+        <java.version>8</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
         <skipTests>true</skipTests>
     </properties>
 
@@ -52,10 +55,25 @@
                 <artifactId>swagger-models</artifactId>
                 <version>2.2.2</version>
             </dependency>
+            <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
+            <dependency>
+                <groupId>com.google.code.gson</groupId>
+                <artifactId>gson</artifactId>
+                <version>2.10</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
@@ -69,41 +87,36 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.24</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
+            <version>2.0.22</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter -->
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.5.3.1</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
+            <version>42.5.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.10</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-csv -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-csv</artifactId>
+            <version>1.9.0</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.springdoc/springdoc-openapi-ui -->
         <dependency>
@@ -128,35 +141,38 @@
             <artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
             <version>4.0.0</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/com.jcraft/jsch -->
         <dependency>
             <groupId>com.jcraft</groupId>
             <artifactId>jsch</artifactId>
+            <version>0.1.55</version>
         </dependency>
         <dependency>
             <groupId>com.xuxueli</groupId>
             <artifactId>xxl-job-core</artifactId>
             <version>2.3.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
         <finalName>aclTousu</finalName>
-        <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
-        <testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
-        <outputDirectory>${project.basedir}/target/classes</outputDirectory>
-        <testOutputDirectory>${project.basedir}/target/test-classes</testOutputDirectory>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${parent.version}</version>
+                <executions>
+                    <execution>
+                        <id>repackage</id>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>

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

@@ -3,9 +3,9 @@ package com.nokia.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nokia.pojo.Function;
-import com.nokia.vo.ListFunctionDto;
 import com.nokia.vo.ListFunctionVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -14,25 +14,25 @@ import java.util.List;
 public interface FunctionDao extends BaseMapper<Function> {
     /**
      * 查询功能列表
-     *
      */
-    @Select("<script> " +
-            "select af.id as function_id, af.\"name\" as function_name, af.app_url, af.app_icon, af.app_priority, " +
-            "af.web_url, af.web_icon, af.web_priority, af.function_description, as2.system_name, ac.client_name " +
-            "from sqmdb_rpt.acl_function af inner join sqmdb_rpt.acl_system as2 on af.\"system\" = as2.\"system\" " +
-            "inner join sqmdb_rpt.acl_client ac on af.client = ac.client" +
-            "<where> " +
-            "    <if test=\"dto.system != null and dto.system != ''\"> " +
-            "         af.\"system\" = #{dto.system} " +
-            "    </if> " +
-            "    <if test='dto.client'> " +
-            "         and af.client = #{dto.client} " +
-            "    </if> " +
-            "    <if test=\"dto.functionName != null and dto.functionName != ''\"> " +
-            "         and af.\"name\" like concat('%', #{dto.functionName}, '%') " +
-            "    </if> " +
-            "</where> " +
-            "</script>"
+    @Select("<script>"
+            + " select af.id as function_id, af.\"name\" as function_name, af.app_url, af.app_icon, af.app_priority,"
+            + " af.web_url, af.web_icon, af.web_priority, af.function_description, as2.system_name, ac.client_name"
+            + " from sqmdb_rpt.acl_function af inner join sqmdb_rpt.acl_system as2 on af.\"system\" = as2.\"system\""
+            + " inner join sqmdb_rpt.acl_client ac on af.client = ac.client"
+            + " <where>"
+            + "     <if test=\"system != null and system != ''\">"
+            + "          af.\"system\" = #{system}"
+            + "     </if>"
+            + "     <if test='client'>"
+            + "          and af.client = #{client}"
+            + "     </if> "
+            + "     <if test=\"functionName != null and functionName != ''\">"
+            + "          and af.\"name\" like concat('%', #{functionName}, '%')"
+            + "     </if>"
+            + " </where>"
+            + " </script>"
     )
-    List<ListFunctionVo> list(Page<ListFunctionVo> page, ListFunctionDto dto);
+    List<ListFunctionVo> list(Page<ListFunctionVo> page, @Param("system") String system,
+                              @Param("client") Integer client, @Param("functionName") String functionName);
 }

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

@@ -3,44 +3,46 @@ package com.nokia.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nokia.pojo.OperationLog;
-import com.nokia.vo.ListOperationLogDto;
 import com.nokia.vo.ListOperationLogVo;
-import com.nokia.vo.ListVerificationLogDto;
-import com.nokia.vo.ListVerificationLogVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
-import java.util.List;
+import java.time.LocalDateTime;
 
 @Mapper
 public interface OperationLogDao extends BaseMapper<OperationLog> {
     /**
      * 查询操作日志列表
-     *
      */
-    @Select("<script> " +
-            "select * from sqmdb_rpt.acl_operation_log " +
-            "<where> " +
-            "    <if test='dto.operatorId'> " +
-            "         operator_id = #{dto.operatorId} " +
-            "    </if> " +
-            "    <if test=\"dto.operatorAccount != null and dto.operatorAccount != ''\"> " +
-            "         and operator_account like concat(#{dto.operatorAccount}, '%') " +
-            "    </if> " +
-            "    <if test=\"dto.operatorName != null and dto.operatorName != ''\"> " +
-            "         and operator_name like concat(#{dto.operatorName}, '%') " +
-            "    </if> " +
-            "    <if test=\"dto.operationName != null and dto.operationName != ''\"> " +
-            "         and operation_name like concat('%', #{dto.operationName}, '%') " +
-            "    </if> " +
-            "    <if test='dto.startTime'> " +
-            "         and operation_time <![CDATA[ >= ]]> #{dto.startTime} " +
-            "    </if> " +
-            "    <if test='dto.endTime'> " +
-            "         and operation_time <![CDATA[ <= ]]> #{dto.endTime} " +
-            "    </if> " +
-            "</where> " +
-            "order by operation_time desc " +
-            "</script>")
-    List<ListOperationLogVo> listOperationLog(Page<ListOperationLogVo> page, Object dto);
+    @Select("<script>"
+            + " select * from sqmdb_rpt.acl_operation_log"
+            + " <where>"
+            + "     <if test='operatorId'>"
+            + "          operator_id = #{operatorId}"
+            + "     </if>"
+            + "     <if test=\"operatorAccount != null and operatorAccount != ''\">"
+            + "          and operator_account like concat(#{operatorAccount}, '%')"
+            + "     </if>"
+            + "     <if test=\"operatorName != null and operatorName != ''\">"
+            + "          and operator_name like concat(#{operatorName}, '%')"
+            + "     </if>"
+            + "     <if test=\"operationName != null and operationName != ''\">"
+            + "          and operation_name like concat('%', #{operationName}, '%')"
+            + "     </if>"
+            + "     <if test='startTime'>"
+            + "          and operation_time <![CDATA[ >= ]]> #{startTime}"
+            + "     </if>"
+            + "     <if test='endTime'>"
+            + "          and operation_time <![CDATA[ <= ]]> #{endTime}"
+            + "     </if>"
+            + " </where>"
+            + " order by operation_time desc"
+            + " </script>")
+    Page<ListOperationLogVo> listOperationLog(Page<ListOperationLogVo> page, @Param("operatorId") Integer operationId,
+                                              @Param("operatorAccount") String operatorAccount,
+                                              @Param("operatorName") String operatorName,
+                                              @Param("operationName") String operationName,
+                                              @Param("startTime") LocalDateTime startTime,
+                                              @Param("endTime") LocalDateTime endTime);
 }

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

@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nokia.pojo.Role;
 import com.nokia.vo.AllRoleBo;
 import com.nokia.vo.AllRoleVo;
-import com.nokia.vo.ListRoleDto;
 import com.nokia.vo.ListRoleVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
@@ -18,43 +18,43 @@ public interface RoleDao extends BaseMapper<Role> {
     /**
      * 查询角色说明列表
      */
-    @Select("<script> " +
-            "select ar.role_name, ar.\"system\", ar.role_description, as2.system_name from sqmdb_rpt.acl_role ar " +
-            "inner join sqmdb_rpt.acl_system as2 on ar.\"system\" = as2.\"system\" " +
-            "<where> " +
-            "    <if test=\"dto.system != null and dto.system != ''\"> " +
-            "         ar.\"system\" = #{dto.system} " +
-            "    </if> " +
-            "    <if test=\"dto.roleName != null and dto.roleName != ''\"> " +
-            "         and ar.role_name like concat('%', #{dto.roleName}, '%') " +
-            "    </if> " +
-            "</where> " +
-            "</script>")
-    List<ListRoleVo> list(Page<ListRoleVo> page, ListRoleDto dto);
+    @Select("<script>"
+            + " select ar.role_name, ar.\"system\", ar.role_description, as2.system_name from sqmdb_rpt.acl_role ar"
+            + " inner join sqmdb_rpt.acl_system as2 on ar.\"system\" = as2.\"system\""
+            + " <where>"
+            + "     <if test=\"system != null and system != ''\">"
+            + "          ar.\"system\" = #{system}"
+            + "     </if>"
+            + "     <if test=\"roleName != null and roleName != ''\">"
+            + "          and ar.role_name like concat('%', #{roleName}, '%')"
+            + "     </if>"
+            + " </where>"
+            + " </script>")
+    List<ListRoleVo> list(Page<ListRoleVo> page, @Param("system") String system, @Param("roleName") String roleName);
 
     /**
      * 查询所有角色
      *
      * @return {@link List}<{@link AllRoleVo}>
      */
-    @Select("select ar.role_id, ar.role_name, ar.function_id, ar.\"system\", as2.system_name, af.\"name\" as function_name " +
-            "from sqmdb_rpt.acl_role ar " +
-            "left join sqmdb_rpt.acl_system as2 on ar.\"system\" = as2.\"system\" " +
-            "left join sqmdb_rpt.acl_function af on af.id = ar.function_id " +
-            "order by ar.\"system\"")
+    @Select("select ar.role_id, ar.role_name, ar.function_id, ar.\"system\", as2.system_name,"
+            + " af.\"name\" as function_name"
+            + " from sqmdb_rpt.acl_role ar"
+            + " left join sqmdb_rpt.acl_system as2 on ar.\"system\" = as2.\"system\""
+            + " left join sqmdb_rpt.acl_function af on af.id = ar.function_id"
+            + " order by ar.\"system\"")
     List<AllRoleBo> all();
 
     /**
      * 重置function_id
-     *
      */
-    @Update("<script> " +
-            "update sqmdb_rpt.acl_role " +
-            "set function_id = null " +
-            "where function_id in " +
-            "<foreach open=\"(\" close=\")\" collection=\"list\" item=\"item\" separator=\",\"> " +
-            "  #{item} " +
-            "</foreach> " +
-            "</script>")
+    @Update("<script>"
+            + " update sqmdb_rpt.acl_role"
+            + " set function_id = null"
+            + " where function_id in"
+            + " <foreach open=\"(\" close=\")\" collection=\"list\" item=\"item\" separator=\",\">"
+            + "   #{item}"
+            + " </foreach>"
+            + " </script>")
     int resetFunctionId(List<Integer> list);
 }

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

@@ -14,269 +14,278 @@ import java.util.List;
 @Mapper
 public interface UserDao extends BaseMapper<User> {
 
-        /**
-         * 支持username模糊查询
-         */
-        @Select("select distinct r.role_id, r.role_name from sqmdb_rpt.acl_user u, sqmdb_rpt.acl_role r, sqmdb_rpt.acl_user_role_city ur"
-                        + " where u.user_id = ur.user_id and r.role_id = ur.role_id and r.system='flow' and u.user_name like concat('%',#{username},'%')")
-        List<FlowRoleVo> findRoleList(String username);
+    /**
+     * 支持username模糊查询
+     */
+    @Select("select distinct r.role_id, r.role_name"
+            + " from sqmdb_rpt.acl_user u, sqmdb_rpt.acl_role r, sqmdb_rpt.acl_user_role_city ur"
+            + " where u.user_id = ur.user_id"
+            + " and r.role_id = ur.role_id"
+            + " and r.system='flow'"
+            + " and u.user_name like concat('%',#{username},'%')")
+    List<FlowRoleVo> findRoleList(String username);
 
-        /**
-         * 查询全部
-         */
-        @Select("select role_id, role_name from sqmdb_rpt.acl_role where system = 'flow'")
-        List<FlowRoleVo> findRoleList2();
+    /**
+     * 查询全部
+     */
+    @Select("select role_id, role_name from sqmdb_rpt.acl_role where system = 'flow'")
+    List<FlowRoleVo> findRoleList2();
 
-        /**
-         * 查询全部用户（流程所需），未分页
-         */
-        @Results({
-                        @Result(column = "org_id", property = "org.orgId"),
-                        @Result(column = "org_name", property = "org.orgName"),
-        })
-        @Select("select a.user_id as user_id, a.login_name as login_id, a.user_name as user_name, a.phone as mobile, a.email as email,"
-                        + " a.city_id as org_id, c1.area_name as org_name, a.area_id as area"
-                        + " from sqmdb_rpt.acl_user a, sqmdb_rpt.acl_area c1"
-                        + " where a.city_id = c1.area_id "
-                        + "and a.deleted = 0")
-        List<FlowUserVo> findToPage();
+    /**
+     * 查询全部用户（流程所需），未分页
+     */
+    @Results({
+            @Result(column = "org_id", property = "org.orgId"),
+            @Result(column = "org_name", property = "org.orgName"),
+    })
+    @Select("select a.user_id as user_id, a.login_name as login_id, a.user_name as user_name, a.phone as mobile,"
+            + " a.email as email, a.city_id as org_id, c1.area_name as org_name, a.area_id as area"
+            + " from sqmdb_rpt.acl_user a, sqmdb_rpt.acl_area c1"
+            + " where a.city_id = c1.area_id"
+            + " and a.deleted = 0")
+    List<FlowUserVo> findToPage();
 
-        /**
-         * 查询登录用户信息
-         */
-        @Results({
-                        @Result(column = "org_id", property = "org.orgId"),
-                        @Result(column = "org_name", property = "org.orgName"),
-        })
-        @Select("select a.user_id as user_id, a.login_name as login_id, a.user_name as user_name, a.phone as mobile, a.email as email,"
-                        + " a.city_id as org_id, c.area_name as org_name, a.area_id as area"
-                        + " from sqmdb_rpt.acl_user a, sqmdb_rpt.acl_area c"
-                        + " where a.city_id = c.area_id and a.login_name=#{loginId} and a.deleted = 0")
-        FlowUserVo getFlowUserVoByLoginId(String loginId);
+    /**
+     * 查询登录用户信息
+     */
+    @Results({
+            @Result(column = "org_id", property = "org.orgId"),
+            @Result(column = "org_name", property = "org.orgName"),
+    })
+    @Select("select a.user_id as user_id, a.login_name as login_id, a.user_name as user_name, a.phone as mobile,"
+            + " a.email as email, a.city_id as org_id, c.area_name as org_name, a.area_id as area"
+            + " from sqmdb_rpt.acl_user a, sqmdb_rpt.acl_area c"
+            + " where a.city_id = c.area_id and a.login_name=#{loginId} and a.deleted = 0")
+    FlowUserVo getFlowUserVoByLoginId(String loginId);
 
-        /**
-         * 根据用户ID获取用户接口
-         */
-        @Results({
-                        @Result(column = "org_id", property = "org.orgId"),
-                        @Result(column = "org_name", property = "org.orgName"),
-        })
-        @Select("select a.user_id as user_id, a.login_name as login_id, a.user_name as user_name, a.phone as mobile, a.email as email,"
-                        + " a.city_id as org_id, c.area_name as org_name, a.area_id as area"
-                        + " from sqmdb_rpt.acl_user a, sqmdb_rpt.acl_area c"
-                        + " where a.city_id = c.area_id and user_id=#{userId} and a.deleted = 0")
-        FlowUserVo getFlowUserVoByUserId(Integer userId);
+    /**
+     * 根据用户ID获取用户接口
+     */
+    @Results({
+            @Result(column = "org_id", property = "org.orgId"),
+            @Result(column = "org_name", property = "org.orgName"),
+    })
+    @Select("select a.user_id as user_id, a.login_name as login_id, a.user_name as user_name, a.phone as mobile,"
+            + " a.email as email, a.city_id as org_id, c.area_name as org_name, a.area_id as area"
+            + " from sqmdb_rpt.acl_user a, sqmdb_rpt.acl_area c"
+            + " where a.city_id = c.area_id and user_id=#{userId} and a.deleted = 0")
+    FlowUserVo getFlowUserVoByUserId(Integer userId);
 
-        @Select("select r.role_id from  sqmdb_rpt.acl_role r,  sqmdb_rpt.acl_user_role_city ur where r.role_id = ur.role_id and r.system='flow' and ur.user_id=#{userId}")
-        List<Integer> findRoleIdByUserId(Integer userId);
+    @Select("select r.role_id from  sqmdb_rpt.acl_role r, sqmdb_rpt.acl_user_role_city ur"
+            + " where r.role_id = ur.role_id and r.system='flow' and ur.user_id=#{userId}")
+    List<Integer> findRoleIdByUserId(Integer userId);
 
-        @Select("select u.user_id from sqmdb_rpt.acl_user u,  sqmdb_rpt.acl_user_role_city ur where u.user_id = ur.user_id and ur.role_id=#{roleId} and u.deleted = 0")
-        List<Integer> findUserIdByRoleId(Integer roleId);
+    @Select("select u.user_id from sqmdb_rpt.acl_user u, sqmdb_rpt.acl_user_role_city ur"
+            + " where u.user_id = ur.user_id and ur.role_id=#{roleId} and u.deleted = 0")
+    List<Integer> findUserIdByRoleId(Integer roleId);
 
-        @Results({
-                        @Result(column = "org_id", property = "org.orgId"),
-                        @Result(column = "org_name", property = "org.orgName"),
-        })
-        @Select("<script>"
-                        + "select a.user_id as user_id, a.login_name as login_id, a.user_name as user_name, a.phone as mobile, a.email as email,"
-                        + " a.city_id as org_id, c.area_name as org_name, a.area_id as area"
-                        + " from sqmdb_rpt.acl_user a, sqmdb_rpt.acl_area c, sqmdb_rpt.acl_user_role_city ur "
-                        + " where a.user_id = ur.user_id and a.city_id = c.area_id and a.deleted = 0"
-                        + "<if test=\"loginId != null and loginId !=''\">"
-                        + " and a.login_name=#{loginId} "
-                        + "</if>"
-                        + "<if test=\"roleId != null\">"
-                        + " and ur.role_id=#{roleId} "
-                        + "</if>"
-                        + "<if test=\"userName != null and userName !=''\">"
-                        + " and a.user_name like concat('%',#{userName},'%') "
-                        + "</if>"
-                        + "</script>")
-        List<FlowUserVo> findAuthorizedUser(String loginId, Integer roleId, String userName);
+    @Results({
+            @Result(column = "org_id", property = "org.orgId"),
+            @Result(column = "org_name", property = "org.orgName"),
+    })
+    @Select("<script>"
+            + " select a.user_id as user_id, a.login_name as login_id, a.user_name as user_name, a.phone as mobile,"
+            + " a.email as email, a.city_id as org_id, c.area_name as org_name, a.area_id as area"
+            + " from sqmdb_rpt.acl_user a, sqmdb_rpt.acl_area c, sqmdb_rpt.acl_user_role_city ur"
+            + " where a.user_id = ur.user_id and a.city_id = c.area_id and a.deleted = 0"
+            + " <if test=\"loginId != null and loginId !=''\">"
+            + " and a.login_name=#{loginId}"
+            + " </if>"
+            + " <if test=\"roleId != null\">"
+            + " and ur.role_id=#{roleId}"
+            + " </if>"
+            + " <if test=\"userName != null and userName !=''\">"
+            + " and a.user_name like concat('%',#{userName},'%')"
+            + " </if>"
+            + " </script>")
+    List<FlowUserVo> findAuthorizedUser(@Param("loginId") String loginId, @Param("roleId") Integer roleId,
+                                        @Param("userName") String userName);
 
-        List<Role> getRoleCityByUserId(Integer userId);
+    List<Role> getRoleCityByUserId(Integer userId);
 
-        User getByLoginName(String loginName);
+    User getByLoginName(String loginName);
 
-        List<User> getByRoleIds(List<Integer> roleIds, List<Integer> cityIds);
+    List<User> getByRoleIds(@Param("roleIds") List<Integer> roleIds, @Param("cityIds") List<Integer> cityIds);
 
-        List<String> getPhoneListByRole(Integer roleId, Integer cityId);
+    List<String> getPhoneListByRole(@Param("roleId") Integer roleId, @Param("cityId") Integer cityId);
 
-        /**
-         * 查询用户的app功能列表
-         *
-         * @param userId 用户id
-         * @param client 客户端
-         * @return {@link List}<{@link AppVerificationVo}>
-         */
-        @Select("select af.id, af.\"name\", af.app_url as url, af.app_icon, af.app_priority as priority " +
-                "from sqmdb_rpt.acl_function af " +
-                "inner join sqmdb_rpt.acl_user_function auf " +
-                "on af.id = auf.function_id " +
-                "where auf.user_id = #{userId} " +
-                "and (af.client = 0 or af.client = #{client}) " +
-                "order by af.app_priority desc")
-        List<AppVerificationVo> listAppFunctions(Integer userId, Integer client);
+    /**
+     * 查询用户的app功能列表
+     *
+     * @param userId 用户id
+     * @param client 客户端
+     * @return {@link List}<{@link AppVerificationVo}>
+     */
+    @Select("select af.id, af.\"name\", af.app_url as url, af.app_icon, af.app_priority as priority"
+            + " from sqmdb_rpt.acl_function af"
+            + " inner join sqmdb_rpt.acl_user_function auf"
+            + " on af.id = auf.function_id"
+            + " where auf.user_id = #{userId}"
+            + " and (af.client = 0 or af.client = #{client})"
+            + " order by af.app_priority desc")
+    List<AppVerificationVo> listAppFunctions(@Param("userId") Integer userId, @Param("client") Integer client);
 
-        /**
-         * 查询用户的web功能列表
-         *
-         * @param userId 用户id
-         * @param client 客户端
-         * @return {@link List}<{@link WebFunctionVo}>
-         */
-        @Select("select af.id, af.\"name\", af.web_url as url, af.web_icon, af.web_priority as priority " +
-                "from sqmdb_rpt.acl_function af " +
-                "inner join sqmdb_rpt.acl_user_function auf " +
-                "on af.id = auf.function_id " +
-                "where auf.user_id = #{userId} " +
-                "and (af.client = 0 or af.client = #{client}) " +
-                "order by af.web_priority desc")
-        List<WebFunctionVo> listWebFunctions(Integer userId, Integer client);
+    /**
+     * 查询用户的web功能列表
+     *
+     * @param userId 用户id
+     * @param client 客户端
+     * @return {@link List}<{@link WebFunctionVo}>
+     */
+    @Select("select af.id, af.\"name\", af.web_url as url, af.web_icon, af.web_priority as priority"
+            + " from sqmdb_rpt.acl_function af"
+            + " inner join sqmdb_rpt.acl_user_function auf"
+            + " on af.id = auf.function_id"
+            + " where auf.user_id = #{userId}"
+            + " and (af.client = 0 or af.client = #{client})"
+            + " order by af.web_priority desc")
+    List<WebFunctionVo> listWebFunctions(@Param("userId") Integer userId, @Param("client") Integer client);
 
-        /**
-         * 查询用户列表
-         *
-         */
-        @Select("<script> " +
-                "select au.*, aa1.area_name as province_name, aa2.area_name as city_name, aa3.area_name as area_name " +
-                "from sqmdb_rpt.acl_user au " +
-                "left join sqmdb_rpt.acl_area aa1 on au.province_id = aa1.area_id " +
-                "left join sqmdb_rpt.acl_area aa2 on au.city_id = aa2.area_id " +
-                "left join sqmdb_rpt.acl_area aa3 on au.area_id = aa3.area_id " +
-                "where au.deleted = 0 " +
-                "<if test=\"dto.loginName != null and dto.loginName != ''\"> " +
-                "     and au.login_name like concat(#{dto.loginName}, '%') " +
-                "</if> " +
-                "<if test=\"dto.userName != null and dto.userName != ''\"> " +
-                "     and au.user_name like concat(#{dto.userName}, '%') " +
-                "</if> " +
-                "<if test=\"dto.org != null and dto.org != ''\"> " +
-                "     and au.org like concat('%', #{dto.org}, '%') " +
-                "</if> " +
-                "<if test='dto.areaId'> " +
-                "     and (au.province_id = #{dto.areaId} or au.city_id = #{dto.areaId} or au.area_id = #{dto.areaId}) " +
-                "</if> " +
-                "</script>"
-        )
-        List<ListUserVo> list(Page<ListUserVo> page, ListUserDto dto);
+    /**
+     * 查询用户列表
+     */
+    @Select("<script>"
+            + " select au.*, aa1.area_name as province_name, aa2.area_name as city_name, aa3.area_name as area_name"
+            + " from sqmdb_rpt.acl_user au"
+            + " left join sqmdb_rpt.acl_area aa1 on au.province_id = aa1.area_id"
+            + " left join sqmdb_rpt.acl_area aa2 on au.city_id = aa2.area_id"
+            + " left join sqmdb_rpt.acl_area aa3 on au.area_id = aa3.area_id"
+            + " where au.deleted = 0"
+            + " <if test=\"loginName != null and loginName != ''\">"
+            + "      and au.login_name like concat(#{loginName}, '%')"
+            + " </if>"
+            + " <if test=\"userName != null and userName != ''\">"
+            + "      and au.user_name like concat(#{userName}, '%')"
+            + " </if>"
+            + " <if test=\"org != null and org != ''\">"
+            + "      and au.org like concat('%', #{org}, '%')"
+            + " </if>"
+            + " <if test='areaId'>"
+            + "      and (au.province_id = #{areaId} or au.city_id = #{areaId} or au.area_id = #{areaId})"
+            + " </if>"
+            + " </script>"
+    )
+    List<ListUserVo> list(Page<ListUserVo> page, @Param("loginName") String loginName,
+                          @Param("userName") String userName, @Param("org") String org,
+                          @Param("areaId") Integer areaId);
 
-        /**
-         * 查询top用户信息
-         *
-         * @param loginName 登录名
-         * @return {@link TopUserVo}
-         */
-        @Select("select atu.*, aa1.area_name as province_name, aa2.area_name as city_name, aa3.area_name as area_name " +
-                "from sqmdb_rpt.acl_top_user atu " +
-                "left join sqmdb_rpt.acl_area aa1 on atu.province_id = aa1.area_id " +
-                "left join sqmdb_rpt.acl_area aa2 on atu.city_id = aa2.area_id " +
-                "left join sqmdb_rpt.acl_area aa3 on atu.area_id = aa3.area_id " +
-                "where login_name = #{loginName}")
-        TopUserVo getTopUserByLoginName(String loginName);
+    /**
+     * 查询top用户信息
+     *
+     * @param loginName 登录名
+     * @return {@link TopUserVo}
+     */
+    @Select("select atu.*, aa1.area_name as province_name, aa2.area_name as city_name, aa3.area_name as area_name"
+            + " from sqmdb_rpt.acl_top_user atu"
+            + " left join sqmdb_rpt.acl_area aa1 on atu.province_id = aa1.area_id"
+            + " left join sqmdb_rpt.acl_area aa2 on atu.city_id = aa2.area_id"
+            + " left join sqmdb_rpt.acl_area aa3 on atu.area_id = aa3.area_id"
+            + " where login_name = #{loginName}")
+    TopUserVo getTopUserByLoginName(String loginName);
 
-        /**
-         * 判断账号是否存在且状态正常
-         *
-         * @param loginName 登录名
-         * @return {@link Object}
-         */
-        @Select("select 1 from sqmdb_rpt.acl_user where deleted = 0 and login_name = #{loginName}")
-        Object hasLoginName(String loginName);
+    /**
+     * 判断账号是否存在且状态正常
+     *
+     * @param loginName 登录名
+     * @return {@link Object}
+     */
+    @Select("select 1 from sqmdb_rpt.acl_user where deleted = 0 and login_name = #{loginName}")
+    Object hasLoginName(String loginName);
 
-        /**
-         * 获取用户详细
-         *
-         * @param userId 用户id
-         * @return {@link GetUserDetailVo}
-         */
-        @Select("select au.*, au.org as org_name, aa1.area_name as province_name, aa2.area_name as city_name, aa3.area_name as area_name " +
-                "from sqmdb_rpt.acl_user au " +
-                "left join sqmdb_rpt.acl_area aa1 on au.province_id = aa1.area_id " +
-                "left join sqmdb_rpt.acl_area aa2 on au.city_id = aa2.area_id " +
-                "left join sqmdb_rpt.acl_area aa3 on au.area_id = aa3.area_id " +
-                "where au.user_id = #{userId}")
-        GetUserDetailVo getUserDetail(Integer userId);
+    /**
+     * 获取用户详细
+     *
+     * @param userId 用户id
+     * @return {@link GetUserDetailVo}
+     */
+    @Select("select au.*, au.org as org_name, aa1.area_name as province_name, aa2.area_name as city_name,"
+            + " aa3.area_name as area_name"
+            + " from sqmdb_rpt.acl_user au"
+            + " left join sqmdb_rpt.acl_area aa1 on au.province_id = aa1.area_id"
+            + " left join sqmdb_rpt.acl_area aa2 on au.city_id = aa2.area_id"
+            + " left join sqmdb_rpt.acl_area aa3 on au.area_id = aa3.area_id"
+            + " where au.user_id = #{userId}")
+    GetUserDetailVo getUserDetail(Integer userId);
 
-        /**
-         * 获取用户详细角色
-         *
-         * @param userId 用户id
-         * @return {@link List}<{@link GetUserDetailRoleVo}>
-         */
-        @Select("select aurc.role_id, aurc.city_id, ar.role_name, ar.\"system\", ar.function_id, " +
-                "af.\"name\" as function_name, as2.system_name, aa.area_name as city_name " +
-                "from sqmdb_rpt.acl_user_role_city aurc " +
-                "inner join sqmdb_rpt.acl_role ar on aurc.role_id = ar.role_id " +
-                "inner join sqmdb_rpt.acl_area aa on aurc.city_id = aa.area_id " +
-                "inner join sqmdb_rpt.acl_system as2 on ar.\"system\" = as2.\"system\" " +
-                "inner join sqmdb_rpt.acl_function af on af.id = ar.function_id " +
-                "where aurc.user_id = #{userId}")
-        List<GetUserDetailRoleVo> getUserDetailRole(Integer userId);
+    /**
+     * 获取用户详细角色
+     *
+     * @param userId 用户id
+     * @return {@link List}<{@link GetUserDetailRoleVo}>
+     */
+    @Select("select aurc.role_id, aurc.city_id, ar.role_name, ar.\"system\", ar.function_id,"
+            + " af.\"name\" as function_name, as2.system_name, aa.area_name as city_name"
+            + " from sqmdb_rpt.acl_user_role_city aurc"
+            + " inner join sqmdb_rpt.acl_role ar on aurc.role_id = ar.role_id"
+            + " inner join sqmdb_rpt.acl_area aa on aurc.city_id = aa.area_id"
+            + " inner join sqmdb_rpt.acl_system as2 on ar.\"system\" = as2.\"system\""
+            + " inner join sqmdb_rpt.acl_function af on af.id = ar.function_id"
+            + " where aurc.user_id = #{userId}")
+    List<GetUserDetailRoleVo> getUserDetailRole(Integer userId);
 
-        /**
-         * 获取账号角色
-         *
-         * @param loginName 登录名
-         * @return {@link List}<{@link GetRoleByLoginNameVo}>
-         */
-        @Select("select aurc.role_id, aurc.city_id, ar.role_name, ar.\"system\", ar.function_id, " +
-                "af.\"name\" as function_name, as2.system_name, aa.area_name as city_name " +
-                "from sqmdb_rpt.acl_user_role_city aurc " +
-                "inner join sqmdb_rpt.acl_user au on aurc.user_id = au.user_id " +
-                "inner join sqmdb_rpt.acl_role ar on aurc.role_id = ar.role_id " +
-                "inner join sqmdb_rpt.acl_system as2 on ar.\"system\" = as2.\"system\" " +
-                "inner join sqmdb_rpt.acl_area aa on aurc.city_id = aa.area_id " +
-                "inner join sqmdb_rpt.acl_function af on af.id = ar.function_id " +
-                "where au.login_name = #{loginName}")
-        List<GetRoleByLoginNameVo> getRoleByLoginName(String loginName);
+    /**
+     * 获取账号角色
+     *
+     * @param loginName 登录名
+     * @return {@link List}<{@link GetRoleByLoginNameVo}>
+     */
+    @Select("select aurc.role_id, aurc.city_id, ar.role_name, ar.\"system\", ar.function_id,"
+            + " af.\"name\" as function_name, as2.system_name, aa.area_name as city_name"
+            + " from sqmdb_rpt.acl_user_role_city aurc"
+            + " inner join sqmdb_rpt.acl_user au on aurc.user_id = au.user_id"
+            + " inner join sqmdb_rpt.acl_role ar on aurc.role_id = ar.role_id"
+            + " inner join sqmdb_rpt.acl_system as2 on ar.\"system\" = as2.\"system\""
+            + " inner join sqmdb_rpt.acl_area aa on aurc.city_id = aa.area_id"
+            + " inner join sqmdb_rpt.acl_function af on af.id = ar.function_id"
+            + " where au.login_name = #{loginName}")
+    List<GetRoleByLoginNameVo> getRoleByLoginName(String loginName);
 
-        /**
-         * 根据账号查询用户信息
-         *
-         * @param loginName 登录名
-         * @return {@link User}
-         */
-        @Select("select * from sqmdb_rpt.acl_user where login_name = #{loginName}")
-        User selectByLoginName(String loginName);
+    /**
+     * 根据账号查询用户信息
+     *
+     * @param loginName 登录名
+     * @return {@link User}
+     */
+    @Select("select * from sqmdb_rpt.acl_user where login_name = #{loginName}")
+    User selectByLoginName(String loginName);
 
-        /**
-         * 存在其他地市用户
-         *
-         * @param cityId 地市id
-         * @param list   用户id列表
-         * @return {@link Object}
-         */
-        @Select("<script> " +
-                "select 1 from sqmdb_rpt.acl_user " +
-                "where city_id != #{cityId} and user_id in " +
-                "<foreach open=\"(\" close=\")\" collection=\"list\" item=\"item\" separator=\",\"> " +
-                "  #{item} " +
-                "</foreach> " +
-                "limit 1 " +
-                "</script>")
-        Object exceptCityUser(Integer cityId, List<Integer> list);
+    /**
+     * 存在其他地市用户
+     *
+     * @param cityId 地市id
+     * @param list   用户id列表
+     * @return {@link Object}
+     */
+    @Select("<script>"
+            + " select 1 from sqmdb_rpt.acl_user"
+            + " where city_id != #{cityId} and user_id in"
+            + " <foreach open=\"(\" close=\")\" collection=\"list\" item=\"item\" separator=\",\">"
+            + "   #{item}"
+            + " </foreach>"
+            + " limit 1"
+            + " </script>")
+    Object exceptCityUser(Integer cityId, List<Integer> list);
 
-        /**
-         * 通过用户id获取地市id
-         *
-         * @param list 列表
-         * @return {@link List}<{@link Integer}>
-         */
-        @Select("<script> " +
-                "select city_id from sqmdb_rpt.acl_user " +
-                "where user_id in " +
-                "<foreach open=\"(\" close=\")\" collection=\"list\" item=\"item\" separator=\",\"> " +
-                "  #{item} " +
-                "</foreach> " +
-                "</script>")
-        List<Integer> getCityIdsByUserIds(List<Integer> list);
+    /**
+     * 通过用户id获取地市id
+     *
+     * @param list 列表
+     * @return {@link List}<{@link Integer}>
+     */
+    @Select("<script>"
+            + " select city_id from sqmdb_rpt.acl_user"
+            + " where user_id in"
+            + " <foreach open=\"(\" close=\")\" collection=\"list\" item=\"item\" separator=\",\">"
+            + "   #{item}"
+            + " </foreach>"
+            + " </script>")
+    List<Integer> getCityIdsByUserIds(List<Integer> list);
 
-        /**
-         * 查询所有用户
-         *
-         * @return {@link List}<{@link UserVo}>
-         */
-        @Select("select * from sqmdb_rpt.acl_user where deleted = 0 order by user_id")
-        List<UserVo> baseList();
+    /**
+     * 查询所有用户
+     *
+     * @return {@link List}<{@link UserVo}>
+     */
+    @Select("select * from sqmdb_rpt.acl_user where deleted = 0 order by user_id")
+    List<UserVo> baseList();
 }

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

@@ -13,11 +13,11 @@ public interface UserFunctionDao extends BaseMapper<UserFunction> {
      * 批量插入
      *
      */
-    @Update("<script> " +
-            "insert into sqmdb_rpt.acl_user_function (user_id, function_id) values " +
-            "    <foreach collection=\"list\" item=\"item\" index=\"index\" separator=\",\"> " +
-            "      (#{item.userId}, #{item.functionId}) " +
-            "    </foreach> " +
-            "</script>")
+    @Update("<script>"
+            + " insert into sqmdb_rpt.acl_user_function (user_id, function_id) values"
+            + "     <foreach collection=\"list\" item=\"item\" index=\"index\" separator=\",\">"
+            + "       (#{item.userId}, #{item.functionId})"
+            + "     </foreach>"
+            + " </script>")
     int insertBatch(List<UserFunction> list);
 }

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

@@ -3,6 +3,7 @@ package com.nokia.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.nokia.pojo.UserRoleCity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
@@ -11,17 +12,18 @@ import java.util.List;
 @Mapper
 public interface UserRoleCityDao extends BaseMapper<UserRoleCity> {
 
-    @Select("select role_id from sqmdb_rpt.acl_user_role_city where user_id = #{userId} and role_id= #{roleId} and city_id = #{cityId}")
-    Integer hasRoleCity(Integer userId, Integer roleId, Integer cityId);
+    @Select("select role_id from sqmdb_rpt.acl_user_role_city"
+            + " where user_id = #{userId} and role_id= #{roleId} and city_id = #{cityId}")
+    Integer hasRoleCity(@Param("userId") Integer userId, @Param("roleId") Integer roleId, @Param("cityId") Integer cityId);
 
     /**
      * 批量插入
      */
-    @Update("<script> " +
-            "insert into sqmdb_rpt.acl_user_role_city (user_id, role_id, city_id) values " +
-            "    <foreach collection=\"list\" item=\"item\" index=\"index\" separator=\",\"> " +
-            "      (#{item.userId}, #{item.roleId}, #{item.cityId}) " +
-            "    </foreach> " +
-            "</script>")
+    @Update("<script>"
+            + " insert into sqmdb_rpt.acl_user_role_city (user_id, role_id, city_id) values"
+            + "     <foreach collection=\"list\" item=\"item\" index=\"index\" separator=\",\">"
+            + "       (#{item.userId}, #{item.roleId}, #{item.cityId})"
+            + "     </foreach>"
+            + " </script>")
     int insertBatch(List<UserRoleCity> list);
 }

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

@@ -5,44 +5,51 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nokia.pojo.VerificationLog;
 import com.nokia.vo.ListVerificationLogVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Mapper
 public interface VerificationLogDao extends BaseMapper<VerificationLog> {
     /**
      * 查询登录日志列表
-     *
      */
-    @Select("<script> " +
-            "select avl.login_time, avl.user_id, avl.login_name, avl.user_name, aa.area_name as city_name, as2.system_name " +
-            "from sqmdb_rpt.acl_verification_log avl " +
-            "inner join sqmdb_rpt.acl_area aa on avl.city_id = aa.area_id " +
-            "inner join sqmdb_rpt.acl_system as2 on avl.\"system\" = as2.\"system\" " +
-            "where avl.success = 1 " +
-            "<if test='dto.userId'> " +
-            "     and avl.user_id = #{dto.userId} " +
-            "</if> " +
-            "<if test='dto.cityId'> " +
-            "     and avl.city_id = #{dto.cityId} " +
-            "</if> " +
-            "<if test=\"dto.system != null and dto.system != ''\"> " +
-            "     and avl.\"system\" = #{dto.system} " +
-            "</if> " +
-            "<if test=\"dto.loginName != null and dto.loginName != ''\"> " +
-            "     and avl.login_name like concat(#{dto.loginName}, '%') " +
-            "</if> " +
-            "<if test=\"dto.userName != null and dto.userName != ''\"> " +
-            "     and avl.user_name like concat(#{dto.userName}, '%') " +
-            "</if> " +
-            "<if test='dto.startTime'> " +
-            "     and avl.login_time <![CDATA[ >= ]]> #{dto.startTime} " +
-            "</if> " +
-            "<if test='dto.endTime'> " +
-            "     and avl.login_time <![CDATA[ <= ]]> #{dto.endTime} " +
-            "</if> " +
-            "order by avl.login_time desc" +
-            "</script>")
-    List<ListVerificationLogVo> listVerificationLog(Page<ListVerificationLogVo> page, Object dto);
+    @Select("<script>"
+            + " select avl.login_time, avl.user_id, avl.login_name, avl.user_name,"
+            + " aa.area_name as city_name, as2.system_name"
+            + " from sqmdb_rpt.acl_verification_log avl"
+            + " inner join sqmdb_rpt.acl_area aa on avl.city_id = aa.area_id"
+            + " inner join sqmdb_rpt.acl_system as2 on avl.\"system\" = as2.\"system\""
+            + " where avl.success = 1"
+            + " <if test='userId'>"
+            + "      and avl.user_id = #{userId}"
+            + " </if>"
+            + " <if test='cityId'>"
+            + "      and avl.city_id = #{cityId}"
+            + " </if>"
+            + " <if test=\"system != null and system != ''\">"
+            + "      and avl.\"system\" = #{system}"
+            + " </if>"
+            + " <if test=\"loginName != null and loginName != ''\">"
+            + "      and avl.login_name like concat(#{loginName}, '%')"
+            + " </if>"
+            + " <if test=\"userName != null and userName != ''\">"
+            + "      and avl.user_name like concat(#{userName}, '%')"
+            + " </if>"
+            + " <if test='startTime'>"
+            + "      and avl.login_time <![CDATA[ >= ]]> #{startTime}"
+            + " </if>"
+            + " <if test='endTime'>"
+            + "      and avl.login_time <![CDATA[ <= ]]> #{endTime}"
+            + " </if>"
+            + " order by avl.login_time desc"
+            + " </script>")
+    List<ListVerificationLogVo> listVerificationLog(Page<ListVerificationLogVo> page, @Param("userId") Integer userId,
+                                                    @Param("cityId") Integer cityId, @Param("system") String system,
+                                                    @Param("loginName") String loginName,
+                                                    @Param("userName") String userName,
+                                                    @Param("startTime") LocalDateTime startTime,
+                                                    @Param("endTime") LocalDateTime endTime);
 }

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

@@ -31,7 +31,7 @@ public class FunctionService {
         PageVo<ListFunctionVo> vo = new PageVo<>();
         Page<ListFunctionVo> page = new Page<>(dto.getCurrent(), dto.getPageSize());
         page.addOrder(OrderItem.asc("af.\"system\""));
-        List<ListFunctionVo> list = functionDao.list(page, dto);
+        List<ListFunctionVo> list = functionDao.list(page, dto.getSystem(), dto.getClient(), dto.getFunctionName());
         vo.setList(list);
         vo.setTotal(page.getTotal());
         return R.ok(vo);

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

@@ -43,9 +43,10 @@ public class LogService {
 
     public R<PageVo<ListOperationLogVo>> listOperationLog(ListOperationLogDto dto) {
         PageVo<ListOperationLogVo> vo = new PageVo<>();
-        Page<ListOperationLogVo> page = new Page<>(dto.getCurrent(), dto.getPageSize());
-        List<ListOperationLogVo> list = operationLogDao.listOperationLog(page, dto);
-        vo.setList(list);
+        Page<ListOperationLogVo> page = operationLogDao.listOperationLog(new Page<>(dto.getCurrent(), dto.getPageSize()),
+                dto.getOperatorId(), dto.getOperatorAccount(), dto.getOperatorName(), dto.getOperationName(),
+                dto.getStartTime(), dto.getEndTime());
+        vo.setList(page.getRecords());
         vo.setTotal(page.getTotal());
         return R.ok(vo);
     }
@@ -57,7 +58,10 @@ public class LogService {
             dto.setStartTime(LocalDateTime.now().with(TemporalAdjusters.firstDayOfMonth()).with(LocalTime.MIN));
         }
         // 查询操作日志
-        List<ListOperationLogVo> list = operationLogDao.listOperationLog(null, dto);
+        Page<ListOperationLogVo> page = operationLogDao.listOperationLog(null, dto.getOperatorId(),
+                dto.getOperatorAccount(), dto.getOperatorName(), dto.getOperationName(),
+                dto.getStartTime(), dto.getEndTime());
+        List<ListOperationLogVo> list = page.getRecords();
         if (CollectionUtils.isEmpty(list)) {
             return R.error("没有查询到数据");
         }
@@ -97,7 +101,9 @@ public class LogService {
         }
         PageVo<ListVerificationLogVo> vo = new PageVo<>();
         Page<ListVerificationLogVo> page = new Page<>(dto.getCurrent(), dto.getPageSize());
-        List<ListVerificationLogVo> list = verificationLogDao.listVerificationLog(page, dto);
+        List<ListVerificationLogVo> list = verificationLogDao.listVerificationLog(page, dto.getUserId(),
+                dto.getCityId(), dto.getSystem(), dto.getLoginName(), dto.getUserName(),
+                dto.getStartTime(), dto.getEndTime());
         vo.setList(list);
         vo.setTotal(page.getTotal());
         return R.ok(vo);
@@ -115,7 +121,9 @@ public class LogService {
             dto.setCityId(cityId);
         }
         // 查询登录日志
-        List<ListVerificationLogVo> list = verificationLogDao.listVerificationLog(null, dto);
+        List<ListVerificationLogVo> list = verificationLogDao.listVerificationLog(null, dto.getUserId(),
+                dto.getCityId(), dto.getSystem(), dto.getLoginName(), dto.getUserName(),
+                dto.getStartTime(), dto.getEndTime());
         if (CollectionUtils.isEmpty(list)) {
             return R.error("没有查询到数据");
         }

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

@@ -25,7 +25,7 @@ public class RoleService {
         PageVo<ListRoleVo> vo = new PageVo<>();
         Page<ListRoleVo> page = new Page<>(dto.getCurrent(), dto.getPageSize());
         page.addOrder(OrderItem.asc("ar.\"system\""));
-        List<ListRoleVo> list = roleDao.list(page, dto);
+        List<ListRoleVo> list = roleDao.list(page, dto.getSystem(), dto.getRoleName());
         vo.setList(list);
         vo.setTotal(page.getTotal());
         return R.ok(vo);

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

@@ -86,7 +86,7 @@ public class UserService {
         PageVo<ListUserVo> vo = new PageVo<>();
         Page<ListUserVo> page = new Page<>(dto.getCurrent(), dto.getPageSize());
         page.addOrder(OrderItem.asc("au.city_id"));
-        List<ListUserVo> list = userDao.list(page, dto);
+        List<ListUserVo> list = userDao.list(page, dto.getLoginName(), dto.getUserName(), dto.getOrg(), dto.getAreaId());
         vo.setList(list);
         vo.setTotal(page.getTotal());
         return R.ok(vo);