Browse Source

Merge branches 'dev' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

master
jianjun 4 years ago
parent
commit
28522eef97
  1. 8
      epmet-admin/epmet-admin-client/pom.xml
  2. 5
      epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/MenuResourceDTO.java
  3. 8
      epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/NewsDTO.java
  4. 6
      epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/PasswordDTO.java
  5. 10
      epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDeptDTO.java
  6. 11
      epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictDataDTO.java
  7. 11
      epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictTypeDTO.java
  8. 13
      epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysLogErrorDTO.java
  9. 10
      epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysLogLoginDTO.java
  10. 16
      epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysLogOperationDTO.java
  11. 14
      epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysMenuDTO.java
  12. 10
      epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysParamsDTO.java
  13. 12
      epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRegionDTO.java
  14. 10
      epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRoleDTO.java
  15. 19
      epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysUserDTO.java
  16. 6
      epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/Region.java
  17. 5
      epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/RegionCity.java
  18. 5
      epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/RegionProvince.java
  19. 68
      epmet-admin/epmet-admin-server/src/main/java/com/epmet/config/SwaggerConfig.java
  20. 27
      epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/NewsController.java
  21. 8
      epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDeptController.java
  22. 21
      epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictDataController.java
  23. 23
      epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictTypeController.java
  24. 29
      epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysLogErrorController.java
  25. 34
      epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysLogLoginController.java
  26. 25
      epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysLogOperationController.java
  27. 20
      epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMenuController.java
  28. 29
      epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysParamsController.java
  29. 16
      epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRegionController.java
  30. 4
      epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysResourceController.java
  31. 21
      epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRoleController.java
  32. 28
      epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysUserController.java
  33. 69
      epmet-auth/src/main/java/com/epmet/config/SwaggerConfig.java
  34. 10
      epmet-auth/src/main/java/com/epmet/controller/AuthController.java
  35. 6
      epmet-auth/src/main/java/com/epmet/dto/AuthorizationDTO.java
  36. 8
      epmet-auth/src/main/java/com/epmet/dto/LoginDTO.java
  37. 10
      epmet-commons/epmet-commons-tools/pom.xml
  38. 5
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/page/PageData.java
  39. 7
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Result.java
  40. 9
      epmet-gateway/pom.xml
  41. 58
      epmet-gateway/src/main/java/com/epmet/swagger/SwaggerHandler.java
  42. 61
      epmet-gateway/src/main/java/com/epmet/swagger/SwaggerProvider.java
  43. 4
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenGovernRankDataDailyDao.xml
  44. 8
      epmet-module/epmet-activiti/epmet-activiti-client/pom.xml
  45. 15
      epmet-module/epmet-activiti/epmet-activiti-client/src/main/java/com/epmet/dto/HistoryDetailDTO.java
  46. 6
      epmet-module/epmet-activiti/epmet-activiti-client/src/main/java/com/epmet/dto/ModelDTO.java
  47. 14
      epmet-module/epmet-activiti/epmet-activiti-client/src/main/java/com/epmet/dto/ProcessActivityDTO.java
  48. 7
      epmet-module/epmet-activiti/epmet-activiti-client/src/main/java/com/epmet/dto/ProcessBizRouteAndProcessInstanceDTO.java
  49. 8
      epmet-module/epmet-activiti/epmet-activiti-client/src/main/java/com/epmet/dto/ProcessBizRouteDTO.java
  50. 18
      epmet-module/epmet-activiti/epmet-activiti-client/src/main/java/com/epmet/dto/ProcessInstanceDTO.java
  51. 6
      epmet-module/epmet-activiti/epmet-activiti-client/src/main/java/com/epmet/dto/ProcessStartDTO.java
  52. 23
      epmet-module/epmet-activiti/epmet-activiti-client/src/main/java/com/epmet/dto/TaskDTO.java
  53. 68
      epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/config/SwaggerConfig.java
  54. 25
      epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/controller/ActModelController.java
  55. 46
      epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/controller/ActProcessController.java
  56. 22
      epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/controller/ActRunningController.java
  57. 70
      epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/controller/ActTaskController.java
  58. 57
      epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/controller/HistoryController.java
  59. 25
      epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/demo/controller/CorrectionController.java
  60. 12
      epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/demo/dto/CorrectionDTO.java
  61. 8
      epmet-module/epmet-common-service/common-service-client/pom.xml
  62. 9
      epmet-module/epmet-demo/epmet-demo-client/pom.xml
  63. 8
      epmet-module/epmet-heart/epmet-heart-client/pom.xml
  64. 68
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/config/SwaggerConfig.java
  65. 8
      epmet-module/epmet-job/epmet-job-client/pom.xml
  66. 12
      epmet-module/epmet-job/epmet-job-client/src/main/java/com/epmet/dto/ScheduleJobDTO.java
  67. 11
      epmet-module/epmet-job/epmet-job-client/src/main/java/com/epmet/dto/ScheduleJobLogDTO.java
  68. 2
      epmet-module/epmet-job/epmet-job-client/src/main/java/com/epmet/dto/ScheduleJobTypeDTO.java
  69. 68
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/SwaggerConfig.java
  70. 2
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/controller/DemoController.java
  71. 25
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/controller/ScheduleJobController.java
  72. 18
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/controller/ScheduleJobLogController.java
  73. 9
      epmet-module/epmet-message/epmet-message-client/pom.xml
  74. 13
      epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysMailLogDTO.java
  75. 9
      epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysMailTemplateDTO.java
  76. 14
      epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysSmsDTO.java
  77. 68
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/config/SwaggerConfig.java
  78. 19
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailLogController.java
  79. 24
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailTemplateController.java
  80. 29
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java
  81. 8
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/email/EmailConfig.java
  82. 13
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/SmsConfig.java
  83. 8
      epmet-module/epmet-oss/epmet-oss-client/pom.xml
  84. 5
      epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/dto/UploadDTO.java
  85. 33
      epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/CloudStorageConfig.java
  86. 68
      epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/config/SwaggerConfig.java
  87. 11
      epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
  88. 11
      epmet-module/epmet-point/epmet-point-client/pom.xml
  89. 8
      epmet-module/gov-access/gov-access-client/pom.xml
  90. 5
      epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/MenuResourceDTO.java
  91. 6
      epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java
  92. 68
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/config/SwaggerConfig.java
  93. 10
      epmet-module/gov-mine/gov-mine-client/pom.xml
  94. 9
      epmet-module/gov-org/gov-org-client/pom.xml
  95. 68
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/SwaggerConfig.java
  96. 10
      epmet-module/gov-voice/gov-voice-client/pom.xml
  97. 10
      epmet-module/oper-access/oper-access-client/pom.xml
  98. 5
      epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/result/MenuResourceDTO.java
  99. 14
      epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/result/OperMenuDTO.java
  100. 8
      epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperRoleController.java

8
epmet-admin/epmet-admin-client/pom.xml

@ -18,14 +18,6 @@
<artifactId>epmet-commons-tools</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>
</dependencies>
<build>

5
epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/MenuResourceDTO.java

@ -8,8 +8,6 @@
package com.epmet.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -19,11 +17,8 @@ import lombok.Data;
* @since 1.0.0
*/
@Data
@ApiModel(value = "菜单资源")
public class MenuResourceDTO {
@ApiModelProperty(value = "资源URL")
private String resourceUrl;
@ApiModelProperty(value = "请求方式(如:GET、POST、PUT、DELETE)")
private String resourceMethod;
}

8
epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/NewsDTO.java

@ -12,8 +12,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@ -28,26 +26,20 @@ import java.util.Date;
* @author Mark sunlightcs@gmail.com
*/
@Data
@ApiModel(value = "新闻管理")
public class NewsDTO implements Serializable {
@ApiModelProperty(value = "id")
@Null(message="{id.null}", groups = AddGroup.class)
@NotNull(message="{id.require}", groups = UpdateGroup.class)
private Long id;
@ApiModelProperty(value = "标题")
@NotBlank(message="{news.title.require}", groups = DefaultGroup.class)
private String title;
@ApiModelProperty(value = "内容")
@NotBlank(message="{news.content.require}", groups = DefaultGroup.class)
private String content;
@ApiModelProperty(value = "发布时间")
private Date pubDate;
@ApiModelProperty(value = "创建时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private Date createDate;

6
epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/PasswordDTO.java

@ -8,8 +8,7 @@
package com.epmet.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@ -22,15 +21,12 @@ import java.io.Serializable;
* @since 1.0.0
*/
@Data
@ApiModel(value = "修改密码")
public class PasswordDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "原密码")
@NotBlank(message="{sysuser.password.require}")
private String password;
@ApiModelProperty(value = "新密码")
@NotBlank(message="{sysuser.password.require}")
private String newPassword;

10
epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDeptDTO.java

@ -13,8 +13,7 @@ import com.epmet.commons.tools.utils.TreeNode;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
@ -29,32 +28,25 @@ import java.util.Date;
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
@ApiModel(value = "部门管理")
public class SysDeptDTO extends TreeNode implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
@Null(message="{id.null}", groups = AddGroup.class)
@NotNull(message="{id.require}", groups = UpdateGroup.class)
private Long id;
@ApiModelProperty(value = "上级ID")
@NotNull(message="{sysdept.pid.require}", groups = DefaultGroup.class)
private Long pid;
@ApiModelProperty(value = "部门名称")
@NotBlank(message="{sysdept.name.require}", groups = DefaultGroup.class)
private String name;
@ApiModelProperty(value = "排序")
@Min(value = 0, message = "{sort.number}", groups = DefaultGroup.class)
private Integer sort;
@ApiModelProperty(value = "创建时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private Date createDate;
@ApiModelProperty(value = "上级部门名称")
private String parentName;
public void setName(String name) {

11
epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictDataDTO.java

@ -12,8 +12,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Min;
@ -29,38 +27,29 @@ import java.util.Date;
* @author Mark sunlightcs@gmail.com
*/
@Data
@ApiModel(value = "字典数据")
public class SysDictDataDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
@Null(message="{id.null}", groups = AddGroup.class)
@NotNull(message="{id.require}", groups = UpdateGroup.class)
private Long id;
@ApiModelProperty(value = "字典类型ID")
@NotNull(message="{sysdict.type.require}", groups = DefaultGroup.class)
private Long dictTypeId;
@ApiModelProperty(value = "字典标签")
@NotBlank(message="{sysdict.label.require}", groups = DefaultGroup.class)
private String dictLabel;
@ApiModelProperty(value = "字典值")
private String dictValue;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "排序")
@Min(value = 0, message = "{sort.number}", groups = DefaultGroup.class)
private Integer sort;
@ApiModelProperty(value = "创建时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private Date createDate;
@ApiModelProperty(value = "更新时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private Date updateDate;
}

11
epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictTypeDTO.java

@ -12,8 +12,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Min;
@ -29,35 +28,27 @@ import java.util.Date;
* @author Mark sunlightcs@gmail.com
*/
@Data
@ApiModel(value = "字典类型")
public class SysDictTypeDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
@Null(message="{id.null}", groups = AddGroup.class)
@NotNull(message="{id.require}", groups = UpdateGroup.class)
private Long id;
@ApiModelProperty(value = "字典类型")
@NotBlank(message="{sysdict.type.require}", groups = DefaultGroup.class)
private String dictType;
@ApiModelProperty(value = "字典名称")
@NotBlank(message="{sysdict.name.require}", groups = DefaultGroup.class)
private String dictName;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "排序")
@Min(value = 0, message = "{sort.number}", groups = DefaultGroup.class)
private Integer sort;
@ApiModelProperty(value = "创建时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private Date createDate;
@ApiModelProperty(value = "更新时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private Date updateDate;
}

13
epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysLogErrorDTO.java

@ -8,8 +8,7 @@
package com.epmet.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -22,27 +21,17 @@ import java.util.Date;
* @since 1.0.0
*/
@Data
@ApiModel(value = "异常日志")
public class SysLogErrorDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
private Long id;
@ApiModelProperty(value = "模块名称,如:sys")
private String module;
@ApiModelProperty(value = "请求URI")
private String requestUri;
@ApiModelProperty(value = "请求方式")
private String requestMethod;
@ApiModelProperty(value = "请求参数")
private String requestParams;
@ApiModelProperty(value = "用户代理")
private String userAgent;
@ApiModelProperty(value = "操作IP")
private String ip;
@ApiModelProperty(value = "异常信息")
private String errorInfo;
@ApiModelProperty(value = "创建时间")
private Date createDate;
}

10
epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysLogLoginDTO.java

@ -8,8 +8,6 @@
package com.epmet.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -22,29 +20,21 @@ import java.util.Date;
* @since 1.0.0
*/
@Data
@ApiModel(value = "登录日志")
public class SysLogLoginDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
private Long id;
@ApiModelProperty(value = "用户操作 0:用户登录 1:用户退出")
private Integer operation;
@ApiModelProperty(value = "状态 0:失败 1:成功 2:账号已锁定")
private Integer status;
@ApiModelProperty(value = "用户代理")
private String userAgent;
@ApiModelProperty(value = "操作IP")
private String ip;
@ApiModelProperty(value = "用户名")
private String creatorName;
@ApiModelProperty(value = "创建时间")
private Date createDate;
}

16
epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysLogOperationDTO.java

@ -8,8 +8,7 @@
package com.epmet.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -22,44 +21,31 @@ import java.util.Date;
* @since 1.0.0
*/
@Data
@ApiModel(value = "操作日志")
public class SysLogOperationDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
private Long id;
@ApiModelProperty(value = "模块名称,如:sys")
private String module;
@ApiModelProperty(value = "用户操作")
private String operation;
@ApiModelProperty(value = "请求URI")
private String requestUri;
@ApiModelProperty(value = "请求方式")
private String requestMethod;
@ApiModelProperty(value = "请求参数")
private String requestParams;
@ApiModelProperty(value = "请求时长(毫秒)")
private Integer requestTime;
@ApiModelProperty(value = "用户代理")
private String userAgent;
@ApiModelProperty(value = "操作IP")
private String ip;
@ApiModelProperty(value = "状态 0:失败 1:成功")
private Integer status;
@ApiModelProperty(value = "用户名")
private String creatorName;
@ApiModelProperty(value = "创建时间")
private Date createDate;
}

14
epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysMenuDTO.java

