diff --git a/orange-demo-activiti/orange-demo-activiti-service/.gitignore b/orange-demo-activiti/orange-demo-activiti-service/.gitignore
index ac242580..e3fa94cd 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/.gitignore
+++ b/orange-demo-activiti/orange-demo-activiti-service/.gitignore
@@ -1,4 +1,4 @@
-/target/
+target/
!.mvn/wrapper/maven-wrapper.jar
/.mvn/*
diff --git a/orange-demo-activiti/orange-demo-activiti-service/README.md b/orange-demo-activiti/orange-demo-activiti-service/README.md
index 0939c817..20274fd0 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/README.md
+++ b/orange-demo-activiti/orange-demo-activiti-service/README.md
@@ -1,5 +1,7 @@
### 服务接口文档
---
+- Knife4j
+ - 服务启动后,Knife4j的文档入口地址 [http://localhost:8082/doc.html#/plus](http://localhost:8082/doc.html#/plus)
- Postman
- 无需启动服务,即可将当前工程的接口导出成Postman格式。在工程的common/common-tools/模块下,找到ExportApiApp文件,并执行main函数。
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/pom.xml b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/pom.xml
index acac14b4..50e810a4 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/pom.xml
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/pom.xml
@@ -45,6 +45,11 @@
common-datafilter
1.0.0
+
+ com.orangeforms
+ common-swagger
+ 1.0.0
+
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/AreaCodeController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/AreaCodeController.java
index f9d34991..b43e0957 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/AreaCodeController.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/AreaCodeController.java
@@ -1,5 +1,6 @@
package com.orangeforms.webadmin.app.controller;
+import io.swagger.annotations.Api;
import cn.jimmyshi.beanquery.BeanQuery;
import com.orangeforms.webadmin.app.model.AreaCode;
import com.orangeforms.webadmin.app.service.AreaCodeService;
@@ -21,6 +22,7 @@ import java.util.*;
* @author Jerry
* @date 2021-06-06
*/
+@Api(tags = "行政区划数据访问接口")
@RestController
@RequestMapping("/admin/app/areaCode")
public class AreaCodeController {
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/AreaCodeVo.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/AreaCodeVo.java
index d7a7c5a7..4dce7d89 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/AreaCodeVo.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/AreaCodeVo.java
@@ -1,5 +1,7 @@
package com.orangeforms.webadmin.app.vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -8,26 +10,31 @@ import lombok.Data;
* @author Jerry
* @date 2021-06-06
*/
+@ApiModel("行政区划实体对象")
@Data
public class AreaCodeVo {
/**
* 行政区划主键Id
*/
+ @ApiModelProperty(value = "行政区划主键Id", required = true)
private Long areaId;
/**
* 行政区划名称
*/
+ @ApiModelProperty(value = "行政区划名称")
private String areaName;
/**
* 行政区划级别 (1: 省级别 2: 市级别 3: 区级别)
*/
+ @ApiModelProperty(value = "行政区划级别")
private Integer areaLevel;
/**
* 父级行政区划Id
*/
+ @ApiModelProperty(value = "父级行政区划Id")
private Long parentId;
}
\ No newline at end of file
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginController.java
index dfe78c08..5d295fc3 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginController.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginController.java
@@ -3,6 +3,10 @@ package com.orangeforms.webadmin.upms.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import lombok.extern.slf4j.Slf4j;
import com.orangeforms.webadmin.config.ApplicationConfig;
import com.orangeforms.webadmin.upms.service.*;
@@ -42,6 +46,8 @@ import java.util.stream.Collectors;
* @author Jerry
* @date 2021-06-06
*/
+@ApiSupport(order = 1)
+@Api(tags = "用户登录接口")
@Slf4j
@RestController
@RequestMapping("/admin/upms/login")
@@ -81,6 +87,12 @@ public class LoginController {
* @param password 密码。
* @return 应答结果对象,其中包括JWT的Token数据,以及菜单列表。
*/
+ @ApiImplicitParams({
+ // 这里包含密码密文,仅用于方便开发期间的接口测试,集成测试和发布阶段,需要将当前注解去掉。
+ // 如果您重新生成了公钥和私钥,请替换password的缺省值。
+ @ApiImplicitParam(name = "loginName", defaultValue = "admin"),
+ @ApiImplicitParam(name = "password", defaultValue = "IP3ccke3GhH45iGHB5qP9p7iZw6xUyj28Ju10rnBiPKOI35sc%2BjI7%2FdsjOkHWMfUwGYGfz8ik31HC2Ruk%2Fhkd9f6RPULTHj7VpFdNdde2P9M4mQQnFBAiPM7VT9iW3RyCtPlJexQ3nAiA09OqG%2F0sIf1kcyveSrulxembARDbDo%3D")
+ })
@NoAuthInterface
@PostMapping("/doLogin")
public ResponseResult doLogin(
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginUserController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginUserController.java
index a0ac1220..a3cb16af 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginUserController.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginUserController.java
@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON;
import com.orangeforms.common.core.annotation.MyRequestBody;
import com.orangeforms.common.core.object.*;
import com.orangeforms.common.core.util.RedisKeyUtil;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.redisson.api.RBucket;
import org.redisson.api.RedissonClient;
@@ -22,6 +23,7 @@ import java.util.*;
* @author Jerry
* @date 2021-06-06
*/
+@Api(tags = "在线用户接口")
@Slf4j
@RestController
@RequestMapping("/admin/upms/loginUser")
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDataPermController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDataPermController.java
index c2ccb7af..2f396b8f 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDataPermController.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDataPermController.java
@@ -1,5 +1,7 @@
package com.orangeforms.webadmin.upms.controller;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
import com.alibaba.fastjson.TypeReference;
import com.github.pagehelper.Page;
import com.github.pagehelper.page.PageMethod;
@@ -30,6 +32,7 @@ import java.util.stream.Collectors;
* @author Jerry
* @date 2021-06-06
*/
+@Api(tags = "数据权限管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/upms/sysDataPerm")
@@ -47,6 +50,11 @@ public class SysDataPermController {
* @param deptIdListString 数据权限关联的部门Id列表,多个之间逗号分隔。
* @return 应答结果对象。包含新增数据权限对象的主键Id。
*/
+ @ApiOperationSupport(ignoreParameters = {
+ "sysDataPermDto.dataPermId",
+ "sysDataPermDto.createTimeStart",
+ "sysDataPermDto.createTimeEnd",
+ "sysDataPermDto.searchString"})
@PostMapping("/add")
public ResponseResult add(
@MyRequestBody SysDataPermDto sysDataPermDto, @MyRequestBody String deptIdListString) {
@@ -74,6 +82,10 @@ public class SysDataPermController {
* @param deptIdListString 数据权限关联的部门Id列表,多个之间逗号分隔。
* @return 应答结果对象。
*/
+ @ApiOperationSupport(ignoreParameters = {
+ "sysDataPermDto.createTimeStart",
+ "sysDataPermDto.createTimeEnd",
+ "sysDataPermDto.searchString"})
@PostMapping("/update")
public ResponseResult update(
@MyRequestBody SysDataPermDto sysDataPermDto, @MyRequestBody String deptIdListString) {
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDeptController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDeptController.java
index 6978e5ee..b20f51f4 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDeptController.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDeptController.java
@@ -10,6 +10,8 @@ import com.orangeforms.common.core.object.*;
import com.orangeforms.common.core.util.*;
import com.orangeforms.common.core.constant.*;
import com.orangeforms.common.core.annotation.MyRequestBody;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +26,7 @@ import java.util.stream.Collectors;
* @author Jerry
* @date 2021-06-06
*/
+@Api(tags = "部门管理管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/upms/sysDept")
@@ -40,6 +43,7 @@ public class SysDeptController {
* @param sysDeptDto 新增对象。
* @return 应答结果对象,包含新增对象主键Id。
*/
+ @ApiOperationSupport(ignoreParameters = {"sysDeptDto.deptId"})
@PostMapping("/add")
public ResponseResult add(@MyRequestBody SysDeptDto sysDeptDto) {
String errorMessage = MyCommonUtil.getModelValidationError(sysDeptDto, false);
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysMenuController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysMenuController.java
index 50620d11..c822ee4a 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysMenuController.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysMenuController.java
@@ -2,6 +2,8 @@ package com.orangeforms.webadmin.upms.controller;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.TypeReference;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import com.orangeforms.webadmin.upms.dto.SysMenuDto;
import com.orangeforms.webadmin.upms.vo.SysMenuVo;
@@ -25,6 +27,7 @@ import java.util.*;
* @author Jerry
* @date 2021-06-06
*/
+@Api(tags = "菜单管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/upms/sysMenu")
@@ -40,6 +43,7 @@ public class SysMenuController {
* @param permCodeIdListString 与当前菜单Id绑定的权限Id列表,多个权限之间逗号分隔。
* @return 应答结果对象,包含新增菜单的主键Id。
*/
+ @ApiOperationSupport(ignoreParameters = {"sysMenuDto.menuId"})
@PostMapping("/add")
public ResponseResult add(
@MyRequestBody SysMenuDto sysMenuDto, @MyRequestBody String permCodeIdListString) {
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermCodeController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermCodeController.java
index 49a76e03..22291fb0 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermCodeController.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermCodeController.java
@@ -1,5 +1,7 @@
package com.orangeforms.webadmin.upms.controller;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
import com.alibaba.fastjson.TypeReference;
import lombok.extern.slf4j.Slf4j;
import com.orangeforms.webadmin.upms.dto.SysPermCodeDto;
@@ -24,6 +26,7 @@ import java.util.*;
* @author Jerry
* @date 2021-06-06
*/
+@Api(tags = "权限字管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/upms/sysPermCode")
@@ -39,6 +42,7 @@ public class SysPermCodeController {
* @param permIdListString 与当前权限Id绑定的权限资源Id列表,多个权限资源之间逗号分隔。
* @return 应答结果对象,包含新增权限字的主键Id。
*/
+ @ApiOperationSupport(ignoreParameters = {"sysPermCodeDto.permCodeId"})
@PostMapping("/add")
public ResponseResult add(
@MyRequestBody SysPermCodeDto sysPermCodeDto, @MyRequestBody String permIdListString) {
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermController.java
index d1b63293..e6aa7d3a 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermController.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermController.java
@@ -1,5 +1,7 @@
package com.orangeforms.webadmin.upms.controller;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
import com.github.pagehelper.Page;
import com.github.pagehelper.page.PageMethod;
import lombok.extern.slf4j.Slf4j;
@@ -25,6 +27,7 @@ import java.util.Map;
* @author Jerry
* @date 2021-06-06
*/
+@Api(tags = "权限资源管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/upms/sysPerm")
@@ -39,6 +42,7 @@ public class SysPermController {
* @param sysPermDto 新增权限资源对象。
* @return 应答结果对象,包含新增权限资源的主键Id。
*/
+ @ApiOperationSupport(ignoreParameters = {"sysPermDto.permId"})
@PostMapping("/add")
public ResponseResult add(@MyRequestBody SysPermDto sysPermDto) {
String errorMessage = MyCommonUtil.getModelValidationError(sysPermDto);
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermModuleController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermModuleController.java
index 4ac1e067..d8e2e4b9 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermModuleController.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermModuleController.java
@@ -1,5 +1,7 @@
package com.orangeforms.webadmin.upms.controller;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import com.orangeforms.webadmin.upms.dto.SysPermModuleDto;
import com.orangeforms.webadmin.upms.vo.SysPermModuleVo;
@@ -27,6 +29,7 @@ import java.util.Map;
* @author Jerry
* @date 2021-06-06
*/
+@Api(tags = "权限资源模块管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/upms/sysPermModule")
@@ -41,6 +44,7 @@ public class SysPermModuleController {
* @param sysPermModuleDto 新增权限资源模块对象。
* @return 应答结果对象,包含新增权限资源模块的主键Id。
*/
+ @ApiOperationSupport(ignoreParameters = {"sysPermModuleDto.moduleId"})
@PostMapping("/add")
public ResponseResult add(@MyRequestBody SysPermModuleDto sysPermModuleDto) {
String errorMessage = MyCommonUtil.getModelValidationError(sysPermModuleDto);
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPostController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPostController.java
index daecc152..a8ce9c79 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPostController.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPostController.java
@@ -1,5 +1,7 @@
package com.orangeforms.webadmin.upms.controller;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
import cn.jimmyshi.beanquery.BeanQuery;
import com.github.pagehelper.page.PageMethod;
import com.orangeforms.common.core.object.*;
@@ -24,6 +26,7 @@ import javax.validation.groups.Default;
* @author Jerry
* @date 2021-06-06
*/
+@Api(tags = "岗位管理操作管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/upms/sysPost")
@@ -38,6 +41,7 @@ public class SysPostController {
* @param sysPostDto 新增对象。
* @return 应答结果对象,包含新增对象主键Id。
*/
+ @ApiOperationSupport(ignoreParameters = {"sysPostDto.postId"})
@PostMapping("/add")
public ResponseResult add(@MyRequestBody SysPostDto sysPostDto) {
String errorMessage = MyCommonUtil.getModelValidationError(sysPostDto);
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysRoleController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysRoleController.java
index a510110e..a4d01c6c 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysRoleController.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysRoleController.java
@@ -1,6 +1,8 @@
package com.orangeforms.webadmin.upms.controller;
import cn.jimmyshi.beanquery.BeanQuery;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
import com.alibaba.fastjson.TypeReference;
import com.github.pagehelper.Page;
import com.github.pagehelper.page.PageMethod;
@@ -32,6 +34,7 @@ import java.util.stream.Collectors;
* @author Jerry
* @date 2021-06-06
*/
+@Api(tags = "角色管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/upms/sysRole")
@@ -49,6 +52,7 @@ public class SysRoleController {
* @param menuIdListString 与当前角色Id绑定的menuId列表,多个menuId之间逗号分隔。
* @return 应答结果对象,包含新增角色的主键Id。
*/
+ @ApiOperationSupport(ignoreParameters = {"sysRoleDto.roleId", "sysRoleDto.createTimeStart", "sysRoleDto.createTimeEnd"})
@PostMapping("/add")
public ResponseResult add(
@MyRequestBody SysRoleDto sysRoleDto, @MyRequestBody String menuIdListString) {
@@ -76,6 +80,7 @@ public class SysRoleController {
* @param menuIdListString 与当前角色Id绑定的menuId列表,多个menuId之间逗号分隔。
* @return 应答结果对象。
*/
+ @ApiOperationSupport(ignoreParameters = {"sysRoleDto.createTimeStart", "sysRoleDto.createTimeEnd"})
@PostMapping("/update")
public ResponseResult update(
@MyRequestBody SysRoleDto sysRoleDto, @MyRequestBody String menuIdListString) {
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysUserController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysUserController.java
index 93740918..fa4aa233 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysUserController.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysUserController.java
@@ -11,6 +11,8 @@ import com.orangeforms.common.core.util.*;
import com.orangeforms.common.core.constant.*;
import com.orangeforms.common.core.annotation.MyRequestBody;
import com.orangeforms.webadmin.config.ApplicationConfig;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +26,7 @@ import java.util.*;
* @author Jerry
* @date 2021-06-06
*/
+@Api(tags = "用户管理管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/upms/sysUser")
@@ -45,6 +48,10 @@ public class SysUserController {
* @param roleIdListString 逗号分隔的角色Id列表。
* @return 应答结果对象,包含新增用户的主键Id。
*/
+ @ApiOperationSupport(ignoreParameters = {
+ "sysUserDto.userId",
+ "sysUserDto.createTimeStart",
+ "sysUserDto.createTimeEnd"})
@PostMapping("/add")
public ResponseResult add(
@MyRequestBody SysUserDto sysUserDto,
@@ -77,6 +84,9 @@ public class SysUserController {
* @param roleIdListString 逗号分隔的角色Id列表。
* @return 应答结果对象。
*/
+ @ApiOperationSupport(ignoreParameters = {
+ "sysUserDto.createTimeStart",
+ "sysUserDto.createTimeEnd"})
@PostMapping("/update")
public ResponseResult update(
@MyRequestBody SysUserDto sysUserDto,
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDataPermDeptDto.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDataPermDeptDto.java
index b75fd7e3..c0065cfe 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDataPermDeptDto.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDataPermDeptDto.java
@@ -1,5 +1,7 @@
package com.orangeforms.webadmin.upms.dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -8,16 +10,19 @@ import lombok.Data;
* @author Jerry
* @date 2021-06-06
*/
+@ApiModel("数据权限与部门关联Dto")
@Data
public class SysDataPermDeptDto {
/**
* 数据权限Id。
*/
+ @ApiModelProperty(value = "数据权限Id", required = true)
private Long dataPermId;
/**
* 关联部门Id。
*/
+ @ApiModelProperty(value = "关联部门Id", required = true)
private Long deptId;
}
\ No newline at end of file
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDataPermDto.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDataPermDto.java
index e5937859..bfaa1622 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDataPermDto.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDataPermDto.java
@@ -4,6 +4,8 @@ import com.orangeforms.common.core.validator.UpdateGroup;
import com.orangeforms.common.core.validator.ConstDictRef;
import com.orangeforms.common.datafilter.constant.DataPermRuleType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
@@ -14,24 +16,28 @@ import javax.validation.constraints.*;
* @author Jerry
* @date 2021-06-06
*/
+@ApiModel("数据权限Dto")
@Data
public class SysDataPermDto {
/**
* 数据权限Id。
*/
+ @ApiModelProperty(value = "数据权限Id", required = true)
@NotNull(message = "数据权限Id不能为空!", groups = {UpdateGroup.class})
private Long dataPermId;
/**
* 显示名称。
*/
+ @ApiModelProperty(value = "显示名称", required = true)
@NotBlank(message = "数据权限名称不能为空!")
private String dataPermName;
/**
* 数据权限规则类型(0: 全部可见 1: 只看自己 2: 只看本部门 3: 本部门及子部门 4: 多部门及子部门 5: 自定义部门列表)。
*/
+ @ApiModelProperty(value = "数据权限规则类型", required = true)
@NotNull(message = "数据权限规则类型不能为空!")
@ConstDictRef(constDictClass = DataPermRuleType.class)
private Integer ruleType;
@@ -39,10 +45,12 @@ public class SysDataPermDto {
/**
* 部门Id列表(逗号分隔)。
*/
+ @ApiModelProperty(hidden = true)
private String deptIdListString;
/**
* 搜索字符串。
*/
+ @ApiModelProperty(value = "LIKE 模糊搜索字符串")
private String searchString;
}
\ No newline at end of file
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDeptDto.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDeptDto.java
index 9efb6ae3..a2054d46 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDeptDto.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDeptDto.java
@@ -2,6 +2,8 @@ package com.orangeforms.webadmin.upms.dto;
import com.orangeforms.common.core.validator.UpdateGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
@@ -14,49 +16,58 @@ import java.util.Date;
* @author Jerry
* @date 2021-06-06
*/
+@ApiModel("SysDeptDto对象")
@Data
public class SysDeptDto {
/**
* 部门Id。
*/
+ @ApiModelProperty(value = "部门Id", required = true)
@NotNull(message = "数据验证失败,部门Id不能为空!", groups = {UpdateGroup.class})
private Long deptId;
/**
* 部门名称。
*/
+ @ApiModelProperty(value = "部门名称", required = true)
@NotBlank(message = "数据验证失败,部门名称不能为空!")
private String deptName;
/**
* 显示顺序。
*/
+ @ApiModelProperty(value = "显示顺序", required = true)
@NotNull(message = "数据验证失败,显示顺序不能为空!")
private Integer showOrder;
/**
* 父部门Id。
*/
+ @ApiModelProperty(value = "父部门Id")
private Long parentId;
/**
* 创建者Id。
*/
+ @ApiModelProperty(value = "创建者Id")
private Long createUserId;
/**
* 更新者Id。
*/
+ @ApiModelProperty(value = "更新者Id")
private Long updateUserId;
/**
* 创建时间。
*/
+ @ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 更新时间。
*/
+ @ApiModelProperty(value = "更新时间")
private Date updateTime;
}
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDeptPostDto.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDeptPostDto.java
index 85179e06..06a0814c 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDeptPostDto.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDeptPostDto.java
@@ -2,6 +2,8 @@ package com.orangeforms.webadmin.upms.dto;
import com.orangeforms.common.core.validator.UpdateGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
@@ -12,30 +14,35 @@ import javax.validation.constraints.*;
* @author Jerry
* @date 2021-06-06
*/
+@ApiModel("部门岗位Dto")
@Data
public class SysDeptPostDto {
/**
* 部门岗位Id。
*/
+ @ApiModelProperty(value = "部门岗位Id", required = true)
@NotNull(message = "数据验证失败,部门岗位Id不能为空!", groups = {UpdateGroup.class})
private Long deptPostId;
/**
* 部门Id。
*/
+ @ApiModelProperty(value = "部门Id", required = true)
@NotNull(message = "数据验证失败,部门Id不能为空!", groups = {UpdateGroup.class})
private Long deptId;
/**
* 岗位Id。
*/
+ @ApiModelProperty(value = "岗位Id", required = true)
@NotNull(message = "数据验证失败,岗位Id不能为空!", groups = {UpdateGroup.class})
private Long postId;
/**
* 部门岗位显示名称。
*/
+ @ApiModelProperty(value = "部门岗位显示名称", required = true)
@NotBlank(message = "数据验证失败,部门岗位显示名称不能为空!")
private String postShowName;
}
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysMenuDto.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysMenuDto.java
index 15b7ef83..62314a90 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysMenuDto.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysMenuDto.java
@@ -3,6 +3,8 @@ package com.orangeforms.webadmin.upms.dto;
import com.orangeforms.common.core.validator.ConstDictRef;
import com.orangeforms.common.core.validator.UpdateGroup;
import com.orangeforms.webadmin.upms.model.constant.SysMenuType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@@ -14,29 +16,34 @@ import javax.validation.constraints.NotNull;
* @author Jerry
* @date 2021-06-06
*/
+@ApiModel("菜单Dto")
@Data
public class SysMenuDto {
/**
* 菜单Id。
*/
+ @ApiModelProperty(value = "菜单Id", required = true)
@NotNull(message = "菜单Id不能为空!", groups = {UpdateGroup.class})
private Long menuId;
/**
* 父菜单Id,目录菜单的父菜单为null
*/
+ @ApiModelProperty(value = "父菜单Id")
private Long parentId;
/**
* 菜单显示名称。
*/
+ @ApiModelProperty(value = "菜单显示名称", required = true)
@NotBlank(message = "菜单显示名称不能为空!")
private String menuName;
/**
* 菜单类型 (0: 目录 1: 菜单 2: 按钮 3: UI片段)。
*/
+ @ApiModelProperty(value = "菜单类型", required = true)
@NotNull(message = "菜单类型不能为空!")
@ConstDictRef(constDictClass = SysMenuType.class, message = "数据验证失败,菜单类型为无效值!")
private Integer menuType;
@@ -44,26 +51,31 @@ public class SysMenuDto {
/**
* 前端表单路由名称,仅用于menu_type为1的菜单类型。
*/
+ @ApiModelProperty(value = "前端表单路由名称")
private String formRouterName;
/**
* 在线表单主键Id,仅用于在线表单绑定的菜单。
*/
+ @ApiModelProperty(value = "在线表单主键Id")
private Long onlineFormId;
/**
* 仅用于在线表单的流程Id。
*/
+ @ApiModelProperty(value = "仅用于在线表单的流程Id")
private Long onlineFlowEntryId;
/**
* 菜单显示顺序 (值越小,排序越靠前)。
*/
+ @ApiModelProperty(value = "菜单显示顺序", required = true)
@NotNull(message = "菜单显示顺序不能为空!")
private Integer showOrder;
/**
* 菜单图标。
*/
+ @ApiModelProperty(value = "菜单显示顺序")
private String icon;
}
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermCodeDto.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermCodeDto.java
index 60489b39..e6aa1878 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermCodeDto.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermCodeDto.java
@@ -3,6 +3,8 @@ package com.orangeforms.webadmin.upms.dto;
import com.orangeforms.common.core.validator.ConstDictRef;
import com.orangeforms.common.core.validator.UpdateGroup;
import com.orangeforms.webadmin.upms.model.constant.SysPermCodeType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@@ -14,29 +16,34 @@ import javax.validation.constraints.NotNull;
* @author Jerry
* @date 2021-06-06
*/
+@ApiModel("权限字Dto")
@Data
public class SysPermCodeDto {
/**
* 权限字Id。
*/
+ @ApiModelProperty(value = "权限字Id", required = true)
@NotNull(message = "权限字Id不能为空!", groups = {UpdateGroup.class})
private Long permCodeId;
/**
* 权限字标识(一般为有含义的英文字符串)。
*/
+ @ApiModelProperty(value = "权限字标识", required = true)
@NotBlank(message = "权限字编码不能为空!")
private String permCode;
/**
* 上级权限字Id。
*/
+ @ApiModelProperty(value = "上级权限字Id")
private Long parentId;
/**
* 权限字类型(0: 表单 1: UI片段 2: 操作)。
*/
+ @ApiModelProperty(value = "权限字类型", required = true)
@NotNull(message = "权限字类型不能为空!")
@ConstDictRef(constDictClass = SysPermCodeType.class, message = "数据验证失败,权限类型为无效值!")
private Integer permCodeType;
@@ -44,12 +51,14 @@ public class SysPermCodeDto {
/**
* 显示名称。
*/
+ @ApiModelProperty(value = "显示名称", required = true)
@NotBlank(message = "权限字显示名称不能为空!")
private String showName;
/**
* 显示顺序(数值越小,越靠前)。
*/
+ @ApiModelProperty(value = "显示顺序", required = true)
@NotNull(message = "权限字显示顺序不能为空!")
private Integer showOrder;
}
\ No newline at end of file
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermDto.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermDto.java
index 0ea2b71e..163bed3e 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermDto.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermDto.java
@@ -1,6 +1,8 @@
package com.orangeforms.webadmin.upms.dto;
import com.orangeforms.common.core.validator.UpdateGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@@ -12,41 +14,48 @@ import javax.validation.constraints.NotNull;
* @author Jerry
* @date 2021-06-06
*/
+@ApiModel("权限资源Dto")
@Data
public class SysPermDto {
/**
* 权限资源Id。
*/
+ @ApiModelProperty(value = "权限资源Id", required = true)
@NotNull(message = "权限Id不能为空!", groups = {UpdateGroup.class})
private Long permId;
/**
* 权限资源名称。
*/
+ @ApiModelProperty(value = "权限资源名称", required = true)
@NotBlank(message = "权限资源名称不能为空!")
private String permName;
/**
* shiro格式的权限字,如(upms:sysUser:add)。
*/
+ @ApiModelProperty(value = "权限字")
private String permCode;
/**
* 权限所在的权限模块Id。
*/
+ @ApiModelProperty(value = "权限所在的权限模块Id")
@NotNull(message = "权限模块Id不能为空!")
private Long moduleId;
/**
* 关联的URL。
*/
+ @ApiModelProperty(value = "关联的URL", required = true)
@NotBlank(message = "权限关联的url不能为空!")
private String url;
/**
* 权限在当前模块下的顺序,由小到大。
*/
+ @ApiModelProperty(value = "显示顺序", required = true)
@NotNull(message = "权限显示顺序不能为空!")
private Integer showOrder;
}
\ No newline at end of file
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermModuleDto.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermModuleDto.java
index efeb1cbe..29459739 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermModuleDto.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermModuleDto.java
@@ -3,6 +3,8 @@ package com.orangeforms.webadmin.upms.dto;
import com.orangeforms.common.core.validator.ConstDictRef;
import com.orangeforms.common.core.validator.UpdateGroup;
import com.orangeforms.webadmin.upms.model.constant.SysPermModuleType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@@ -14,29 +16,34 @@ import javax.validation.constraints.NotNull;
* @author Jerry
* @date 2021-06-06
*/
+@ApiModel("权限资源模块Dto")
@Data
public class SysPermModuleDto {
/**
* 权限模块Id。
*/
+ @ApiModelProperty(value = "权限模块Id", required = true)
@NotNull(message = "权限模块Id不能为空!", groups = {UpdateGroup.class})
private Long moduleId;
/**
* 权限模块名称。
*/
+ @ApiModelProperty(value = "权限模块名称", required = true)
@NotBlank(message = "权限模块名称不能为空!")
private String moduleName;
/**
* 上级权限模块Id。
*/
+ @ApiModelProperty(value = "上级权限模块Id")
private Long parentId;
/**
* 权限模块类型(0: 普通模块 1: Controller模块)。
*/
+ @ApiModelProperty(value = "权限模块类型", required = true)
@NotNull(message = "模块类型不能为空!")
@ConstDictRef(constDictClass = SysPermModuleType.class, message = "数据验证失败,权限模块类型为无效值!")
private Integer moduleType;
@@ -44,6 +51,7 @@ public class SysPermModuleDto {
/**
* 权限模块在当前层级下的顺序,由小到大。
*/
+ @ApiModelProperty(value = "显示顺序", required = true)
@NotNull(message = "权限模块显示顺序不能为空!")
private Integer showOrder;
}
\ No newline at end of file
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPostDto.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPostDto.java
index 8dfc02b0..ea4d0d62 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPostDto.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPostDto.java
@@ -2,6 +2,8 @@ package com.orangeforms.webadmin.upms.dto;
import com.orangeforms.common.core.validator.UpdateGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
@@ -12,30 +14,35 @@ import javax.validation.constraints.*;
* @author Jerry
* @date 2021-06-06
*/
+@ApiModel("岗位Dto")
@Data
public class SysPostDto {
/**
* 岗位Id。
*/
+ @ApiModelProperty(value = "岗位Id", required = true)
@NotNull(message = "数据验证失败,岗位Id不能为空!", groups = {UpdateGroup.class})
private Long postId;
/**
* 岗位名称。
*/
+ @ApiModelProperty(value = "岗位名称", required = true)
@NotBlank(message = "数据验证失败,岗位名称不能为空!")
private String postName;
/**
* 岗位层级,数值越小级别越高。
*/
+ @ApiModelProperty(value = "岗位层级", required = true)
@NotNull(message = "数据验证失败,岗位层级不能为空!")
private Integer level;
/**
* 是否领导岗位。
*/
+ @ApiModelProperty(value = "是否领导岗位", required = true)
@NotNull(message = "数据验证失败,领导岗位不能为空!", groups = {UpdateGroup.class})
private Boolean leaderPost;
}
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysRoleDto.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysRoleDto.java
index d3c72d1a..bd14fed8 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysRoleDto.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysRoleDto.java
@@ -1,6 +1,8 @@
package com.orangeforms.webadmin.upms.dto;
import com.orangeforms.common.core.validator.UpdateGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
@@ -11,18 +13,21 @@ import javax.validation.constraints.*;
* @author Jerry
* @date 2021-06-06
*/
+@ApiModel("角色Dto")
@Data
public class SysRoleDto {
/**
* 角色Id。
*/
+ @ApiModelProperty(value = "角色Id", required = true)
@NotNull(message = "角色Id不能为空!", groups = {UpdateGroup.class})
private Long roleId;
/**
* 角色名称。
*/
+ @ApiModelProperty(value = "角色名称", required = true)
@NotBlank(message = "角色名称不能为空!")
private String roleName;
}
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysUserDto.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysUserDto.java
index dbb5377f..b09269c1 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysUserDto.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysUserDto.java
@@ -6,6 +6,8 @@ import com.orangeforms.common.core.validator.ConstDictRef;
import com.orangeforms.webadmin.upms.model.constant.SysUserType;
import com.orangeforms.webadmin.upms.model.constant.SysUserStatus;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
@@ -18,42 +20,49 @@ import java.util.Date;
* @author Jerry
* @date 2021-06-06
*/
+@ApiModel("SysUserDto对象")
@Data
public class SysUserDto {
/**
* 用户Id。
*/
+ @ApiModelProperty(value = "用户Id", required = true)
@NotNull(message = "数据验证失败,用户Id不能为空!", groups = {UpdateGroup.class})
private Long userId;
/**
* 登录用户名。
*/
+ @ApiModelProperty(value = "登录用户名", required = true)
@NotBlank(message = "数据验证失败,登录用户名不能为空!")
private String loginName;
/**
* 用户密码。
*/
+ @ApiModelProperty(value = "用户密码", required = true)
@NotBlank(message = "数据验证失败,用户密码不能为空!", groups = {AddGroup.class})
private String password;
/**
* 用户显示名称。
*/
+ @ApiModelProperty(value = "用户显示名称", required = true)
@NotBlank(message = "数据验证失败,用户显示名称不能为空!")
private String showName;
/**
* 用户部门Id。
*/
+ @ApiModelProperty(value = "用户部门Id", required = true)
@NotNull(message = "数据验证失败,用户部门Id不能为空!")
private Long deptId;
/**
* 用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)。
*/
+ @ApiModelProperty(value = "用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)", required = true)
@NotNull(message = "数据验证失败,用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)不能为空!")
@ConstDictRef(constDictClass = SysUserType.class, message = "数据验证失败,用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)为无效值!")
private Integer userType;
@@ -61,11 +70,13 @@ public class SysUserDto {
/**
* 用户头像的Url。
*/
+ @ApiModelProperty(value = "用户头像的Url")
private String headImageUrl;
/**
* 用户状态(0: 正常 1: 锁定)。
*/
+ @ApiModelProperty(value = "用户状态(0: 正常 1: 锁定)", required = true)
@NotNull(message = "数据验证失败,用户状态(0: 正常 1: 锁定)不能为空!")
@ConstDictRef(constDictClass = SysUserStatus.class, message = "数据验证失败,用户状态(0: 正常 1: 锁定)为无效值!")
private Integer userStatus;
@@ -73,30 +84,36 @@ public class SysUserDto {
/**
* 创建者Id。
*/
+ @ApiModelProperty(value = "创建者Id")
private Long createUserId;
/**
* 更新者Id。
*/
+ @ApiModelProperty(value = "更新者Id")
private Long updateUserId;
/**
* 创建时间。
*/
+ @ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 更新时间。
*/
+ @ApiModelProperty(value = "更新时间")
private Date updateTime;
/**
* createTime 范围过滤起始值(>=)。
*/
+ @ApiModelProperty(value = "createTime 范围过滤起始值(>=)")
private String createTimeStart;
/**
* createTime 范围过滤结束值(<=)。
*/
+ @ApiModelProperty(value = "createTime 范围过滤结束值(<=)")
private String createTimeEnd;
}
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysDataPermDeptVo.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysDataPermDeptVo.java
index 7b1ea64f..b789ce21 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysDataPermDeptVo.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysDataPermDeptVo.java
@@ -1,5 +1,7 @@
package com.orangeforms.webadmin.upms.vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -8,16 +10,19 @@ import lombok.Data;
* @author Jerry
* @date 2021-06-06
*/
+@ApiModel("数据权限与部门关联VO")
@Data
public class SysDataPermDeptVo {
/**
* 数据权限Id。
*/
+ @ApiModelProperty(value = "数据权限Id")
private Long dataPermId;
/**
* 关联部门Id。
*/
+ @ApiModelProperty(value = "关联部门Id")
private Long deptId;
}
\ No newline at end of file
diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysDataPermVo.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysDataPermVo.java
index 531943e0..20c05f90 100644
--- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysDataPermVo.java
+++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysDataPermVo.java
@@ -1,5 +1,7 @@
package com.orangeforms.webadmin.upms.vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.*;
@@ -10,51 +12,61 @@ import java.util.*;
* @author Jerry
* @date 2021-06-06
*/
+@ApiModel("数据权限VO")
@Data
public class SysDataPermVo {
/**
* 数据权限Id。
*/
+ @ApiModelProperty(value = "数据权限Id")
private Long dataPermId;
/**
* 显示名称。
*/
+ @ApiModelProperty(value = "显示名称")
private String dataPermName;
/**
* 数据权限规则类型(0: 全部可见 1: 只看自己 2: 只看本部门 3: 本部门及子部门 4: 多部门及子部门 5: 自定义部门列表)。
*/
+ @ApiModelProperty(value = "数据权限规则类型")
private Integer ruleType;
/**
* 部门Id列表(逗号分隔)。
*/
+ @ApiModelProperty(value = "部门Id列表")
private String deptIdListString;
/**
* 创建者Id。
*/
+ @ApiModelProperty(value = "创建者Id")
private Long createUserId;
/**
* 创建时间。
*/
+ @ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 更新者Id。
*/
+ @ApiModelProperty(value = "更新者Id")
private Long updateUserId;
/**
* 更新时间。
*/
+ @ApiModelProperty(value = "更新时间")
private Date updateTime;
/**
* 数据权限与部门关联对象列表。
*/
+ @ApiModelProperty(value = "数据权限与部门关联对象列表")
private List