@ -13,8 +13,6 @@ import com.epmet.commons.tools.utils.TreeNode;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.hibernate.validator.constraints.Range;
import javax.validation.constraints.Min;
@ -31,48 +29,36 @@ import java.util.List;
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
@ApiModel(value = "菜单管理")
public class SysMenuDTO extends TreeNode<SysMenuDTO> implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
@Null(message="{id.null}", groups = AddGroup.class)
@NotNull(message="{id.require}", groups = UpdateGroup.class)
private Long id;
@ApiModelProperty(value = "上级ID")
@NotNull(message="{sysmenu.pid.require}", groups = DefaultGroup.class)
private Long pid;
@ApiModelProperty(value = "菜单名称")
@NotBlank(message="{sysmenu.name.require}", groups = DefaultGroup.class)
private String name;
@ApiModelProperty(value = "菜单URL")
private String url;
@ApiModelProperty(value = "类型 0:菜单 1:按钮")
@Range(min=0, max=1, message = "{sysmenu.type.range}", groups = DefaultGroup.class)
private Integer type;
@ApiModelProperty(value = "菜单图标")
private String icon;
@ApiModelProperty(value = "权限标识,如:sys:menu:save")
private String permissions;
@ApiModelProperty(value = "排序")
@Min(value = 0, message = "{sort.number}", groups = DefaultGroup.class)
private Integer sort;
@ApiModelProperty(value = "创建时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private Date createDate;
@ApiModelProperty(value = "菜单资源")
private List<MenuResourceDTO> resourceList;
@ApiModelProperty(value = "上级菜单名称")
private String parentName;
public void setName(String name) {

10
epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysParamsDTO.java

@ -12,8 +12,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@ -29,31 +28,24 @@ import java.util.Date;
* @since 1.0.0
*/
@Data
@ApiModel(value = "参数管理")
public class SysParamsDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
@Null(message="{id.null}", groups = AddGroup.class)
@NotNull(message="{id.require}", groups = UpdateGroup.class)
private Long id;
@ApiModelProperty(value = "参数编码")
@NotBlank(message="{sysparams.paramcode.require}", groups = DefaultGroup.class)
private String paramCode;
@ApiModelProperty(value = "参数值")
@NotBlank(message="{sysparams.paramvalue.require}", groups = DefaultGroup.class)
private String paramValue;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "创建时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private Date createDate;
@ApiModelProperty(value = "更新时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private Date updateDate;

12
epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRegionDTO.java

@ -10,8 +10,7 @@ package com.epmet.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Min;
@ -27,36 +26,27 @@ import java.util.Date;
* @author Mark sunlightcs@gmail.com
*/
@Data
@ApiModel(value = "行政区域")
public class SysRegionDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "区域标识")
@NotNull(message="{id.require}", groups = DefaultGroup.class)
private Long id;
@ApiModelProperty(value = "上级区域ID")
@NotNull(message="{region.pid.require}", groups = DefaultGroup.class)
private Long pid;
@ApiModelProperty(value = "区域名称")
@NotBlank(message="{region.name.require}", groups = DefaultGroup.class)
private String name;
@ApiModelProperty(value = "排序")
@Min(value = 0, message = "{sort.number}", groups = DefaultGroup.class)
private Long sort;
@ApiModelProperty(value = "上级区域名称")
private String parentName;
@ApiModelProperty(value = "是否有子节点")
private Boolean hasChildren;
@ApiModelProperty(value = "层级")
private Integer treeLevel;
@ApiModelProperty(value = "更新时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private Date updateDate;
}

10
epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRoleDTO.java

@ -12,8 +12,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@ -30,30 +29,23 @@ import java.util.List;
* @since 1.0.0
*/
@Data
@ApiModel(value = "角色管理")
public class SysRoleDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
@Null(message="{id.null}", groups = AddGroup.class)
@NotNull(message="{id.require}", groups = UpdateGroup.class)
private Long id;
@ApiModelProperty(value = "角色名称")
@NotBlank(message="{sysrole.name.require}", groups = DefaultGroup.class)
private String name;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "创建时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private Date createDate;
@ApiModelProperty(value = "菜单ID列表")
private List<Long> menuIdList;
@ApiModelProperty(value = "部门ID列表")
private List<Long> deptIdList;
}

19
epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysUserDTO.java

@ -12,8 +12,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Range;
@ -32,67 +31,51 @@ import java.util.List;
* @since 1.0.0
*/
@Data
@ApiModel(value = "用户管理")
public class SysUserDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
@Null(message="{id.null}", groups = AddGroup.class)
@NotNull(message="{id.require}", groups = UpdateGroup.class)
private Long id;
@ApiModelProperty(value = "用户名", required = true)
@NotBlank(message="{sysuser.username.require}", groups = DefaultGroup.class)
private String username;
@ApiModelProperty(value = "密码")
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
@NotBlank(message="{sysuser.password.require}", groups = AddGroup.class)
private String password;
@ApiModelProperty(value = "姓名", required = true)
@NotBlank(message="{sysuser.realname.require}", groups = DefaultGroup.class)
private String realName;
@ApiModelProperty(value = "头像")
private String headUrl;
@ApiModelProperty(value = "性别 0:男 1:女 2:保密", required = true)
@Range(min=0, max=2, message = "{sysuser.gender.range}", groups = DefaultGroup.class)
private Integer gender;
@ApiModelProperty(value = "邮箱", required = true)
@NotBlank(message="{sysuser.email.require}", groups = DefaultGroup.class)
@Email(message="{sysuser.email.error}", groups = DefaultGroup.class)
private String email;
@ApiModelProperty(value = "手机号", required = true)
@NotBlank(message="{sysuser.mobile.require}", groups = DefaultGroup.class)
private String mobile;
@ApiModelProperty(value = "部门ID", required = true)
@NotNull(message="{sysuser.deptId.require}", groups = DefaultGroup.class)
private Long deptId;
@ApiModelProperty(value = "超级管理员 0:否 1:是")
@Range(min=0, max=1, message = "{sysuser.superadmin.range}", groups = DefaultGroup.class)
private Integer superAdmin;
@ApiModelProperty(value = "状态 0:停用 1:正常", required = true)
@Range(min=0, max=1, message = "{sysuser.status.range}", groups = DefaultGroup.class)
private Integer status;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "创建时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private Date createDate;
@ApiModelProperty(value = "角色ID列表")
private List<Long> roleIdList;
@ApiModelProperty(value = "部门名称")
private String deptName;
}

6
epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/Region.java

@ -9,8 +9,7 @@
package com.epmet.dto.region;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -21,16 +20,13 @@ import java.io.Serializable;
* @author Mark sunlightcs@gmail.com
*/
@Data
@ApiModel(value = "地区管理")
public class Region implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "地区ID")
private Long id;
@JsonIgnore
private Long pid;
@ApiModelProperty(value = "名称")
private String name;
}

5
epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/RegionCity.java

@ -8,8 +8,7 @@
package com.epmet.dto.region;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -21,10 +20,8 @@ import java.util.List;
*
* @author Mark sunlightcs@gmail.com
*/
@ApiModel(value = "市")
@Data
@EqualsAndHashCode(callSuper = true)
public class RegionCity extends Region {
@ApiModelProperty(value = "区、县列表")
private List<Region> counties = new ArrayList<>();
}

5
epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/RegionProvince.java

@ -8,8 +8,7 @@
package com.epmet.dto.region;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -21,10 +20,8 @@ import java.util.List;
*
* @author Mark sunlightcs@gmail.com
*/
@ApiModel(value = "省")
@Data
@EqualsAndHashCode(callSuper = true)
public class RegionProvince extends Region {
@ApiModelProperty(value = "市列表")
private List<Region> cities = new ArrayList<>();
}

68
epmet-admin/epmet-admin-server/src/main/java/com/epmet/config/SwaggerConfig.java

@ -1,68 +0,0 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
*
* https://www.renren.io
*
* 版权所有侵权必究
*/
package com.epmet.config;
import com.epmet.commons.tools.constant.Constant;
import io.swagger.annotations.ApiOperation;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.ApiKey;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import java.util.List;
import static com.google.common.collect.Lists.newArrayList;
/**
* Swagger配置
*
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
@Configuration
@EnableSwagger2
public class SwaggerConfig {
@Bean
public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo())
.select()
//加了ApiOperation注解的类,才生成接口文档
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
//包下的类,才生成接口文档
//.apis(RequestHandlerSelectors.basePackage("io.renren.controller"))
.paths(PathSelectors.any())
.build()
.directModelSubstitute(java.util.Date.class, String.class)
.securitySchemes(security());
}
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
.title("人人开源")
.description("系统模块开发文档")
.termsOfServiceUrl("https://www.renren.io/community")
.version("1.4.0")
.build();
}
private List<ApiKey> security() {
return newArrayList(
new ApiKey(Constant.TOKEN_HEADER, Constant.TOKEN_HEADER, "header")
);
}
}

27
epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/NewsController.java

@ -8,9 +8,6 @@
package com.epmet.controller;
import com.epmet.dto.NewsDTO;
import com.epmet.service.NewsService;
import com.epmet.commons.tools.constant.Constant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
@ -18,13 +15,10 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import com.epmet.dto.NewsDTO;
import com.epmet.service.NewsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Arrays;
import java.util.Map;
@ -36,29 +30,17 @@ import java.util.Map;
*/
@RestController
@RequestMapping("news")
@Api(tags="新闻管理")
public class NewsController {
@Autowired
private NewsService newsService;
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = "title", value = "标题", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "startDate", value = "开始时间", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "endDate", value = "结束时间", paramType = "query", dataType="String")
})
public Result<PageData<NewsDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<NewsDTO>> page(@RequestParam Map<String, Object> params){
PageData<NewsDTO> page = newsService.page(params);
return new Result<PageData<NewsDTO>>().ok(page);
}
@ApiOperation("信息")
@GetMapping("{id}")
public Result<NewsDTO> info(@PathVariable("id") Long id){
NewsDTO news = newsService.get(id);
@ -67,7 +49,6 @@ public class NewsController {
}
@PostMapping
@ApiOperation("保存")
public Result save(NewsDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@ -78,7 +59,6 @@ public class NewsController {
}
@PutMapping
@ApiOperation("修改")
public Result update(NewsDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -89,7 +69,6 @@ public class NewsController {
}
@DeleteMapping
@ApiOperation("删除")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");

8
epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDeptController.java

@ -16,8 +16,6 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -32,13 +30,11 @@ import java.util.List;
*/
@RestController
@RequestMapping("dept")
@Api(tags="部门管理")
public class SysDeptController {
@Autowired
private SysDeptService sysDeptService;
@GetMapping("list")
@ApiOperation("列表")
public Result<List<SysDeptDTO>> list(){
List<SysDeptDTO> list = sysDeptService.list(new HashMap<>(1));
@ -46,7 +42,6 @@ public class SysDeptController {
}
@GetMapping("{id}")
@ApiOperation("信息")
public Result<SysDeptDTO> get(@PathVariable("id") Long id){
SysDeptDTO data = sysDeptService.get(id);
@ -54,7 +49,6 @@ public class SysDeptController {
}
@PostMapping
@ApiOperation("保存")
public Result save(@RequestBody SysDeptDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@ -65,7 +59,6 @@ public class SysDeptController {
}
@PutMapping
@ApiOperation("修改")
public Result update(@RequestBody SysDeptDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -76,7 +69,6 @@ public class SysDeptController {
}
@DeleteMapping("{id}")
@ApiOperation("删除")
public Result delete(@PathVariable("id") Long id){
//效验数据
AssertUtils.isNull(id, "id");

21
epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictDataController.java

@ -17,13 +17,8 @@ import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
@ -34,22 +29,12 @@ import java.util.Map;
*/
@RestController
@RequestMapping("dict/data")
@Api(tags="字典数据")
public class SysDictDataController {
@Autowired
private SysDictDataService sysDictDataService;
@GetMapping("page")
@ApiOperation("字典数据")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = "dictLabel", value = "字典标签", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "dictValue", value = "字典值", paramType = "query", dataType="String")
})
public Result<PageData<SysDictDataDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<SysDictDataDTO>> page(@RequestParam Map<String, Object> params){
//字典类型
PageData<SysDictDataDTO> page = sysDictDataService.page(params);
@ -57,7 +42,6 @@ public class SysDictDataController {
}
@GetMapping("{id}")
@ApiOperation("信息")
public Result<SysDictDataDTO> get(@PathVariable("id") Long id){
SysDictDataDTO data = sysDictDataService.get(id);
@ -65,7 +49,6 @@ public class SysDictDataController {
}
@PostMapping
@ApiOperation("保存")
public Result save(@RequestBody SysDictDataDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, DefaultGroup.class);
@ -76,7 +59,6 @@ public class SysDictDataController {
}
@PutMapping
@ApiOperation("修改")
public Result update(@RequestBody SysDictDataDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -87,7 +69,6 @@ public class SysDictDataController {
}
@DeleteMapping
@ApiOperation("删除")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");

23
epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictTypeController.java

@ -18,14 +18,8 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.entity.DictType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
import java.util.Map;
@ -36,22 +30,12 @@ import java.util.Map;
*/
@RestController
@RequestMapping("dict/type")
@Api(tags="字典类型")
public class SysDictTypeController {
@Autowired
private SysDictTypeService sysDictTypeService;
@GetMapping("page")
@ApiOperation("字典类型")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = "dictType", value = "字典类型", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "dictName", value = "字典名称", paramType = "query", dataType="String")
})
public Result<PageData<SysDictTypeDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<SysDictTypeDTO>> page(@RequestParam Map<String, Object> params){
//字典类型
PageData<SysDictTypeDTO> page = sysDictTypeService.page(params);
@ -59,7 +43,6 @@ public class SysDictTypeController {
}
@GetMapping("{id}")
@ApiOperation("信息")
public Result<SysDictTypeDTO> get(@PathVariable("id") Long id){
SysDictTypeDTO data = sysDictTypeService.get(id);
@ -67,7 +50,6 @@ public class SysDictTypeController {
}
@PostMapping
@ApiOperation("保存")
public Result save(@RequestBody SysDictTypeDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, DefaultGroup.class);
@ -78,7 +60,6 @@ public class SysDictTypeController {
}
@PutMapping
@ApiOperation("修改")
public Result update(@RequestBody SysDictTypeDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -89,7 +70,6 @@ public class SysDictTypeController {
}
@DeleteMapping
@ApiOperation("删除")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
@ -100,7 +80,6 @@ public class SysDictTypeController {
}
@GetMapping("all")
@ApiOperation("所有字典数据")
public Result<List<DictType>> all(){
List<DictType> list = sysDictTypeService.getAllList();

29
epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysLogErrorController.java

@ -8,20 +8,17 @@
package com.epmet.controller;
import com.epmet.dto.SysLogErrorDTO;
import com.epmet.service.SysLogErrorService;
import com.epmet.commons.tools.constant.Constant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.SysLogErrorDTO;
import com.epmet.excel.SysLogErrorExcel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import com.epmet.service.SysLogErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@ -36,29 +33,19 @@ import java.util.Map;
*/
@RestController
@RequestMapping("log/error")
@Api(tags="异常日志")
public class SysLogErrorController {
@Autowired
private SysLogErrorService sysLogErrorService;
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = "module", value = "模块名称,如:sys", paramType = "query", dataType="String")
})
public Result<PageData<SysLogErrorDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<SysLogErrorDTO>> page(@RequestParam Map<String, Object> params){
PageData<SysLogErrorDTO> page = sysLogErrorService.page(params);
return new Result<PageData<SysLogErrorDTO>>().ok(page);
}
@GetMapping("export")
@ApiOperation("导出")
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<SysLogErrorDTO> list = sysLogErrorService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, SysLogErrorExcel.class);

34
epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysLogLoginController.java

@ -8,20 +8,17 @@
package com.epmet.controller;
import com.epmet.dto.SysLogLoginDTO;
import com.epmet.service.SysLogLoginService;
import com.epmet.commons.tools.constant.Constant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.SysLogLoginDTO;
import com.epmet.excel.SysLogLoginExcel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import com.epmet.service.SysLogLoginService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@ -36,34 +33,19 @@ import java.util.Map;
*/
@RestController
@RequestMapping("log/login")
@Api(tags="登录日志")
public class SysLogLoginController {
@Autowired
private SysLogLoginService sysLogLoginService;
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = "status", value = "状态 0:失败 1:成功 2:账号已锁定", paramType = "query", dataType="int"),
@ApiImplicitParam(name = "creatorName", value = "用户名", paramType = "query", dataType="String")
})
public Result<PageData<SysLogLoginDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<SysLogLoginDTO>> page(@RequestParam Map<String, Object> params){
PageData<SysLogLoginDTO> page = sysLogLoginService.page(params);
return new Result<PageData<SysLogLoginDTO>>().ok(page);
}
@GetMapping("export")
@ApiOperation("导出")
@ApiImplicitParams({
@ApiImplicitParam(name = "status", value = "状态 0:失败 1:成功 2:账号已锁定", paramType = "query", dataType="int"),
@ApiImplicitParam(name = "creatorName", value = "用户名", paramType = "query", dataType="String")
})
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<SysLogLoginDTO> list = sysLogLoginService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, SysLogLoginExcel.class);

25
epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysLogOperationController.java

@ -8,23 +8,17 @@
package com.epmet.controller;
import com.epmet.dto.SysLogOperationDTO;
import com.epmet.service.SysLogOperationService;
import com.epmet.commons.tools.constant.Constant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.SysLogOperationDTO;
import com.epmet.excel.SysLogOperationExcel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import com.epmet.service.SysLogOperationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@ -39,30 +33,19 @@ import java.util.Map;
*/
@RestController
@RequestMapping("log/operation")
@Api(tags="操作日志")
public class SysLogOperationController {
@Autowired
private SysLogOperationService sysLogOperationService;
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = "module", value = "模块名称,如:sys", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "status", value = "状态 0:失败 1:成功", paramType = "query", dataType="int")
})
public Result<PageData<SysLogOperationDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<SysLogOperationDTO>> page(@RequestParam Map<String, Object> params){
PageData<SysLogOperationDTO> page = sysLogOperationService.page(params);
return new Result<PageData<SysLogOperationDTO>>().ok(page);
}
@GetMapping("export")
@ApiOperation("导出")
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<SysLogOperationDTO> list = sysLogOperationService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, SysLogOperationExcel.class);

20
epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMenuController.java

@ -18,12 +18,8 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
import java.util.Set;
@ -36,7 +32,6 @@ import java.util.Set;
*/
@RestController
@RequestMapping("menu")
@Api(tags="菜单管理")
public class SysMenuController {
@Autowired
private SysMenuService sysMenuService;
@ -44,24 +39,20 @@ public class SysMenuController {
private SysResourceService sysResourceService;
@GetMapping("nav")
@ApiOperation("导航")
public Result<List<SysMenuDTO>> nav(@ApiIgnore UserDetail userDetail){
public Result<List<SysMenuDTO>> nav(UserDetail userDetail){
List<SysMenuDTO> list = sysMenuService.getUserMenuNavList(userDetail);
return new Result<List<SysMenuDTO>>().ok(list);
}
@GetMapping("permissions")
@ApiOperation("权限标识")
public Result<Set<String>> permissions(@ApiIgnore UserDetail userDetail){
public Result<Set<String>> permissions(UserDetail userDetail){
Set<String> set = sysMenuService.getUserPermissions(userDetail);
return new Result<Set<String>>().ok(set);
}
@GetMapping("list")
@ApiOperation("列表")
@ApiImplicitParam(name = "type", value = "菜单类型 0:菜单 1:按钮 null:全部", paramType = "query", dataType="int")
public Result<List<SysMenuDTO>> list(Integer type){
List<SysMenuDTO> list = sysMenuService.getMenuList(type);
@ -69,7 +60,6 @@ public class SysMenuController {
}
@GetMapping("{id}")
@ApiOperation("信息")
public Result<SysMenuDTO> get(@PathVariable("id") Long id){
SysMenuDTO data = sysMenuService.get(id);
@ -81,7 +71,6 @@ public class SysMenuController {
}
@PostMapping
@ApiOperation("保存")
public Result save(@RequestBody SysMenuDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, DefaultGroup.class);
@ -92,7 +81,6 @@ public class SysMenuController {
}
@PutMapping
@ApiOperation("修改")
public Result update(@RequestBody SysMenuDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, DefaultGroup.class);
@ -103,7 +91,6 @@ public class SysMenuController {
}
@DeleteMapping("{id}")
@ApiOperation("删除")
public Result delete(@PathVariable("id") Long id){
//效验数据
AssertUtils.isNull(id, "id");
@ -120,8 +107,7 @@ public class SysMenuController {
}
@GetMapping("select")
@ApiOperation("角色菜单权限")
public Result<List<SysMenuDTO>> select(@ApiIgnore UserDetail userDetail){
public Result<List<SysMenuDTO>> select(UserDetail userDetail){
List<SysMenuDTO> list = sysMenuService.getUserMenuList(userDetail, null);
return new Result<List<SysMenuDTO>>().ok(list);

29
epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysParamsController.java

@ -8,9 +8,6 @@
package com.epmet.controller;
import com.epmet.dto.SysParamsDTO;
import com.epmet.service.SysParamsService;
import com.epmet.commons.tools.constant.Constant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
@ -19,14 +16,11 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.SysParamsDTO;
import com.epmet.excel.SysParamsExcel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import com.epmet.service.SysParamsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@ -41,28 +35,18 @@ import java.util.Map;
*/
@RestController
@RequestMapping("params")
@Api(tags="参数管理")
public class SysParamsController {
@Autowired
private SysParamsService sysParamsService;
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = "paramCode", value = "参数编码", paramType = "query", dataType="String")
})
public Result<PageData<SysParamsDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<SysParamsDTO>> page(@RequestParam Map<String, Object> params){
PageData<SysParamsDTO> page = sysParamsService.page(params);
return new Result<PageData<SysParamsDTO>>().ok(page);
}
@GetMapping("{id}")
@ApiOperation("信息")
public Result<SysParamsDTO> get(@PathVariable("id") Long id){
SysParamsDTO data = sysParamsService.get(id);
@ -70,7 +54,6 @@ public class SysParamsController {
}
@PostMapping
@ApiOperation("保存")
public Result save(@RequestBody SysParamsDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@ -81,7 +64,6 @@ public class SysParamsController {
}
@PutMapping
@ApiOperation("修改")
public Result update(@RequestBody SysParamsDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -92,7 +74,6 @@ public class SysParamsController {
}
@DeleteMapping
@ApiOperation("删除")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
@ -103,9 +84,7 @@ public class SysParamsController {
}
@GetMapping("export")
@ApiOperation("导出")
@ApiImplicitParam(name = "paramCode", value = "参数编码", paramType = "query", dataType="String")
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<SysParamsDTO> list = sysParamsService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, SysParamsExcel.class);

16
epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRegionController.java

@ -19,10 +19,6 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -36,16 +32,11 @@ import java.util.Map;
*/
@RestController
@RequestMapping("region")
@Api(tags="行政区域")
public class SysRegionController {
@Autowired
private SysRegionService sysRegionService;
@GetMapping("list")
@ApiOperation("列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "pid", value = "上级ID", paramType = "query", dataType="String")
})
public Result<List<SysRegionDTO>> list(@RequestParam Map<String, Object> params){
List<SysRegionDTO> list = sysRegionService.list(params);
@ -53,7 +44,6 @@ public class SysRegionController {
}
@GetMapping("tree")
@ApiOperation("树形数据")
public Result<List<Map<String, Object>>> tree(){
List<Map<String, Object>> list = sysRegionService.getTreeList();
@ -61,7 +51,6 @@ public class SysRegionController {
}
@GetMapping("{id}")
@ApiOperation("信息")
public Result<SysRegionDTO> get(@PathVariable("id") Long id){
SysRegionDTO data = sysRegionService.get(id);
@ -69,7 +58,6 @@ public class SysRegionController {
}
@PostMapping
@ApiOperation("保存")
public Result save(@RequestBody SysRegionDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@ -80,7 +68,6 @@ public class SysRegionController {
}
@PutMapping
@ApiOperation("修改")
public Result update(@RequestBody SysRegionDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -91,7 +78,6 @@ public class SysRegionController {
}
@DeleteMapping("{id}")
@ApiOperation("删除")
public Result delete(@PathVariable("id") Long id){
//效验数据
AssertUtils.isNull(id, "id");
@ -107,8 +93,6 @@ public class SysRegionController {
}
@GetMapping("region")
@ApiOperation("地区列表")
@ApiImplicitParam(name = "threeLevel", value = "是否显示3级 true显示 false不显示", paramType = "query", dataType="boolean")
public Result<List<RegionProvince>> region(@RequestParam(value = "threeLevel", defaultValue = "true") boolean threeLevel){
List<RegionProvince> list = sysRegionService.getRegion(threeLevel);

4
epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysResourceController.java

@ -8,9 +8,8 @@
package com.epmet.controller;
import com.epmet.service.SysResourceService;
import com.epmet.commons.tools.security.bo.ResourceBO;
import io.swagger.annotations.Api;
import com.epmet.service.SysResourceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@ -26,7 +25,6 @@ import java.util.List;
*/
@RestController
@RequestMapping("resource")
@Api(tags="资源管理")
public class SysResourceController {
@Autowired
private SysResourceService sysResourceService;

21
epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRoleController.java

@ -21,13 +21,8 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.service.SysRoleDataScopeService;
import com.epmet.service.SysRoleMenuService;
import com.epmet.service.SysRoleUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.HashMap;
import java.util.List;
@ -41,7 +36,6 @@ import java.util.Map;
*/
@RestController
@RequestMapping("role")
@Api(tags="角色管理")
public class SysRoleController {
@Autowired
private SysRoleService sysRoleService;
@ -53,22 +47,13 @@ public class SysRoleController {
private SysRoleUserService sysRoleUserService;
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = "name", value = "角色名", paramType = "query", dataType="String")
})
public Result<PageData<SysRoleDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<SysRoleDTO>> page(@RequestParam Map<String, Object> params){
PageData<SysRoleDTO> page = sysRoleService.page(params);
return new Result<PageData<SysRoleDTO>>().ok(page);
}
@GetMapping("list")
@ApiOperation("列表")
public Result<List<SysRoleDTO>> list(){
List<SysRoleDTO> data = sysRoleService.list(new HashMap<>(1));
@ -76,7 +61,6 @@ public class SysRoleController {
}
@GetMapping("{id}")
@ApiOperation("信息")
public Result<SysRoleDTO> get(@PathVariable("id") Long id){
SysRoleDTO data = sysRoleService.get(id);
@ -92,7 +76,6 @@ public class SysRoleController {
}
@PostMapping
@ApiOperation("保存")
public Result save(@RequestBody SysRoleDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@ -103,7 +86,6 @@ public class SysRoleController {
}
@PutMapping
@ApiOperation("修改")
public Result update(@RequestBody SysRoleDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -114,7 +96,6 @@ public class SysRoleController {
}
@DeleteMapping
@ApiOperation("删除")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");

28
epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysUserController.java

@ -30,13 +30,8 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.excel.SysUserExcel;
import com.epmet.service.SysRoleDataScopeService;
import com.epmet.service.SysRoleUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@ -50,7 +45,6 @@ import java.util.Map;
*/
@RestController
@RequestMapping("user")
@Api(tags="用户管理")
public class SysUserController {
@Autowired
private SysUserService sysUserService;
@ -62,22 +56,13 @@ public class SysUserController {
private SysResourceService sysResourceService;
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = "username", value = "用户名", paramType = "query", dataType="String")
})
public Result<PageData<SysUserDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<SysUserDTO>> page(@RequestParam Map<String, Object> params){
PageData<SysUserDTO> page = sysUserService.page(params);
return new Result<PageData<SysUserDTO>>().ok(page);
}
@GetMapping("{id}")
@ApiOperation("信息")
public Result<SysUserDTO> get(@PathVariable("id") Long id){
SysUserDTO data = sysUserService.get(id);
@ -89,14 +74,12 @@ public class SysUserController {
}
@GetMapping("info")
@ApiOperation("登录用户信息")
public Result<SysUserDTO> info(@ApiIgnore UserDetail user){
public Result<SysUserDTO> info(UserDetail user){
SysUserDTO data = ConvertUtils.sourceToTarget(user, SysUserDTO.class);
return new Result<SysUserDTO>().ok(data);
}
@PostMapping
@ApiOperation("保存")
public Result save(@RequestBody SysUserDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@ -107,7 +90,6 @@ public class SysUserController {
}
@PutMapping
@ApiOperation("修改")
public Result update(@RequestBody SysUserDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -118,7 +100,6 @@ public class SysUserController {
}
@PutMapping("password")
@ApiOperation("修改密码")
public Result password(@RequestBody PasswordDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto);
@ -136,7 +117,6 @@ public class SysUserController {
}
@DeleteMapping
@ApiOperation("删除")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
@ -147,9 +127,7 @@ public class SysUserController {
}
@GetMapping("export")
@ApiOperation("导出")
@ApiImplicitParam(name = "username", value = "用户名", paramType = "query", dataType="String")
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<SysUserDTO> list = sysUserService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, SysUserExcel.class);

69
epmet-auth/src/main/java/com/epmet/config/SwaggerConfig.java

@ -1,69 +0,0 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
*
* https://www.renren.io
*
* 版权所有侵权必究
*/
package com.epmet.config;
import com.epmet.commons.tools.constant.Constant;
import io.swagger.annotations.ApiOperation;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.ApiKey;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import java.util.List;
import static com.google.common.collect.Lists.newArrayList;
/**
* Swagger配置
*
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
@Configuration
@EnableSwagger2
public class SwaggerConfig {
@Bean
public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo())
.select()
//加了ApiOperation注解的类,才生成接口文档
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
//包下的类,才生成接口文档
//.apis(RequestHandlerSelectors.basePackage("io.renren.controller"))
.paths(PathSelectors.any())
.build()
.directModelSubstitute(java.util.Date.class, String.class)
.securitySchemes(security());
}
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
.title("人人开源")
.description("认证模块开发文档")
.termsOfServiceUrl("https://www.renren.io/community")
.version("1.1.0")
.build();
}
private List<ApiKey> security() {
return newArrayList(
new ApiKey(Constant.TOKEN_HEADER, Constant.TOKEN_HEADER, "header")
);
}
}

10
epmet-auth/src/main/java/com/epmet/controller/AuthController.java

@ -15,15 +15,10 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.AuthorizationDTO;
import com.epmet.dto.CustomerStaffDTO;
import com.epmet.dto.LoginDTO;
import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.service.AuthService;
import com.epmet.service.CaptchaService;
import com.epmet.service.ResourceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -41,7 +36,6 @@ import java.io.IOException;
* @since 1.0.0
*/
@RestController
@Api(tags="授权管理")
public class AuthController {
@Autowired
private AuthService authService;
@ -51,8 +45,6 @@ public class AuthController {
private CaptchaService captchaService;
@GetMapping("captcha")
@ApiOperation(value = "验证码", produces="application/octet-stream")
@ApiImplicitParam(paramType = "query", dataType="string", name = "uuid", required = true)
public void captcha(HttpServletResponse response, String uuid)throws IOException {
//uuid不能为空
AssertUtils.isBlank(uuid, ErrorCode.IDENTIFIER_NOT_NULL);
@ -68,7 +60,6 @@ public class AuthController {
}
@PostMapping(value = "login")
@ApiOperation(value = "登录")
public Result<AuthorizationDTO> login(@RequestBody LoginDTO login){
//效验数据
ValidatorUtils.validateEntity(login);
@ -86,7 +77,6 @@ public class AuthController {
}
@PostMapping(value = "logout")
@ApiOperation(value = "退出")
public Result logout(HttpServletRequest request){
String userId = request.getHeader(Constant.USER_KEY);

6
epmet-auth/src/main/java/com/epmet/dto/AuthorizationDTO.java

@ -8,8 +8,7 @@
package com.epmet.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -21,13 +20,10 @@ import java.io.Serializable;
* @since 1.0.0
*/
@Data
@ApiModel(value = "授权信息")
public class AuthorizationDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "token", required = true)
private String token;
@ApiModelProperty(value = "过期时长,单位秒", required = true)
private Integer expire;
}

8
epmet-auth/src/main/java/com/epmet/dto/LoginDTO.java

@ -8,8 +8,7 @@
package com.epmet.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@ -22,23 +21,18 @@ import java.io.Serializable;
* @since 1.0.0
*/
@Data
@ApiModel(value = "登录信息")
public class LoginDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "用户名", required = true)
@NotBlank(message="{sysuser.username.require}")
private String username;
@ApiModelProperty(value = "密码")
@NotBlank(message="{sysuser.password.require}")
private String password;
@ApiModelProperty(value = "验证码")
@NotBlank(message="{sysuser.captcha.require}")
private String captcha;
@ApiModelProperty(value = "唯一标识")
@NotBlank(message="{sysuser.uuid.require}")
private String uuid;

10
epmet-commons/epmet-commons-tools/pom.xml

@ -120,16 +120,6 @@
<artifactId>jsoup</artifactId>
<version>${jsoup.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>

5
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/page/PageData.java

@ -8,8 +8,6 @@
package com.epmet.commons.tools.page;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -22,14 +20,11 @@ import java.util.List;
* @since 1.0.0
*/
@Data
@ApiModel(value = "分页数据")
public class PageData<T> implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "总记录数")
private int total;
@ApiModelProperty(value = "列表数据")
private List<T> list;
/**

7
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Result.java

@ -11,9 +11,6 @@ package com.epmet.commons.tools.utils;
import com.alibaba.fastjson.JSON;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.ErrorCode;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.ToString;
import org.apache.commons.lang3.StringUtils;
import java.io.Serializable;
@ -24,18 +21,15 @@ import java.io.Serializable;
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
@ApiModel(value = "响应")
public class Result<T> implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 编码0表示成功其他值表示失败
*/
@ApiModelProperty(value = "编码:0表示成功,其他值表示失败")
private int code = 0;
/**
* 消息内容
*/
@ApiModelProperty(value = "消息内容")
private String msg = "success";
/**
@ -46,7 +40,6 @@ public class Result<T> implements Serializable {
/**
* 响应数据
*/
@ApiModelProperty(value = "响应数据")
private T data;
public Result<T> ok(T data) {

9
epmet-gateway/pom.xml

@ -43,15 +43,6 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.9.2</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>

58
epmet-gateway/src/main/java/com/epmet/swagger/SwaggerHandler.java

@ -1,58 +0,0 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
*
* https://www.renren.io
*
* 版权所有侵权必究
*/
package com.epmet.swagger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import reactor.core.publisher.Mono;
import springfox.documentation.swagger.web.*;
import java.util.Optional;
/**
* Swagger
*
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
@RestController
@RequestMapping("/swagger-resources")
public class SwaggerHandler {
@Autowired(required = false)
private SecurityConfiguration securityConfiguration;
@Autowired(required = false)
private UiConfiguration uiConfiguration;
private final SwaggerResourcesProvider swaggerResources;
@Autowired
public SwaggerHandler(SwaggerResourcesProvider swaggerResources) {
this.swaggerResources = swaggerResources;
}
@GetMapping("/configuration/security")
public Mono<ResponseEntity<SecurityConfiguration>> securityConfiguration() {
return Mono.just(new ResponseEntity<>(
Optional.ofNullable(securityConfiguration).orElse(SecurityConfigurationBuilder.builder().build()), HttpStatus.OK));
}
@GetMapping("/configuration/ui")
public Mono<ResponseEntity<UiConfiguration>> uiConfiguration() {
return Mono.just(new ResponseEntity<>(
Optional.ofNullable(uiConfiguration).orElse(UiConfigurationBuilder.builder().build()), HttpStatus.OK));
}
@GetMapping
public Mono<ResponseEntity> swaggerResources() {
return Mono.just((new ResponseEntity<>(swaggerResources.get(), HttpStatus.OK)));
}
}

61
epmet-gateway/src/main/java/com/epmet/swagger/SwaggerProvider.java

@ -1,61 +0,0 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
*
* https://www.renren.io
*
* 版权所有侵权必究
*/
package com.epmet.swagger;
import org.springframework.cloud.gateway.config.GatewayProperties;
import org.springframework.cloud.gateway.route.RouteLocator;
import org.springframework.cloud.gateway.support.NameUtils;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Component;
import springfox.documentation.swagger.web.SwaggerResource;
import springfox.documentation.swagger.web.SwaggerResourcesProvider;
import java.util.ArrayList;
import java.util.List;
/**
* Swagger
*
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
@Component
@Primary
public class SwaggerProvider implements SwaggerResourcesProvider {
public static final String API_URI = "/v2/api-docs";
private final RouteLocator routeLocator;
private final GatewayProperties gatewayProperties;
public SwaggerProvider(RouteLocator routeLocator, GatewayProperties gatewayProperties) {
this.routeLocator = routeLocator;
this.gatewayProperties = gatewayProperties;
}
@Override
public List<SwaggerResource> get() {
List<SwaggerResource> resources = new ArrayList<>();
List<String> routes = new ArrayList<>();
routeLocator.getRoutes().subscribe(route -> routes.add(route.getId()));
gatewayProperties.getRoutes().stream().filter(routeDefinition -> routes.contains(routeDefinition.getId()))
.forEach(routeDefinition -> routeDefinition.getPredicates().stream()
.filter(predicateDefinition -> ("Path").equalsIgnoreCase(predicateDefinition.getName()))
.forEach(predicateDefinition -> resources.add(swaggerResource(routeDefinition.getId(),
predicateDefinition.getArgs().get(NameUtils.GENERATED_NAME_PREFIX + "0").replace("/**", API_URI)))));
return resources;
}
private SwaggerResource swaggerResource(String name, String location) {
SwaggerResource swaggerResource = new SwaggerResource();
swaggerResource.setName(name);
swaggerResource.setLocation(location);
swaggerResource.setSwaggerVersion("2.0");
return swaggerResource;
}
}

4
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenGovernRankDataDailyDao.xml

@ -27,7 +27,7 @@
<delete id="deleteRankData">
delete from screen_govern_rank_data_daily
where CUSTOMER_ID = #{customerId}
AND DATE_ID &lt;= #{dateId}
AND DATE_ID = #{dateId}
<if test='null != orgType and "" != orgType'>
and ORG_TYPE=#{orgType}
</if>
@ -91,4 +91,4 @@
</select>
</mapper>
</mapper>

8
epmet-module/epmet-activiti/epmet-activiti-client/pom.xml

@ -18,14 +18,6 @@
<artifactId>epmet-commons-tools</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>
</dependencies>
<build>

15
epmet-module/epmet-activiti/epmet-activiti-client/src/main/java/com/epmet/dto/HistoryDetailDTO.java

@ -8,8 +8,6 @@
package com.epmet.dto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@ -20,42 +18,29 @@ import java.util.Date;
* @author Jone
*/
@Data
@Api(tags="历史细节")
public class HistoryDetailDTO {
@ApiModelProperty(value = "ID")
private String id;
@ApiModelProperty(value = "环节名称")
private String activityName;
@ApiModelProperty(value = "环节类型")
private String activityType;
@ApiModelProperty(value = "流程定义ID")
private String processDefinitionId;
@ApiModelProperty(value = "实例ID")
private String processInstanceId;
@ApiModelProperty(value = "任务ID")
private String taskId;
@ApiModelProperty(value = "执行ID")
private String executionId;
@ApiModelProperty(value = "受理人")
private String assignee;
@ApiModelProperty(value = "开始时间")
private Date startTime;
@ApiModelProperty(value = "结束时间")
private Date endTime;
@ApiModelProperty(value = "时长(秒)")
private Long durationInSeconds;
@ApiModelProperty(value = "审批意见")
private String comment;
}

6
epmet-module/epmet-activiti/epmet-activiti-client/src/main/java/com/epmet/dto/ModelDTO.java

@ -8,8 +8,6 @@
package com.epmet.dto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@ -21,19 +19,15 @@ import java.io.Serializable;
* @author Mark sunlightcs@gmail.com
*/
@Data
@Api(tags="模型")
public class ModelDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "模型名称")
@NotBlank(message="{model.name.require}")
private String name;
@ApiModelProperty(value = "模型标识")
@NotBlank(message="{model.key.require}")
private String key;
@ApiModelProperty(value = "模型描述")
private String description;
}

14
epmet-module/epmet-activiti/epmet-activiti-client/src/main/java/com/epmet/dto/ProcessActivityDTO.java

@ -8,8 +8,6 @@
package com.epmet.dto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@ -18,41 +16,29 @@ import java.util.Date;
* @author Jone
*/
@Data
@Api(tags="流程活动")
public class ProcessActivityDTO {
@ApiModelProperty(value = "流程定义ID")
private String processDefinitionId;
@ApiModelProperty(value = "流程定义名称")
private String processDefinitionName;
@ApiModelProperty(value = "流程定义版本")
private Integer processDefinitionVersion;
@ApiModelProperty(value = "实例ID")
private String processInstanceId;
@ApiModelProperty(value = "业务KEY")
private String businessKey;
@ApiModelProperty(value = "发起时间")
private Date startTime;
@ApiModelProperty(value = "结束时间")
private Date endTime;
@ApiModelProperty(value = "发起人")
private String startUserId;
@ApiModelProperty(value = "发起人姓名")
private String startUserName;
@ApiModelProperty(value = "受理人")
private String assignee;
@ApiModelProperty(value = "受理人姓名")
private String assigneeName;
}

7
epmet-module/epmet-activiti/epmet-activiti-client/src/main/java/com/epmet/dto/ProcessBizRouteAndProcessInstanceDTO.java

@ -8,27 +8,20 @@
package com.epmet.dto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author:Jone
*/
@Data
@Api(tags="流程业务配置和实例信息")
public class ProcessBizRouteAndProcessInstanceDTO extends ProcessBizRouteDTO {
@ApiModelProperty(value = "实例ID")
private String processInstanceId;
@ApiModelProperty(value = "流程定义ID")
private String processDefinitionId;
@ApiModelProperty(value = "流程定义名称")
private String processDefinitionName;
@ApiModelProperty(value = "流程定义KEY")
private String processDefinitionKey;
}

8
epmet-module/epmet-activiti/epmet-activiti-client/src/main/java/com/epmet/dto/ProcessBizRouteDTO.java

@ -8,8 +8,6 @@
package com.epmet.dto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@ -19,27 +17,21 @@ import javax.validation.constraints.NotNull;
* @Author:Jone
*/
@Data
@Api(tags="流程业务配置")
public class ProcessBizRouteDTO {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
private Long id;
@ApiModelProperty(value = "流程定义ID")
@NotBlank(message="{processBizRoute.procDefId.require}")
private String procDefId;
@ApiModelProperty(value = "业务路由")
@NotBlank(message="{processBizRoute.bizRoute.require}")
private String bizRoute;
@ApiModelProperty(value = "流程定义KEY")
@NotBlank(message="{processBizRoute.procDefKey.require}")
private String procDefKey;
@ApiModelProperty(value = "版本号")
@NotNull(message="{processBizRoute.version.require}")
private Integer version;
}

18
epmet-module/epmet-activiti/epmet-activiti-client/src/main/java/com/epmet/dto/ProcessInstanceDTO.java

@ -8,8 +8,6 @@
package com.epmet.dto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@ -19,54 +17,38 @@ import java.util.List;
* @author Jone
*/
@Data
@Api(tags="实例")
public class ProcessInstanceDTO {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "实例ID")
private String processInstanceId;
@ApiModelProperty(value = "流程定义ID")
private String processDefinitionId;
@ApiModelProperty(value = "流程定义名称")
private String processDefinitionName;
@ApiModelProperty(value = "流程定义KEY")
private String processDefinitionKey;
@ApiModelProperty(value = "流程定义版本")
private Integer processDefinitionVersion;
@ApiModelProperty(value = "部署ID")
private String deploymentId;
@ApiModelProperty(value = "业务唯一KEY")
private String businessKey;
@ApiModelProperty(value = "实例名称")
private String name;
@ApiModelProperty(value = "描述")
private String description;
@ApiModelProperty(value = "是否结束")
private boolean isEnded;
@ApiModelProperty(value = "是否挂起")
private boolean isSuspended;
@ApiModelProperty(value = "结束时间")
private Date endTime;
@ApiModelProperty(value = "开始时间")
private Date startTime;
@ApiModelProperty(value = "发起人ID")
private String createUserId;
@ApiModelProperty(value = "当前任务")
private List<TaskDTO> currentTaskList;

6
epmet-module/epmet-activiti/epmet-activiti-client/src/main/java/com/epmet/dto/ProcessStartDTO.java

@ -8,8 +8,6 @@
package com.epmet.dto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@ -19,17 +17,13 @@ import java.util.Map;
* @Author:Jone
*/
@Data
@Api(tags="流程启动参数")
public class ProcessStartDTO {
@ApiModelProperty(value = "流程KEY")
@NotBlank(message="{ProcessStart.processDefinitionKey.require}")
private String processDefinitionKey;
@ApiModelProperty(value = "业务KEY")
@NotBlank(message="{ProcessStart.businessKey.require}")
private String businessKey;
@ApiModelProperty(value = "流程参数")
private Map<String, Object> variables;
}

23
epmet-module/epmet-activiti/epmet-activiti-client/src/main/java/com/epmet/dto/TaskDTO.java

@ -8,8 +8,6 @@
package com.epmet.dto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@ -20,68 +18,47 @@ import java.util.Map;
* @author Jone
*/
@Data
@Api(tags="任务")
public class TaskDTO {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "任务ID")
private String taskId;
@ApiModelProperty(value = "任务名称")
private String taskName;
@ApiModelProperty(value = "用户ID")
private String userId;
@ApiModelProperty(value = "任务参数")
private Map<String,Object> params;
@ApiModelProperty(value = "流程定义ID")
private String processDefinitionId;
@ApiModelProperty(value = "实例ID")
private String processInstanceId;
@ApiModelProperty(value = "角色")
private String roleIds;
@ApiModelProperty(value = "受理人")
private String assignee;
@ApiModelProperty(value = "受理人姓名")
private String assigneeName;
@ApiModelProperty(value = "任务所有人")
private String owner;
@ApiModelProperty(value = "审核意见")
private String comment;
@ApiModelProperty(value = "活动节点ID")
private String activityId;
@ApiModelProperty(value = "角色组")
private List<String> lstGroupId;
@ApiModelProperty(value = "候选人")
private List<String> lstUserIds;
@ApiModelProperty(value = "处理时间")
private Date dueDate;
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ApiModelProperty(value = "业务ID")
private String businessKey;
@ApiModelProperty(value = "流程定义名称")
private String processDefinitionName;
@ApiModelProperty(value = "流程定义KEY")
private String processDefinitionKey;
@ApiModelProperty(value = "流程发起时间")
private Date startTime;
}

68
epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/config/SwaggerConfig.java

@ -1,68 +0,0 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
*
* https://www.renren.io
*
* 版权所有侵权必究
*/
package com.epmet.config;
import com.epmet.commons.tools.constant.Constant;
import io.swagger.annotations.ApiOperation;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.ApiKey;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import java.util.List;
import static com.google.common.collect.Lists.newArrayList;
/**
* Swagger配置
*
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
@Configuration
@EnableSwagger2
public class SwaggerConfig implements WebMvcConfigurer {
@Bean
public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo())
.select()
//加了ApiOperation注解的类,才生成接口文档
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
.paths(PathSelectors.any())
.build()
.directModelSubstitute(java.util.Date.class, String.class)
.securitySchemes(security());
}
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
.title("人人开源")
.description("Activiti接口文档")
.termsOfServiceUrl("https://www.renren.io")
.version("1.1.0")
.build();
}
private List<ApiKey> security() {
return newArrayList(
new ApiKey(Constant.TOKEN_HEADER, Constant.TOKEN_HEADER, "header")
);
}
}

25
epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/controller/ActModelController.java

@ -14,14 +14,10 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.ModelDTO;
import com.epmet.service.ActModelService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.activiti.engine.repository.Model;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
import java.util.Map;
@ -33,27 +29,18 @@ import java.util.Map;
*/
@RestController
@RequestMapping("model")
@Api(tags="模型管理")
public class ActModelController {
@Autowired
private ActModelService actModelService;
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = "key", value = "key", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "name", value = "name", paramType = "query", dataType="String")
})
public Result<PageData<Model>> page(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<Model>> page(@RequestParam Map<String, Object> params){
PageData<Model> page = actModelService.page(params);
return new Result<PageData<Model>>().ok(page);
}
@PostMapping
@ApiOperation("新增模型")
public Result save(@RequestBody ModelDTO dto) throws Exception{
//效验数据
ValidatorUtils.validateEntity(dto);
@ -64,20 +51,17 @@ public class ActModelController {
}
@PostMapping("deploy/{id}")
@ApiOperation("部署")
public Result deploy(@PathVariable("id") String id) {
actModelService.deploy(id);
return new Result();
}
@GetMapping("export/{id}")
@ApiOperation("导出")
public void export(@PathVariable("id") String id, @ApiIgnore HttpServletResponse response) {
public void export(@PathVariable("id") String id, HttpServletResponse response) {
actModelService.export(id, response);
}
@DeleteMapping
@ApiOperation("删除")
public Result delete(@RequestBody String[] ids) {
for(String id : ids) {
actModelService.delete(id);
@ -86,8 +70,7 @@ public class ActModelController {
}
@GetMapping("image/{deploymentId}")
@ApiOperation(value = "查看流程图", produces="application/octet-stream")
public void viewDeployImage(@PathVariable("deploymentId") String deploymentId, @ApiIgnore HttpServletResponse response){
public void viewDeployImage(@PathVariable("deploymentId") String deploymentId, HttpServletResponse response){
actModelService.deployImage(deploymentId, response);
}
}

46
epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/controller/ActProcessController.java

@ -20,16 +20,11 @@ import com.epmet.exception.ModuleErrorCode;
import com.epmet.service.ActHistoryService;
import com.epmet.service.ActProcessService;
import com.epmet.service.ProcessBizRouteService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@ -43,7 +38,6 @@ import java.util.Map;
*/
@RestController
@RequestMapping("process")
@Api(tags="流程管理")
public class ActProcessController {
@Autowired
private ActProcessService actProcessService;
@ -53,35 +47,19 @@ public class ActProcessController {
private ActHistoryService historyService;
@GetMapping("page")
@ApiOperation("流程管理-分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = "key", value = "key", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "processName", value = "processName", paramType = "query", dataType="String")
})
public Result<PageData<Map<String, Object>>> page(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<Map<String, Object>>> page(@RequestParam Map<String, Object> params){
PageData<Map<String, Object>> page = actProcessService.page(params);
return new Result<PageData<Map<String, Object>>>().ok(page);
}
@GetMapping("lastestPage")
@ApiOperation("发起流程-分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = "key", value = "key", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "processName", value = "processName", paramType = "query", dataType="String")
})
public Result<PageData<Map<String, Object>>> lastestPage(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<Map<String, Object>>> lastestPage(@RequestParam Map<String, Object> params){
params.put("isLatestVersion", true);
PageData<Map<String, Object>> page = actProcessService.page(params);
return new Result<PageData<Map<String, Object>>>().ok(page);
}
@PostMapping("deploy")
@ApiOperation("部署流程文件")
@ApiImplicitParam(name = "processFile", value = "流程文件", paramType = "query", dataType="file")
public Result deploy(@RequestParam("processFile") MultipartFile file) throws IOException {
if (file.isEmpty()) {
return new Result().error(ModuleErrorCode.UPLOAD_FILE_EMPTY);
@ -100,7 +78,6 @@ public class ActProcessController {
}
@PutMapping("suspend/{id}")
@ApiOperation("挂起流程")
public Result suspend(@PathVariable("id") String id) {
actProcessService.suspend(id);
@ -108,7 +85,6 @@ public class ActProcessController {
}
@PostMapping("convertToModel/{id}")
@ApiOperation("将部署的流程转换为模型")
public Result convertToModel(@PathVariable("id") String id) throws Exception {
actProcessService.convertToModel(id);
@ -116,7 +92,6 @@ public class ActProcessController {
}
@DeleteMapping
@ApiOperation("删除流程")
public Result delete(@RequestBody String[] deploymentIds) {
for(String deploymentId : deploymentIds) {
actProcessService.deleteDeployment(deploymentId);
@ -125,12 +100,7 @@ public class ActProcessController {
}
@GetMapping(value = "resource")
@ApiOperation(value="获取资源文件", produces="application/octet-stream")
@ApiImplicitParams({
@ApiImplicitParam(name = "deploymentId", value = "部署ID", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "resourceName", value = "资源名称", paramType = "query", dataType="String")
})
public void resource(String deploymentId, String resourceName, @ApiIgnore HttpServletResponse response) throws Exception {
public void resource(String deploymentId, String resourceName, HttpServletResponse response) throws Exception {
InputStream resourceAsStream = actProcessService.getResourceAsStream(deploymentId, resourceName);
String[] fileNames = resourceName.split("\\.");
if(fileNames.length>1){
@ -147,26 +117,18 @@ public class ActProcessController {
}
@GetMapping(value = "getProcDefBizRoute/{id}")
@ApiOperation("根据流程ID获取业务路由配置")
public Result getProcDefBizRoute(@PathVariable("id") String id){
ProcessBizRouteDTO processBizRouteDTO = processBizRouteService.getProcDefBizRoute(id);
return new Result().ok(processBizRouteDTO);
}
@GetMapping(value = "getLatestProcDefBizRoute")
@ApiOperation("根据流程定义KEY获取最新的流程配置信息")
@ApiImplicitParam(name = "procDefKey", value = "流程定义KEY", paramType = "query", dataType="String")
public Result getLatestProcDefBizRoute(String procDefKey){
ProcessBizRouteDTO processBizRouteDTO = processBizRouteService.getLatestProcDefBizRoute(procDefKey);
return new Result().ok(processBizRouteDTO);
}
@GetMapping(value = "getProcDefBizRouteAndProcessInstance")
@ApiOperation("根据业务ID获取流程业务路由配置和实例信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "procDefKey", value = "流程定义KEY", required = true, paramType = "query", dataType="String"),
@ApiImplicitParam(name = "businessKey", value = "业务KEY", required = true, paramType = "query", dataType="String")
})
public Result getProcDefBizRouteAndProcessInstance(String procDefKey, String businessKey) {
if(StringUtils.isEmpty(businessKey)){
return new Result().error(ErrorCode.PARAMS_GET_ERROR);
@ -190,14 +152,12 @@ public class ActProcessController {
}
@PostMapping("saveProcBizRoute")
@ApiOperation("保存业务路由配置")
public Result saveProcBizRoute(@RequestBody ProcessBizRouteDTO processBizRouteDTO){
processBizRouteService.save(processBizRouteDTO);
return new Result();
}
@PutMapping("saveProcBizRoute")
@ApiOperation("更新业务路由配置")
public Result updateProcBizRoute(@RequestBody ProcessBizRouteDTO processBizRouteDTO){
processBizRouteService.updateProcBizRoute(processBizRouteDTO);
return new Result();

22
epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/controller/ActRunningController.java

@ -8,20 +8,13 @@
package com.epmet.controller;
import com.epmet.commons.tools.constant.Constant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.ProcessInstanceDTO;
import com.epmet.dto.ProcessStartDTO;
import com.epmet.service.ActRunningService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
/**
@ -31,43 +24,30 @@ import java.util.Map;
*/
@RestController
@RequestMapping("running")
@Api(tags="运行中的流程")
public class ActRunningController {
@Autowired
private ActRunningService actRunningService;
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = "id", value = "实例ID", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "definitionKey", value = "definitionKey", paramType = "query", dataType="String")
})
public Result<PageData<Map<String, Object>>> page(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<Map<String, Object>>> page(@RequestParam Map<String, Object> params){
PageData<Map<String, Object>> page = actRunningService.page(params);
return new Result<PageData<Map<String, Object>>>().ok(page);
}
@DeleteMapping("{id}")
@ApiOperation("删除")
@ApiImplicitParam(name = "id", value = "ID", paramType = "query", dataType="String")
public Result deleteInstance(@PathVariable("id") String id) {
actRunningService.delete(id);
return new Result();
}
@PostMapping("start")
@ApiOperation("启动流程实例,依据流程定义KEY,启动流程实例")
@ApiImplicitParam(name = "key", value = "流程定义标识key", paramType = "query", dataType="String")
public Result<ProcessInstanceDTO> start(String key){
ProcessInstanceDTO dto = actRunningService.startProcess(key);
return new Result().ok(dto);
}
@PostMapping("startOfBusinessKey")
@ApiOperation("启动流程实例,依据流程定义ID和业务唯一标示启动实例")
public Result<ProcessInstanceDTO> startOfBusinessKey(@RequestBody ProcessStartDTO processStartDTO){
ProcessInstanceDTO dto = actRunningService.startOfBusinessKey(processStartDTO);
return new Result().ok(dto);

70
epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/controller/ActTaskController.java

@ -1,6 +1,5 @@
package com.epmet.controller;
import com.epmet.commons.tools.constant.Constant;
import com.epmet.commons.tools.exception.ErrorCode;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.user.SecurityUser;
@ -9,14 +8,9 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.TaskDTO;
import com.epmet.feign.UserFeignClient;
import com.epmet.service.ActTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
@ -26,7 +20,6 @@ import java.util.Map;
*/
@RestController
@RequestMapping("task")
@Api(tags="任务管理")
public class ActTaskController {
@Autowired
private ActTaskService actTaskService;
@ -40,15 +33,7 @@ public class ActTaskController {
* @return
*/
@GetMapping("page")
@ApiOperation("待办任务,默认查询所有待办任务。根据用户ID或角色ID查询个人或组的任务")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = "roleIds", value = "roleIds", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "userId", value = "userId", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "isRoleGroup", value = "是否查询分组", paramType = "query", dataType="String")
})
public Result<PageData<TaskDTO>> queryUserTaskPage(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<TaskDTO>> queryUserTaskPage(@RequestParam Map<String, Object> params){
PageData<TaskDTO> page = actTaskService.page(params);
return new Result<PageData<TaskDTO>>().ok(page);
}
@ -58,13 +43,7 @@ public class ActTaskController {
* @return
*/
@GetMapping("myToDoTaskPage")
@ApiOperation("我的待办列表")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int"),
@ApiImplicitParam(name = "taskName", value = "任务名称", paramType = "query", dataType="String")
})
public Result<PageData<TaskDTO>> myToDoTaskPage(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<TaskDTO>> myToDoTaskPage(@RequestParam Map<String, Object> params){
params.put("userId", SecurityUser.getUserId().toString());
PageData<TaskDTO> page = actTaskService.page(params);
for(TaskDTO taskDTO : page.getList()){
@ -80,7 +59,6 @@ public class ActTaskController {
* 获取任务详情
*/
@GetMapping("task/{id}")
@ApiOperation("获取任务详情")
public Result getTaskById(@PathVariable("id") String id){
TaskDTO task = actTaskService.taskDetail(id);
return new Result().ok(task);
@ -90,8 +68,6 @@ public class ActTaskController {
* 认领任务
*/
@PostMapping("claim")
@ApiOperation("认领任务")
@ApiImplicitParam(name = "taskId", value = "taskId", paramType = "query", dataType="String")
public Result claimTask(String taskId){
if(StringUtils.isEmpty(taskId)){
return new Result().error(ErrorCode.PARAMS_GET_ERROR);
@ -104,8 +80,6 @@ public class ActTaskController {
* 释放任务
*/
@PostMapping("unclaim")
@ApiOperation("释放任务")
@ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType="String")
public Result unclaimTask(String taskId){
if(StringUtils.isEmpty(taskId)){
return new Result().error(ErrorCode.PARAMS_GET_ERROR);
@ -118,11 +92,6 @@ public class ActTaskController {
* 任务处理
*/
@PostMapping("complete")
@ApiOperation("任务处理(完成任务)")
@ApiImplicitParams({
@ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "comment", value = "审批意见", paramType = "query", dataType="String")
})
public Result completeTask(String taskId, String comment){
if(StringUtils.isEmpty(taskId)){
return new Result().error(ErrorCode.PARAMS_GET_ERROR);
@ -134,7 +103,6 @@ public class ActTaskController {
* 带参数的任务处理
*/
@PostMapping("completeByVariables")
@ApiOperation("带参数的任务处理(完成任务)")
public Result completeTaskByVariables(@RequestBody TaskDTO taskDTO){
if(StringUtils.isEmpty(taskDTO.getTaskId())){
return new Result().error(ErrorCode.PARAMS_GET_ERROR);
@ -147,11 +115,6 @@ public class ActTaskController {
* 任务委托
*/
@PostMapping("entrust")
@ApiOperation("任务委托")
@ApiImplicitParams({
@ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "assignee", value = "受理人", paramType = "query", dataType="String")
})
public Result taskEntrust(String taskId, String assignee){
if(StringUtils.isEmpty(taskId) || StringUtils.isEmpty(assignee)){
return new Result().error(ErrorCode.PARAMS_GET_ERROR);
@ -165,11 +128,6 @@ public class ActTaskController {
* 获取流程变量
*/
@GetMapping("getTaskVariables")
@ApiOperation("获取流程变量")
@ApiImplicitParams({
@ApiImplicitParam(name = "taskId", value = "当前任务ID", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "variableName", value = "参数的键", paramType = "query", dataType="String")
})
public Result getTaskVariables(String taskId, String variableName){
if(StringUtils.isEmpty(taskId) || StringUtils.isEmpty(variableName)){
return new Result().error(ErrorCode.PARAMS_GET_ERROR);
@ -181,7 +139,6 @@ public class ActTaskController {
* 更新任务变量
*/
@PostMapping("updateTaskVariable")
@ApiOperation("更新任务变量")
public Result updateTaskVariable(@RequestBody TaskDTO taskDTO){
if(StringUtils.isEmpty(taskDTO.getTaskId())){
return new Result().error(ErrorCode.PARAMS_GET_ERROR);
@ -194,8 +151,6 @@ public class ActTaskController {
* 删除任务的所有变量
*/
@DeleteMapping("deleteTaskVariables")
@ApiOperation("删除任务的所有变量")
@ApiImplicitParam(name = "taskId", value = "当前任务ID", paramType = "query", dataType="String")
public Result deleteTaskVariables(String taskId){
if(StringUtils.isEmpty(taskId)){
return new Result().error(ErrorCode.PARAMS_GET_ERROR);
@ -208,12 +163,6 @@ public class ActTaskController {
* 删除指定变量
*/
@DeleteMapping("deleteVariable")
@ApiOperation("删除指定变量,默认删除本地变量")
@ApiImplicitParams({
@ApiImplicitParam(name = "taskId", value = "当前任务ID", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "variableName", value = "变量名", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "scope", value = "变量的范围(local:本地;global,全局)", paramType = "query", dataType="String")
})
public Result deleteVariable(String taskId, String variableName, String scope){
if(StringUtils.isEmpty(taskId) || StringUtils.isEmpty(variableName)){
return new Result().error(ErrorCode.PARAMS_GET_ERROR);
@ -226,11 +175,6 @@ public class ActTaskController {
* 回退任务到上一节点
*/
@PostMapping("backPreviousTask")
@ApiOperation("回退任务到上一节点")
@ApiImplicitParams({
@ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "comment", value = "回退审核意见", paramType = "query", dataType="String")
})
public Result backPreviousTask(String taskId, String comment){
if(StringUtils.isEmpty(taskId)){
return new Result().error(ErrorCode.PARAMS_GET_ERROR);
@ -243,11 +187,6 @@ public class ActTaskController {
* 终止流程
*/
@PostMapping("endProcess")
@ApiOperation("终止流程")
@ApiImplicitParams({
@ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "comment", value = "终止审核意见", paramType = "query", dataType="String")
})
public Result endProcess(String taskId, String comment){
actTaskService.endProcess(taskId, comment);
return new Result();
@ -257,11 +196,6 @@ public class ActTaskController {
* 驳回
*/
@PostMapping("backToFirst")
@ApiOperation("驳回,回退至第一个用户任务")
@ApiImplicitParams({
@ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "comment", value = "驳回审核意见", paramType = "query", dataType="String")
})
public Result backToFirst(String taskId, String comment){
if(StringUtils.isEmpty(taskId)){
return new Result().error(ErrorCode.PARAMS_GET_ERROR);

57
epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/controller/HistoryController.java

@ -1,6 +1,5 @@
package com.epmet.controller;
import com.epmet.commons.tools.constant.Constant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.user.UserDetail;
import com.epmet.commons.tools.utils.Result;
@ -10,17 +9,12 @@ import com.epmet.dto.ProcessInstanceDTO;
import com.epmet.feign.UserFeignClient;
import com.epmet.service.ActHistoryService;
import com.epmet.service.ActivitiService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@ -32,7 +26,6 @@ import java.util.Map;
*/
@RestController
@RequestMapping("his")
@Api(tags="流程历史")
public class HistoryController {
@Autowired
private ActHistoryService historyService;
@ -42,62 +35,24 @@ public class HistoryController {
private UserFeignClient userFeignClient;
@GetMapping("getInstImage")
@ApiOperation(value ="获取流程活动图", produces="application/octet-stream")
@ApiImplicitParam(name = "processInstanceId", value = "流程实例ID", paramType = "query", dataType="String")
public void getProcessInstanceDiagram(String processInstanceId, @ApiIgnore HttpServletResponse response) throws Exception {
public void getProcessInstanceDiagram(String processInstanceId, HttpServletResponse response) throws Exception {
historyService.getProcessInstanceDiagram(processInstanceId, response);
}
@GetMapping("getHistoryProcessInstancePage")
@ApiOperation("历史流程实例列表")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = "processInstanceId", value = "实例ID", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "businessKey", value = "业务KEY", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "processDefinitionId", value = "流程定义ID", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "finishedBeginTime", value = "流程完成开始时间", paramType = "query", dataType="Date"),
@ApiImplicitParam(name = "finishedEndTime", value = "流程完成结束时间", paramType = "query", dataType="Date"),
@ApiImplicitParam(name = "startBeginTime", value = "流程启动开始时间", paramType = "query", dataType="Date"),
@ApiImplicitParam(name = "startEndTime", value = "流程启动结束时间", paramType = "query", dataType="Date"),
@ApiImplicitParam(name = "ended", value = "是否完成(true, false)", paramType = "query", dataType="String")
})
public Result<ProcessInstanceDTO> getHistoryProcessInstancePage(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<ProcessInstanceDTO> getHistoryProcessInstancePage(@RequestParam Map<String, Object> params){
PageData<ProcessInstanceDTO> page = historyService.getHistoryProcessInstancePage(params);
return new Result().ok(page);
}
@GetMapping("getMyProcessInstancePage")
@ApiOperation("我发起的流程")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = "processInstanceId", value = "实例ID", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "businessKey", value = "业务KEY", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "processDefinitionId", value = "流程定义ID", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "startBeginTime", value = "流程启动开始时间", paramType = "query", dataType="Date"),
@ApiImplicitParam(name = "startEndTime", value = "流程启动结束时间", paramType = "query", dataType="Date"),
@ApiImplicitParam(name = "ended", value = "是否接受(true:是,false:否)", paramType = "query", dataType="String")
})
public Result<ProcessInstanceDTO> getMyProcessInstancePage(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<ProcessInstanceDTO> getMyProcessInstancePage(@RequestParam Map<String, Object> params){
PageData<ProcessInstanceDTO> page = historyService.getMyProcessInstancePage(params);
return new Result().ok(page);
}
@GetMapping("getMyHandledInstancePage")
@ApiOperation("已办任务:根据登录账号查询用户已办任务")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = "processInstanceId", value = "实例ID", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "businessKey", value = "业务KEY", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "processDefinitionId", value = "流程定义ID", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "startBeginTime", value = "流程启动开始时间", paramType = "query", dataType="Date"),
@ApiImplicitParam(name = "startEndTime", value = "流程启动结束时间", paramType = "query", dataType="Date"),
@ApiImplicitParam(name = "finishedBeginTime", value = "流程完成开始时间", paramType = "query", dataType="Date"),
@ApiImplicitParam(name = "finishedEndTime", value = "流程完成结束时间", paramType = "query", dataType="Date")
})
public Result<ProcessActivityDTO> getMyHandledInstancePage(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<ProcessActivityDTO> getMyHandledInstancePage(@RequestParam Map<String, Object> params){
PageData<ProcessActivityDTO> page = activitiService.getMyProcessInstancePage(params);
for(ProcessActivityDTO activityDTO : page.getList()){
if(StringUtils.isNotEmpty(activityDTO.getStartUserId())){
@ -113,10 +68,6 @@ public class HistoryController {
}
@GetMapping("getTaskHandleDetailInfo")
@ApiOperation("获取流程处理详情")
@ApiImplicitParams({
@ApiImplicitParam(name = "processInstanceId", value = "实例ID", paramType = "query", dataType="String")
})
public Result<HistoryDetailDTO> getTaskHandleDetailInfo(String processInstanceId){
List<HistoryDetailDTO> list = activitiService.getTaskHandleDetailInfo(processInstanceId);
return new Result().ok(list);

25
epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/demo/controller/CorrectionController.java

@ -1,6 +1,5 @@
package com.epmet.demo.controller;
import com.epmet.commons.tools.constant.Constant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
@ -10,13 +9,8 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.demo.dto.CorrectionDTO;
import com.epmet.demo.service.CorrectionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.HashMap;
import java.util.Map;
@ -29,27 +23,18 @@ import java.util.Map;
*/
@RestController
@RequestMapping("demo/correction")
@Api(tags="转正申请")
public class CorrectionController {
@Autowired
private CorrectionService correctionService;
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType="String")
})
public Result<PageData<CorrectionDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<CorrectionDTO>> page(@RequestParam Map<String, Object> params){
PageData<CorrectionDTO> page = correctionService.page(params);
return new Result<PageData<CorrectionDTO>>().ok(page);
}
@GetMapping("{id}")
@ApiOperation("信息")
public Result<CorrectionDTO> get(@PathVariable("id") Long id){
CorrectionDTO data = correctionService.get(id);
@ -57,7 +42,6 @@ public class CorrectionController {
}
@PostMapping
@ApiOperation("保存")
public Result save(@RequestBody CorrectionDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@ -69,7 +53,6 @@ public class CorrectionController {
}
@PutMapping
@ApiOperation("修改")
public Result update(@RequestBody CorrectionDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -80,7 +63,6 @@ public class CorrectionController {
}
@DeleteMapping
@ApiOperation("删除")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
@ -91,11 +73,6 @@ public class CorrectionController {
}
@PostMapping("updateInstanceId")
@ApiOperation("更新实例ID")
@ApiImplicitParams({
@ApiImplicitParam(name = "businessKey", value = "业务KEY", paramType = "query", required = true, dataType="String"),
@ApiImplicitParam(name = "processInstanceId", value = "实例ID", paramType = "query",required = true, dataType="String")
})
public Result updateInstanceId(String businessKey, String processInstanceId){
Long id = Long.valueOf(businessKey);
correctionService.updateInstanceId(processInstanceId, id);

12
epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/demo/dto/CorrectionDTO.java

@ -1,8 +1,6 @@
package com.epmet.demo.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -15,37 +13,27 @@ import java.util.Date;
* @author Mark sunlightcs@gmail.com
*/
@Data
@ApiModel(value = "转正申请")
public class CorrectionDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
private Long id;
@ApiModelProperty(value = "申请岗位")
private String applyPost;
@ApiModelProperty(value = "入职日期")
@JsonFormat(pattern="yyyy-MM-dd")
private Date entryDate;
@ApiModelProperty(value = "转正日期")
@JsonFormat(pattern="yyyy-MM-dd")
private Date correctionDate;
@ApiModelProperty(value = "工作内容")
private String workContent;
@ApiModelProperty(value = "工作成绩")
private String achievement;
@ApiModelProperty(value = "创建者")
private Long creator;
@ApiModelProperty(value = "创建时间")
private Date createDate;
@ApiModelProperty(value = "实例ID")
private String instanceId;
}

8
epmet-module/epmet-common-service/common-service-client/pom.xml

@ -18,14 +18,6 @@
<artifactId>epmet-commons-tools</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>
</dependencies>
<build>

9
epmet-module/epmet-demo/epmet-demo-client/pom.xml

@ -17,14 +17,7 @@
<artifactId>epmet-commons-tools</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>
</dependencies>
<build>

8
epmet-module/epmet-heart/epmet-heart-client/pom.xml

@ -18,14 +18,6 @@
<artifactId>epmet-commons-tools</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>epmet-user-client</artifactId>

68
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/config/SwaggerConfig.java

@ -1,68 +0,0 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
*
* https://www.renren.io
*
* 版权所有侵权必究
*/
package com.epmet.config;
import com.epmet.commons.tools.constant.Constant;
import io.swagger.annotations.ApiOperation;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.ApiKey;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import java.util.List;
import static com.google.common.collect.Lists.newArrayList;
/**
* Swagger配置
*
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
@Configuration
@EnableSwagger2
public class SwaggerConfig implements WebMvcConfigurer {
@Bean
public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo())
.select()
//加了ApiOperation注解的类,才生成接口文档
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
.paths(PathSelectors.any())
.build()
.directModelSubstitute(java.util.Date.class, String.class)
.securitySchemes(security());
}
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
.title("人人开源")
.description("模块接口文档")
.termsOfServiceUrl("https://www.renren.io")
.version("1.1.0")
.build();
}
private List<ApiKey> security() {
return newArrayList(
new ApiKey(Constant.TOKEN_HEADER, Constant.TOKEN_HEADER, "header")
);
}
}

8
epmet-module/epmet-job/epmet-job-client/pom.xml

@ -18,14 +18,6 @@
<artifactId>epmet-commons-tools</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>
</dependencies>
<build>

12
epmet-module/epmet-job/epmet-job-client/src/main/java/com/epmet/dto/ScheduleJobDTO.java

@ -8,12 +8,10 @@
package com.epmet.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Range;
@ -30,34 +28,26 @@ import java.util.Date;
* @since 1.0.0
*/
@Data
@ApiModel(value = "定时任务")
public class ScheduleJobDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
@Null(message="{id.null}", groups = AddGroup.class)
@NotNull(message="{id.require}", groups = UpdateGroup.class)
private Long id;
@ApiModelProperty(value = "spring bean名称")
@NotBlank(message = "{schedule.bean.require}", groups = DefaultGroup.class)
private String beanName;
@ApiModelProperty(value = "参数")
private String params;
@ApiModelProperty(value = "cron表达式")
@NotBlank(message = "{schedule.cron.require}", groups = DefaultGroup.class)
private String cronExpression;
@ApiModelProperty(value = "任务状态 0:暂停 1:正常")
@Range(min=0, max=1, message = "{schedule.status.range}", groups = DefaultGroup.class)
private Integer status;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "创建时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private Date createDate;

11
epmet-module/epmet-job/epmet-job-client/src/main/java/com/epmet/dto/ScheduleJobLogDTO.java

@ -8,8 +8,6 @@
package com.epmet.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -22,32 +20,23 @@ import java.util.Date;
* @since 1.0.0
*/
@Data
@ApiModel(value = "定时任务日志")
public class ScheduleJobLogDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
private Long id;
@ApiModelProperty(value = "任务id")
private Long jobId;
@ApiModelProperty(value = "spring bean名称")
private String beanName;
@ApiModelProperty(value = "参数")
private String params;
@ApiModelProperty(value = "任务状态 0:失败 1:成功")
private Integer status;
@ApiModelProperty(value = "失败信息")
private String error;
@ApiModelProperty(value = "耗时(单位:毫秒)")
private Integer times;
@ApiModelProperty(value = "创建时间")
private Date createDate;
}

2
epmet-module/epmet-job/epmet-job-client/src/main/java/com/epmet/dto/ScheduleJobTypeDTO.java

@ -2,7 +2,6 @@ package com.epmet.dto;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Range;
@ -33,7 +32,6 @@ public class ScheduleJobTypeDTO implements Serializable {
@Range(min=0, max=1, message = "{schedule.status.range}", groups = DefaultGroup.class)
private Integer status;
@ApiModelProperty(value = "备注")
private String remark;
@JsonProperty(access = JsonProperty.Access.READ_ONLY)

68
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/SwaggerConfig.java

@ -1,68 +0,0 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
*
* https://www.renren.io
*
* 版权所有侵权必究
*/
package com.epmet.config;
import com.epmet.commons.tools.constant.Constant;
import io.swagger.annotations.ApiOperation;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.ApiKey;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import java.util.List;
import static com.google.common.collect.Lists.newArrayList;
/**
* Swagger配置
*
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
@Configuration
@EnableSwagger2
public class SwaggerConfig implements WebMvcConfigurer {
@Bean
public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo())
.select()
//加了ApiOperation注解的类,才生成接口文档
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
.paths(PathSelectors.any())
.build()
.directModelSubstitute(java.util.Date.class, String.class)
.securitySchemes(security());
}
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
.title("人人开源")
.description("JOB接口文档")
.termsOfServiceUrl("https://www.renren.io")
.version("1.1.0")
.build();
}
private List<ApiKey> security() {
return newArrayList(
new ApiKey(Constant.TOKEN_HEADER, Constant.TOKEN_HEADER, "header")
);
}
}

2
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/controller/DemoController.java

@ -9,7 +9,6 @@
package com.epmet.controller;
import com.epmet.feign.DataStatisticalOpenFeignClient;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -24,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController;
@Slf4j
@RestController
@RequestMapping("demo")
@Api(tags="定时任务")
public class DemoController {
@Autowired

25
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/controller/ScheduleJobController.java

@ -18,13 +18,8 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.ScheduleJobDTO;
import com.epmet.dto.ScheduleJobTypeDTO;
import com.epmet.service.ScheduleJobService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
@ -35,28 +30,18 @@ import java.util.Map;
*/
@RestController
@RequestMapping("schedule")
@Api(tags="定时任务")
public class ScheduleJobController {
@Autowired
private ScheduleJobService scheduleJobService;
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = "beanName", value = "beanName", paramType = "query", dataType="String")
})
public Result<PageData<ScheduleJobDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<ScheduleJobDTO>> page(@RequestParam Map<String, Object> params){
PageData<ScheduleJobDTO> page = scheduleJobService.page(params);
return new Result<PageData<ScheduleJobDTO>>().ok(page);
}
@GetMapping("{id}")
@ApiOperation("信息")
public Result<ScheduleJobDTO> info(@PathVariable("id") Long id){
ScheduleJobDTO schedule = scheduleJobService.get(id);
@ -64,7 +49,6 @@ public class ScheduleJobController {
}
@PostMapping
@ApiOperation("保存")
public Result save(@RequestBody ScheduleJobDTO dto){
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@ -74,7 +58,6 @@ public class ScheduleJobController {
}
@PutMapping
@ApiOperation("修改")
public Result update(@RequestBody ScheduleJobDTO dto){
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -84,7 +67,6 @@ public class ScheduleJobController {
}
@DeleteMapping
@ApiOperation("删除")
public Result delete(@RequestBody Long[] ids){
scheduleJobService.deleteBatch(ids);
@ -92,7 +74,6 @@ public class ScheduleJobController {
}
@PutMapping("/run")
@ApiOperation("立即执行")
public Result run(@RequestBody Long[] ids){
scheduleJobService.run(ids);
@ -100,7 +81,6 @@ public class ScheduleJobController {
}
@PutMapping("/pause")
@ApiOperation("暂停")
public Result pause(@RequestBody Long[] ids){
scheduleJobService.pause(ids);
@ -108,7 +88,6 @@ public class ScheduleJobController {
}
@PutMapping("/resume")
@ApiOperation("恢复")
public Result resume(@RequestBody Long[] ids){
scheduleJobService.resume(ids);
@ -116,7 +95,7 @@ public class ScheduleJobController {
}
@GetMapping("pageByType")
public Result<PageData<ScheduleJobTypeDTO>> pageByType(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<ScheduleJobTypeDTO>> pageByType(@RequestParam Map<String, Object> params){
PageData<ScheduleJobTypeDTO> page = scheduleJobService.pageByType(params);
return new Result<PageData<ScheduleJobTypeDTO>>().ok(page);

18
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/controller/ScheduleJobLogController.java

@ -8,18 +8,12 @@
package com.epmet.controller;
import com.epmet.commons.tools.constant.Constant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.ScheduleJobLogDTO;
import com.epmet.service.ScheduleJobLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
@ -30,28 +24,18 @@ import java.util.Map;
*/
@RestController
@RequestMapping("scheduleLog")
@Api(tags="定时任务日志")
public class ScheduleJobLogController {
@Autowired
private ScheduleJobLogService scheduleJobLogService;
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = "jobId", value = "jobId", paramType = "query", dataType="String")
})
public Result<PageData<ScheduleJobLogDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<ScheduleJobLogDTO>> page(@RequestParam Map<String, Object> params){
PageData<ScheduleJobLogDTO> page = scheduleJobLogService.page(params);
return new Result<PageData<ScheduleJobLogDTO>>().ok(page);
}
@GetMapping("{id}")
@ApiOperation("信息")
public Result<ScheduleJobLogDTO> info(@PathVariable("id") Long id){
ScheduleJobLogDTO log = scheduleJobLogService.get(id);

9
epmet-module/epmet-message/epmet-message-client/pom.xml

@ -18,14 +18,7 @@
<artifactId>epmet-commons-tools</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>epmet-commons-rocketmq</artifactId>

13
epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysMailLogDTO.java

@ -9,8 +9,7 @@
package com.epmet.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -22,35 +21,25 @@ import java.util.Date;
* @author Mark sunlightcs@gmail.com
*/
@Data
@ApiModel(value = "邮件发送记录")
public class SysMailLogDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
private Long id;
@ApiModelProperty(value = "邮件模板ID")
private Long templateId;
@ApiModelProperty(value = "发送者")
private String mailFrom;
@ApiModelProperty(value = "收件人")
private String mailTo;
@ApiModelProperty(value = "抄送者")
private String mailCc;
@ApiModelProperty(value = "邮件主题")
private String subject;
@ApiModelProperty(value = "邮件正文")
private String content;
@ApiModelProperty(value = "发送状态 0:失败 1:成功")
private Integer status;
@ApiModelProperty(value = "创建时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private Date createDate;

9
epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysMailTemplateDTO.java

@ -12,8 +12,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@ -28,28 +27,22 @@ import java.util.Date;
* @author Mark sunlightcs@gmail.com
*/
@Data
@ApiModel(value = "邮件模板")
public class SysMailTemplateDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
@Null(message="{id.null}", groups = AddGroup.class)
@NotNull(message="{id.require}", groups = UpdateGroup.class)
private Long id;
@ApiModelProperty(value = "模板名称")
@NotBlank(message="{mail.name.require}", groups = DefaultGroup.class)
private String name;
@ApiModelProperty(value = "邮件主题")
@NotBlank(message="{mail.subject.require}", groups = DefaultGroup.class)
private String subject;
@ApiModelProperty(value = "邮件正文")
@NotBlank(message="{mail.content.require}", groups = DefaultGroup.class)
private String content;
@ApiModelProperty(value = "创建时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private Date createDate;

14
epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysSmsDTO.java

@ -8,8 +8,7 @@
package com.epmet.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -21,38 +20,27 @@ import java.util.Date;
* @author Mark sunlightcs@gmail.com
*/
@Data
@ApiModel(value = "短信")
public class SysSmsDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
private Long id;
@ApiModelProperty(value = "平台类型")
private Integer platform;
@ApiModelProperty(value = "手机号")
private String mobile;
@ApiModelProperty(value = "参数1")
private String params1;
@ApiModelProperty(value = "参数2")
private String params2;
@ApiModelProperty(value = "参数3")
private String params3;
@ApiModelProperty(value = "参数4")
private String params4;
@ApiModelProperty(value = "发送状态 0:失败 1:成功")
private Integer status;
@ApiModelProperty(value = "创建时间")
private Date createDate;
@ApiModelProperty(value = "参数列表")
private String params;
/**
* 短信模板编码 来源于SmsTemplateConstant

68
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/config/SwaggerConfig.java

@ -1,68 +0,0 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
*
* https://www.renren.io
*
* 版权所有侵权必究
*/
package com.epmet.config;
import com.epmet.commons.tools.constant.Constant;
import io.swagger.annotations.ApiOperation;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.ApiKey;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import java.util.List;
import static com.google.common.collect.Lists.newArrayList;
/**
* Swagger配置
*
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
@Configuration
@EnableSwagger2
public class SwaggerConfig implements WebMvcConfigurer {
@Bean
public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo())
.select()
//加了ApiOperation注解的类,才生成接口文档
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
.paths(PathSelectors.any())
.build()
.directModelSubstitute(java.util.Date.class, String.class)
.securitySchemes(security());
}
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
.title("人人开源")
.description("消息接口文档")
.termsOfServiceUrl("https://www.renren.io")
.version("1.1.0")
.build();
}
private List<ApiKey> security() {
return newArrayList(
new ApiKey(Constant.TOKEN_HEADER, Constant.TOKEN_HEADER, "header")
);
}
}

19
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailLogController.java

@ -13,13 +13,8 @@ import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.SysMailLogDTO;
import com.epmet.service.SysMailLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Arrays;
import java.util.Map;
@ -32,30 +27,18 @@ import java.util.Map;
*/
@RestController
@RequestMapping("maillog")
@Api(tags="邮件发送记录")
public class MailLogController {
@Autowired
private SysMailLogService sysMailLogService;
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = "templateId", value = "templateId", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "mailTo", value = "mailTo", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "status", value = "status", paramType = "query", dataType="String")
})
public Result<PageData<SysMailLogDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<SysMailLogDTO>> page(@RequestParam Map<String, Object> params){
PageData<SysMailLogDTO> page = sysMailLogService.page(params);
return new Result<PageData<SysMailLogDTO>>().ok(page);
}
@DeleteMapping
@ApiOperation("删除")
// @LogOperation("删除")
public Result delete(@RequestBody Long[] ids){
sysMailLogService.deleteBatchIds(Arrays.asList(ids));

24
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailTemplateController.java

@ -9,7 +9,6 @@
package com.epmet.controller;
import com.alibaba.fastjson.JSON;
import com.epmet.commons.tools.constant.Constant;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
@ -22,15 +21,10 @@ import com.epmet.email.EmailConfig;
import com.epmet.remote.ParamsRemoteService;
import com.epmet.service.SysMailTemplateService;
import com.epmet.utils.ModuleConstant;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Arrays;
import java.util.Map;
@ -43,7 +37,6 @@ import java.util.Map;
*/
@RestController
@RequestMapping("mailtemplate")
@Api(tags="邮件模板")
public class MailTemplateController {
private static final Logger logger = LoggerFactory.getLogger(MailTemplateController.class);
@Autowired
@ -54,22 +47,13 @@ public class MailTemplateController {
private final static String KEY = ModuleConstant.MAIL_CONFIG_KEY;
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = "name", value = "name", paramType = "query", dataType="String")
})
public Result<PageData<SysMailTemplateDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<SysMailTemplateDTO>> page(@RequestParam Map<String, Object> params){
PageData<SysMailTemplateDTO> page = sysMailTemplateService.page(params);
return new Result<PageData<SysMailTemplateDTO>>().ok(page);
}
@GetMapping("config")
@ApiOperation("获取配置信息")
public Result<EmailConfig> config(){
EmailConfig config = paramsRemoteService.getValueObject(KEY, EmailConfig.class);
@ -77,7 +61,6 @@ public class MailTemplateController {
}
@PostMapping("saveConfig")
@ApiOperation("保存配置信息")
// @LogOperation("保存配置信息")
public Result saveConfig(@RequestBody EmailConfig config){
//校验数据
@ -89,7 +72,6 @@ public class MailTemplateController {
}
@GetMapping("{id}")
@ApiOperation("信息")
public Result<SysMailTemplateDTO> info(@PathVariable("id") Long id){
SysMailTemplateDTO sysMailTemplate = sysMailTemplateService.get(id);
@ -97,7 +79,6 @@ public class MailTemplateController {
}
@PostMapping
@ApiOperation("保存")
// @LogOperation("保存")
public Result save(SysMailTemplateDTO dto){
//校验类型
@ -109,7 +90,6 @@ public class MailTemplateController {
}
@PutMapping
@ApiOperation("修改")
// @LogOperation("修改")
public Result update(SysMailTemplateDTO dto){
//校验类型
@ -121,7 +101,6 @@ public class MailTemplateController {
}
@DeleteMapping
@ApiOperation("删除")
// @LogOperation("删除")
public Result delete(@RequestBody Long[] ids){
sysMailTemplateService.deleteBatchIds(Arrays.asList(ids));
@ -130,7 +109,6 @@ public class MailTemplateController {
}
@PostMapping("send")
@ApiOperation("发送邮件")
// @LogOperation("发送邮件")
public Result send(Long id, String mailTo, String mailCc, String params) throws Exception{
boolean flag = sysMailTemplateService.sendMail(id, mailTo, mailCc, params);

29
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java

@ -24,13 +24,8 @@ import com.epmet.remote.ParamsRemoteService;
import com.epmet.service.SysSmsService;
import com.epmet.sms.SmsConfig;
import com.epmet.utils.ModuleConstant;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Arrays;
import java.util.List;
@ -43,7 +38,6 @@ import java.util.Map;
*/
@RestController
@RequestMapping("sms")
@Api(tags="短信服务")
public class SmsController {
@Autowired
private SysSmsService sysSmsService;
@ -53,23 +47,13 @@ public class SmsController {
private final static String KEY = ModuleConstant.SMS_CONFIG_KEY;
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = "mobile", value = "mobile", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "status", value = "status", paramType = "query", dataType="String")
})
public Result<PageData<SysSmsDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<SysSmsDTO>> page(@RequestParam Map<String, Object> params){
PageData<SysSmsDTO> page = sysSmsService.page(params);
return new Result<PageData<SysSmsDTO>>().ok(page);
}
@GetMapping("config")
@ApiOperation("获取配置短信")
public Result<SmsConfig> config(){
SmsConfig config = paramsRemoteService.getValueObject(KEY, SmsConfig.class);
@ -77,7 +61,6 @@ public class SmsController {
}
@PostMapping("saveConfig")
@ApiOperation("保存配置短信")
public Result saveConfig(@RequestBody SmsConfig config){
//校验类型
ValidatorUtils.validateEntity(config);
@ -96,18 +79,12 @@ public class SmsController {
}
@PostMapping("send")
@ApiOperation("发送短信")
@ApiImplicitParams({
@ApiImplicitParam(name = "mobile", value = "手机好号", paramType = "query", required = true, dataType="String"),
@ApiImplicitParam(name = "params", value = "参数", paramType = "query", required = true, dataType="String")
})
public Result send(@RequestBody SysSmsDTO sysSmsDTO){
sysSmsService.send(sysSmsDTO);
return new Result();
}
@DeleteMapping
@ApiOperation("删除")
public Result delete(@RequestBody Long[] ids){
sysSmsService.deleteBatchIds(Arrays.asList(ids));
@ -119,10 +96,6 @@ public class SmsController {
* @return
*/
@GetMapping("captcha/{mobile}")
@ApiOperation("发送短信验证码")
@ApiImplicitParams({
@ApiImplicitParam(name = "mobile", value = "手机号", paramType = "query", required = true, dataType="String")
})
public Result sendSmsCaptcha(@PathVariable("mobile") String mobile) {
Result result = sysSmsService.sendSmsCaptcha(mobile);
return result;

8
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/email/EmailConfig.java

@ -8,8 +8,7 @@
package com.epmet.email;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@ -20,23 +19,18 @@ import java.io.Serializable;
*
* @author Mark sunlightcs@gmail.com
*/
@ApiModel(value = "邮件配置信息")
public class EmailConfig implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "SMTP")
@NotBlank(message="{email.smtp.require}")
private String smtp;
@ApiModelProperty(value = "端口号")
@NotNull(message="{email.port.require}")
private Integer port;
@ApiModelProperty(value = "邮箱账号")
@NotBlank(message="{email.username.require}")
private String username;
@ApiModelProperty(value = "邮箱密码")
@NotBlank(message="{email.password.require}")
private String password;

13
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/SmsConfig.java

@ -10,8 +10,7 @@ package com.epmet.sms;
import com.epmet.commons.tools.validator.group.AliyunGroup;
import com.epmet.commons.tools.validator.group.QcloudGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Range;
@ -25,43 +24,33 @@ import java.io.Serializable;
* @author Mark sunlightcs@gmail.com
*/
@Data
@ApiModel(value = "短信配置信息")
public class SmsConfig implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "平台 1:阿里云 2:腾讯云")
@Range(min=1, max=2, message = "{sms.platform.range}")
private Integer platform;
@ApiModelProperty(value = "阿里云AccessKeyId")
@NotBlank(message="{aliyun.accesskeyid.require}", groups = AliyunGroup.class)
private String aliyunAccessKeyId;
@ApiModelProperty(value = "阿里云AccessKeySecret")
@NotBlank(message="{aliyun.accesskeysecret.require}", groups = AliyunGroup.class)
private String aliyunAccessKeySecret;
@ApiModelProperty(value = "阿里云短信签名")
@NotBlank(message="{aliyun.signname.require}", groups = AliyunGroup.class)
private String aliyunSignName;
@ApiModelProperty(value = "阿里云短信模板")
@NotBlank(message="{aliyun.templatecode.require}", groups = AliyunGroup.class)
private String aliyunTemplateCode;
@ApiModelProperty(value = "腾讯云AppId")
@NotNull(message="{qcloud.appid.require}", groups = QcloudGroup.class)
private Integer qcloudAppId;
@ApiModelProperty(value = "腾讯云AppKey")
@NotBlank(message="{qcloud.appkey.require}", groups = QcloudGroup.class)
private String qcloudAppKey;
@ApiModelProperty(value = "腾讯云短信签名")
@NotBlank(message="{qcloud.signname.require}", groups = QcloudGroup.class)
private String qcloudSignName;
@ApiModelProperty(value = "腾讯云短信模板ID")
@NotBlank(message="{qcloud.templateid.require}", groups = QcloudGroup.class)
private String qcloudTemplateId;

8
epmet-module/epmet-oss/epmet-oss-client/pom.xml

@ -18,14 +18,6 @@
<artifactId>epmet-commons-tools</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>
<dependency>
<groupId>io.github.openfeign.form</groupId>
<artifactId>feign-form</artifactId>

5
epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/dto/UploadDTO.java

@ -8,8 +8,6 @@
package com.epmet.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -19,11 +17,8 @@ import lombok.Data;
* @since 1.1.0
*/
@Data
@ApiModel(value = "上传信息")
public class UploadDTO {
@ApiModelProperty(value = "文件URL")
private String url;
@ApiModelProperty(value = "文件大小,单位字节")
private Long size;
}

33
epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/CloudStorageConfig.java

@ -12,8 +12,7 @@ import com.epmet.commons.tools.validator.group.AliyunGroup;
import com.epmet.commons.tools.validator.group.QcloudGroup;
import com.epmet.commons.tools.validator.group.QiniuGroup;
import com.epmet.validator.group.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Range;
import org.hibernate.validator.constraints.URL;
@ -28,100 +27,76 @@ import java.io.Serializable;
* @author Mark sunlightcs@gmail.com
*/
@Data
@ApiModel(value = "云存储配置信息")
public class CloudStorageConfig implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "类型 1:七牛 2:阿里云 3:腾讯云 4:FastDFS 5:本地上传")
@Range(min=1, max=5, message = "{oss.type.range}")
private Integer type;
@ApiModelProperty(value = "七牛绑定的域名")
@NotBlank(message="{qiniu.domain.require}", groups = QiniuGroup.class)
@URL(message = "{qiniu.domain.url}", groups = QiniuGroup.class)
private String qiniuDomain;
@ApiModelProperty(value = "七牛路径前缀")
private String qiniuPrefix;
@ApiModelProperty(value = "七牛ACCESS_KEY")
@NotBlank(message="{qiniu.accesskey.require}", groups = QiniuGroup.class)
private String qiniuAccessKey;
@ApiModelProperty(value = "七牛SECRET_KEY")
@NotBlank(message="{qiniu.secretkey.require}", groups = QiniuGroup.class)
private String qiniuSecretKey;
@ApiModelProperty(value = "七牛存储空间名")
@NotBlank(message="{qiniu.bucketname.require}", groups = QiniuGroup.class)
private String qiniuBucketName;
//@ApiModelProperty(value = "阿里云绑定的域名")
//@NotBlank(message="{aliyun.domain.require}", groups = AliyunGroup.class)
//@URL(message = "{aliyun.domain.url}", groups = AliyunGroup.class)
//private String aliyunDomain;
//
//@ApiModelProperty(value = "阿里云路径前缀")
//private String aliyunPrefix;
//
//@ApiModelProperty(value = "阿里云EndPoint")
//@NotBlank(message="{aliyun.endPoint.require}", groups = AliyunGroup.class)
//private String aliyunEndPoint;
//
//@ApiModelProperty(value = "阿里云AccessKeyId")
//@NotBlank(message="{aliyun.accesskeyid.require}", groups = AliyunGroup.class)
//private String aliyunAccessKeyId;
//
//@ApiModelProperty(value = "阿里云AccessKeySecret")
//@NotBlank(message="{aliyun.accesskeysecret.require}", groups = AliyunGroup.class)
//private String aliyunAccessKeySecret;
//
//@ApiModelProperty(value = "阿里云BucketName")
//@NotBlank(message="{aliyun.bucketname.require}", groups = AliyunGroup.class)
//private String aliyunBucketName;
@ApiModelProperty(value = "腾讯云绑定的域名")
@NotBlank(message="{qcloud.domain.require}", groups = QcloudGroup.class)
@URL(message = "{qcloud.domain.url}", groups = QcloudGroup.class)
private String qcloudDomain;
@ApiModelProperty(value = "腾讯云路径前缀")
private String qcloudPrefix;
@ApiModelProperty(value = "腾讯云AppId")
@NotNull(message="{qcloud.appid.require}", groups = QcloudGroup.class)
private Integer qcloudAppId;
@ApiModelProperty(value = "腾讯云SecretId")
@NotBlank(message="{qcloud.secretId.require}", groups = QcloudGroup.class)
private String qcloudSecretId;
@ApiModelProperty(value = "腾讯云SecretKey")
@NotBlank(message="{qcloud.secretkey.require}", groups = QcloudGroup.class)
private String qcloudSecretKey;
@ApiModelProperty(value = "腾讯云BucketName")
@NotBlank(message="{qcloud.bucketname.require}", groups = QcloudGroup.class)
private String qcloudBucketName;
@ApiModelProperty(value = "腾讯云COS所属地区")
@NotBlank(message="{qcloud.region.require}", groups = QcloudGroup.class)
private String qcloudRegion;
@ApiModelProperty(value = "FastDFS绑定的域名")
@NotBlank(message="{fastdfs.domain.require}", groups = FastDFSGroup.class)
@URL(message = "{fastdfs.domain.url}", groups = FastDFSGroup.class)
private String fastdfsDomain;
@ApiModelProperty(value = "本地上传绑定的域名")
@NotBlank(message="{local.domain.require}", groups = LocalGroup.class)
@URL(message = "{local.domain.url}", groups = LocalGroup.class)
private String localDomain;
@ApiModelProperty(value = "本地上传路径前缀")
private String localPrefix;
@ApiModelProperty(value = "本地上传存储目录")
@NotBlank(message="{local.path.url}", groups = LocalGroup.class)
private String localPath;
@ -140,27 +115,21 @@ public class CloudStorageConfig implements Serializable {
*/
@Data
public static class AliyunCloudStorageConfigProps {
@ApiModelProperty(value = "阿里云绑定的域名")
@NotBlank(message="{aliyun.domain.require}", groups = AliyunGroup.class)
@URL(message = "{aliyun.domain.url}", groups = AliyunGroup.class)
private String aliyunDomain;
@ApiModelProperty(value = "阿里云路径前缀")
private String aliyunPrefix;
@ApiModelProperty(value = "阿里云EndPoint")
@NotBlank(message="{aliyun.endPoint.require}", groups = AliyunGroup.class)
private String aliyunEndPoint;
@ApiModelProperty(value = "阿里云AccessKeyId")
@NotBlank(message="{aliyun.accesskeyid.require}", groups = AliyunGroup.class)
private String aliyunAccessKeyId;
@ApiModelProperty(value = "阿里云AccessKeySecret")
@NotBlank(message="{aliyun.accesskeysecret.require}", groups = AliyunGroup.class)
private String aliyunAccessKeySecret;
@ApiModelProperty(value = "阿里云BucketName")
@NotBlank(message="{aliyun.bucketname.require}", groups = AliyunGroup.class)
private String aliyunBucketName;
}

68
epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/config/SwaggerConfig.java

@ -1,68 +0,0 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
*
* https://www.renren.io
*
* 版权所有侵权必究
*/
package com.epmet.config;
import com.epmet.commons.tools.constant.Constant;
import io.swagger.annotations.ApiOperation;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.ApiKey;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import java.util.List;
import static com.google.common.collect.Lists.newArrayList;
/**
* Swagger配置
*
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
@Configuration
@EnableSwagger2
public class SwaggerConfig implements WebMvcConfigurer {
@Bean
public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo())
.select()
//加了ApiOperation注解的类,才生成接口文档
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
.paths(PathSelectors.any())
.build()
.directModelSubstitute(java.util.Date.class, String.class)
.securitySchemes(security());
}
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
.title("人人开源")
.description("OSS接口文档")
.termsOfServiceUrl("https://www.renren.io")
.version("1.1.0")
.build();
}
private List<ApiKey> security() {
return newArrayList(
new ApiKey(Constant.TOKEN_HEADER, Constant.TOKEN_HEADER, "header")
);
}
}

11
epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java

@ -33,8 +33,6 @@ import com.epmet.remote.ParamsRemoteService;
import com.epmet.service.OssService;
import com.epmet.utils.ModuleConstant;
import com.google.gson.Gson;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
@ -44,7 +42,6 @@ import org.springframework.http.MediaType;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import springfox.documentation.annotations.ApiIgnore;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
@ -61,7 +58,6 @@ import java.util.Map;
*/
@RestController
@RequestMapping("file")
@Api(tags="文件上传")
@Slf4j
public class OssController {
@Autowired
@ -74,15 +70,13 @@ public class OssController {
private final static String KEY = ModuleConstant.CLOUD_STORAGE_CONFIG_KEY;
@GetMapping("page")
@ApiOperation(value = "分页")
public Result<PageData<OssEntity>> page(@ApiIgnore @RequestParam Map<String, Object> params){
public Result<PageData<OssEntity>> page(@RequestParam Map<String, Object> params){
PageData<OssEntity> page = ossService.page(params);
return new Result<PageData<OssEntity>>().ok(page);
}
@GetMapping("info")
@ApiOperation(value = "云存储配置信息")
public Result<CloudStorageConfig> info(){
CloudStorageConfig config = paramsRemoteService.getValueObject(KEY, CloudStorageConfig.class);
@ -90,7 +84,6 @@ public class OssController {
}
@PostMapping
@ApiOperation(value = "保存云存储配置信息")
// @LogOperation("保存云存储配置信息")
public Result saveConfig(@RequestBody CloudStorageConfig config){
//校验类型
@ -113,7 +106,6 @@ public class OssController {
}
@PostMapping("upload")
@ApiOperation(value = "上传文件")
public Result<UploadDTO> upload(@RequestPart("file") MultipartFile file) throws Exception {
if (file.isEmpty()) {
return new Result<UploadDTO>().error(ModuleErrorCode.UPLOAD_FILE_EMPTY);
@ -137,7 +129,6 @@ public class OssController {
}
@DeleteMapping
@ApiOperation(value = "删除")
// @LogOperation("删除")
public Result delete(@RequestBody String[] ids){
ossService.deleteBatchIds(Arrays.asList(ids));

11
epmet-module/epmet-point/epmet-point-client/pom.xml

@ -19,14 +19,7 @@
<artifactId>epmet-commons-tools</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>epmet-user-client</artifactId>
@ -40,4 +33,4 @@
</build>
</project>
</project>

8
epmet-module/gov-access/gov-access-client/pom.xml

@ -17,11 +17,5 @@
<artifactId>epmet-commons-tools</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.20</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
</project>

5
epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/MenuResourceDTO.java

@ -8,8 +8,6 @@
package com.epmet.dto.result;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -19,11 +17,8 @@ import lombok.Data;
* @since 1.0.0
*/
@Data
@ApiModel(value = "菜单资源")
public class MenuResourceDTO {
@ApiModelProperty(value = "资源URL")
private String resourceUrl;
@ApiModelProperty(value = "请求方式(如:GET、POST、PUT、DELETE)")
private String resourceMethod;
}

6
epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java

@ -27,7 +27,6 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.GovRoleDTO;
import com.epmet.service.GovRoleMenuService;
import com.epmet.service.GovRoleService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -45,7 +44,7 @@ import java.util.Map;
@RestController
@RequestMapping("govrole")
public class GovRoleController {
@Autowired
private GovRoleService govRoleService;
@Autowired
@ -94,11 +93,10 @@ public class GovRoleController {
@GetMapping("list")
@ApiOperation("列表")
public Result<List<GovRoleDTO>> list(){
List<GovRoleDTO> data = govRoleService.list(new HashMap<>(1));
return new Result<List<GovRoleDTO>>().ok(data);
}
}
}

68
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/config/SwaggerConfig.java

@ -1,68 +0,0 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
*
* https://www.renren.io
*
* 版权所有侵权必究
*/
package com.epmet.config;
import com.epmet.commons.tools.constant.Constant;
import io.swagger.annotations.ApiOperation;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.ApiKey;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import java.util.List;
import static com.google.common.collect.Lists.newArrayList;
/**
* Swagger配置
*
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
@Configuration
@EnableSwagger2
public class SwaggerConfig {
@Bean
public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo())
.select()
//加了ApiOperation注解的类,才生成接口文档
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
//包下的类,才生成接口文档
//.apis(RequestHandlerSelectors.basePackage("io.renren.controller"))
.paths(PathSelectors.any())
.build()
.directModelSubstitute(java.util.Date.class, String.class)
.securitySchemes(security());
}
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
.title("人人开源")
.description("系统模块开发文档")
.termsOfServiceUrl("https://www.renren.io/community")
.version("1.4.0")
.build();
}
private List<ApiKey> security() {
return newArrayList(
new ApiKey(Constant.TOKEN_HEADER, Constant.TOKEN_HEADER, "header")
);
}
}

10
epmet-module/gov-mine/gov-mine-client/pom.xml

@ -17,14 +17,6 @@
<artifactId>epmet-commons-tools</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>
</dependencies>
<build>
@ -32,4 +24,4 @@
</build>
</project>
</project>

9
epmet-module/gov-org/gov-org-client/pom.xml

@ -18,14 +18,7 @@
<artifactId>epmet-commons-tools</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>gov-project-client</artifactId>

68
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/SwaggerConfig.java

@ -1,68 +0,0 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
*
* https://www.renren.io
*
* 版权所有侵权必究
*/
package com.epmet.config;
import com.epmet.commons.tools.constant.Constant;
import io.swagger.annotations.ApiOperation;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.ApiKey;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import java.util.List;
import static com.google.common.collect.Lists.newArrayList;
/**
* Swagger配置
*
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
@Configuration
@EnableSwagger2
public class SwaggerConfig {
@Bean
public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo())
.select()
//加了ApiOperation注解的类,才生成接口文档
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
//包下的类,才生成接口文档
//.apis(RequestHandlerSelectors.basePackage("io.renren.controller"))
.paths(PathSelectors.any())
.build()
.directModelSubstitute(java.util.Date.class, String.class)
.securitySchemes(security());
}
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
.title("人人开源")
.description("系统模块开发文档")
.termsOfServiceUrl("https://www.renren.io/community")
.version("1.4.0")
.build();
}
private List<ApiKey> security() {
return newArrayList(
new ApiKey(Constant.TOKEN_HEADER, Constant.TOKEN_HEADER, "header")
);
}
}

10
epmet-module/gov-voice/gov-voice-client/pom.xml

@ -18,14 +18,6 @@
<artifactId>epmet-commons-tools</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>resi-partymember-client</artifactId>
@ -38,4 +30,4 @@
<finalName>${project.artifactId}</finalName>
</build>
</project>
</project>

10
epmet-module/oper-access/oper-access-client/pom.xml

@ -18,18 +18,10 @@
<artifactId>epmet-commons-tools</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
</build>
</project>
</project>

5
epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/result/MenuResourceDTO.java

@ -8,8 +8,6 @@
package com.epmet.dto.result;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -19,11 +17,8 @@ import lombok.Data;
* @since 1.0.0
*/
@Data
@ApiModel(value = "菜单资源")
public class MenuResourceDTO {
@ApiModelProperty(value = "资源URL")
private String resourceUrl;
@ApiModelProperty(value = "请求方式(如:GET、POST、PUT、DELETE)")
private String resourceMethod;
}

14
epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/result/OperMenuDTO.java

@ -13,8 +13,6 @@ import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.hibernate.validator.constraints.Range;
import javax.validation.constraints.Min;
@ -31,48 +29,36 @@ import java.util.List;
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
@ApiModel(value = "菜单管理")
public class OperMenuDTO extends TreeNode<OperMenuDTO> implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
@Null(message="{id.null}", groups = AddGroup.class)
@NotNull(message="{id.require}", groups = UpdateGroup.class)
private Long id;
@ApiModelProperty(value = "上级ID")
@NotNull(message="{sysmenu.pid.require}", groups = DefaultGroup.class)
private Long pid;
@ApiModelProperty(value = "菜单名称")
@NotBlank(message="{sysmenu.name.require}", groups = DefaultGroup.class)
private String name;
@ApiModelProperty(value = "菜单URL")
private String url;
@ApiModelProperty(value = "类型 0:菜单 1:按钮")
@Range(min=0, max=1, message = "{sysmenu.type.range}", groups = DefaultGroup.class)
private Integer type;
@ApiModelProperty(value = "菜单图标")
private String icon;
@ApiModelProperty(value = "权限标识,如:sys:menu:save")
private String permissions;
@ApiModelProperty(value = "排序")
@Min(value = 0, message = "{sort.number}", groups = DefaultGroup.class)
private Integer sort;
@ApiModelProperty(value = "创建时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private Date createDate;
@ApiModelProperty(value = "菜单资源")
private List<MenuResourceDTO> resourceList;
@ApiModelProperty(value = "上级菜单名称")
private String parentName;
/**
* 是否显示1显示 0不显示

8
epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperRoleController.java

@ -23,13 +23,12 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.OperRoleDTO;
import com.epmet.excel.OperRoleExcel;
import com.epmet.service.OperRoleMenuService;
import com.epmet.service.OperRoleService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -48,7 +47,7 @@ import java.util.Map;
@RestController
@RequestMapping("operrole")
public class OperRoleController {
@Autowired
private OperRoleService operRoleService;
@Autowired
@ -102,11 +101,10 @@ public class OperRoleController {
}
@GetMapping("list")
@ApiOperation("列表")
public Result<List<OperRoleDTO>> list(){
List<OperRoleDTO> data = operRoleService.list(new HashMap<>(1));
return new Result<List<OperRoleDTO>>().ok(data);
}
}
}

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save