From fdbbe0020d843126d5e88cd8b4c288f81248f4a6 Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Wed, 21 Jul 2021 16:03:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B73.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- signin/src/main/resources/application-dev.yml | 2 +- signin/src/main/resources/application-prod.yml | 2 +- signin/src/main/resources/application-test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/signin/src/main/resources/application-dev.yml b/signin/src/main/resources/application-dev.yml index f5c8e555..0880f7c5 100644 --- a/signin/src/main/resources/application-dev.yml +++ b/signin/src/main/resources/application-dev.yml @@ -1,7 +1,7 @@ server: port: 7130 servlet: - context-path: + context-path: /v3.0 spring: snowflake: datacenterId: 1 diff --git a/signin/src/main/resources/application-prod.yml b/signin/src/main/resources/application-prod.yml index c5ce4fb7..bfd00a0d 100644 --- a/signin/src/main/resources/application-prod.yml +++ b/signin/src/main/resources/application-prod.yml @@ -1,7 +1,7 @@ server: port: 7130 servlet: - context-path: /v1.0 + context-path: /v3.0 spring: snowflake: datacenterId: 1 diff --git a/signin/src/main/resources/application-test.yml b/signin/src/main/resources/application-test.yml index 207b3dad..5f0b19e1 100644 --- a/signin/src/main/resources/application-test.yml +++ b/signin/src/main/resources/application-test.yml @@ -1,7 +1,7 @@ server: port: 7130 servlet: - context-path: /v1.0 + context-path: /v3.0 spring: snowflake: datacenterId: 1 From d1f00925bd412720af4d02514f0f82f71cfdda5d Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Wed, 21 Jul 2021 16:06:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/common/api/RoleController.java | 2 +- .../com/ccsens/common/bean/dto/TaskDto.java | 122 +++++++++--------- .../com/ccsens/common/bean/vo/ProjectVo.java | 22 +++- .../common/service/IProRoleService.java | 2 +- .../ccsens/common/service/ProRoleService.java | 2 +- 5 files changed, 84 insertions(+), 66 deletions(-) diff --git a/common/src/main/java/com/ccsens/common/api/RoleController.java b/common/src/main/java/com/ccsens/common/api/RoleController.java index 4790a41f..48969421 100644 --- a/common/src/main/java/com/ccsens/common/api/RoleController.java +++ b/common/src/main/java/com/ccsens/common/api/RoleController.java @@ -38,7 +38,7 @@ public class RoleController { }) @RequestMapping(value = "/QueryRoleShow", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse queryByProjectVirtualRole( - @ApiParam @Validated @RequestBody QueryDto params) throws Exception { + @ApiParam @Validated @RequestBody QueryDto params) throws Exception { log.info("查询角色栏展示的角色：{}",params); params.setUserId(1373938255183089664L); RoleVo.QueryRole list = proRoleService.QueryShowRole(params.getParam(),params.getUserId()); diff --git a/common/src/main/java/com/ccsens/common/bean/dto/TaskDto.java b/common/src/main/java/com/ccsens/common/bean/dto/TaskDto.java index 08410e7a..4b457457 100644 --- a/common/src/main/java/com/ccsens/common/bean/dto/TaskDto.java +++ b/common/src/main/java/com/ccsens/common/bean/dto/TaskDto.java @@ -1,61 +1,61 @@ -package com.ccsens.common.bean.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotNull; - -/** - * @author 逗 - */ -@Data -public class TaskDto { - - @Data - @ApiModel("查看永久日常任务") - public static class QueryPermanentGlobalTask{ - @NotNull(message = "角色id不能为空") - @ApiModelProperty("角色id") - private Long roleId; - } - - @Data - @ApiModel("查看带时间的日常任务") - public static class QueryGlobalTask{ - @NotNull(message = "角色id不能为空") - @ApiModelProperty("角色id") - private Long roleId; - @ApiModelProperty("时间基准点 默认当前") - private Long timeNode = System.currentTimeMillis(); - @ApiModelProperty("时间基准点 默认天") - private int timeUnit; - } - - @Data - @ApiModel("查看定期任务") - public static class QueryRegularTask{ - @NotNull(message = "角色id不能为空") - @ApiModelProperty("角色id") - private Long roleId; - @ApiModelProperty("时间基准点 默认当前") - private Long timeNode = System.currentTimeMillis(); - @ApiModelProperty("时间基准点 默认天") - private int timeUnit; - @ApiModelProperty("0向上查找 1向下查找(默认) 下查包含自己，上查不包含") - private int queryType = 1; - @ApiModelProperty("查找颗粒度数量 默认3个") - private int queryNum = 3; - } - - @Data - @ApiModel("修改任务状态") - public static class UpdateTaskType{ - @NotNull(message = "任务id不能为空") - @ApiModelProperty("任务分解id") - private Long id; - @ApiModelProperty("0开始 1暂停 2继续 3完成 默认0") - private int type; - } - -} +package com.ccsens.common.bean.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @author 逗 + */ +@Data +public class TaskDto { + + @Data + @ApiModel("查看永久日常任务") + public static class QueryPermanentGlobalTask{ + @NotNull(message = "角色id不能为空") + @ApiModelProperty("角色id") + private Long roleId; + } + + @Data + @ApiModel("查看带时间的日常任务") + public static class QueryGlobalTask{ + @NotNull(message = "角色id不能为空") + @ApiModelProperty("角色id") + private Long roleId; + @ApiModelProperty("时间基准点 默认当前") + private Long timeNode = System.currentTimeMillis(); + @ApiModelProperty("时间基准点 默认天") + private int timeUnit = 4; + } + + @Data + @ApiModel("查看定期任务") + public static class QueryRegularTask{ + @NotNull(message = "角色id不能为空") + @ApiModelProperty("角色id") + private Long roleId; + @ApiModelProperty("时间基准点 默认当前") + private Long timeNode = System.currentTimeMillis(); + @ApiModelProperty("时间基准点 默认天") + private int timeUnit = 4; + @ApiModelProperty("0向上查找 1向下查找(默认) 下查包含自己，上查不包含") + private int queryType = 1; + @ApiModelProperty("查找颗粒度数量 默认3个") + private int queryNum = 3; + } + + @Data + @ApiModel("修改任务状态") + public static class UpdateTaskType{ + @NotNull(message = "任务id不能为空") + @ApiModelProperty("任务分解id") + private Long id; + @ApiModelProperty("0开始 1暂停 2继续 3完成 默认0") + private int type; + } + +} diff --git a/common/src/main/java/com/ccsens/common/bean/vo/ProjectVo.java b/common/src/main/java/com/ccsens/common/bean/vo/ProjectVo.java index 33834ccf..d5fe993a 100644 --- a/common/src/main/java/com/ccsens/common/bean/vo/ProjectVo.java +++ b/common/src/main/java/com/ccsens/common/bean/vo/ProjectVo.java @@ -9,13 +9,31 @@ import lombok.Data; */ @Data public class ProjectVo { + @Data @ApiModel("项目信息") public static class ProjectInfo{ - @ApiModelProperty("项目id") - private Long projectId; + @ApiModelProperty("项目id(任务详情id)") + private Long id; @ApiModelProperty("项目名称") private String name; + @ApiModelProperty("项目描述") + private String description; + @ApiModelProperty("重复频率") + private String cycle; + @ApiModelProperty("计划开始时间") + private String planStartTime; + @ApiModelProperty("计划时长") + private String planDuration; + @ApiModelProperty("计划结束时间") + private String planEndTime; + @ApiModelProperty("真实开始时间") + private String realStartTime; + @ApiModelProperty("真实时长") + private String realDuration; + @ApiModelProperty("真实结束时间") + private String realEndTime; + } @Data diff --git a/common/src/main/java/com/ccsens/common/service/IProRoleService.java b/common/src/main/java/com/ccsens/common/service/IProRoleService.java index 95aeb27c..709d81bd 100644 --- a/common/src/main/java/com/ccsens/common/service/IProRoleService.java +++ b/common/src/main/java/com/ccsens/common/service/IProRoleService.java @@ -5,7 +5,7 @@ import com.ccsens.common.bean.vo.RoleVo; public interface IProRoleService { - RoleVo.QueryRole QueryShowRole(RoleDto.QueryRole param, Long userId); + RoleVo.QueryRole QueryShowRole(RoleDto.QueryRoleById param, Long userId); void updateShowRole(RoleDto.UpdateRoleShow param, Long userId); } diff --git a/common/src/main/java/com/ccsens/common/service/ProRoleService.java b/common/src/main/java/com/ccsens/common/service/ProRoleService.java index a0d08a63..3f08de9a 100644 --- a/common/src/main/java/com/ccsens/common/service/ProRoleService.java +++ b/common/src/main/java/com/ccsens/common/service/ProRoleService.java @@ -48,7 +48,7 @@ public class ProRoleService implements IProRoleService { @Override - public RoleVo.QueryRole QueryShowRole(RoleDto.QueryRole param, Long userId) { + public RoleVo.QueryRole QueryShowRole(RoleDto.QueryRoleById param, Long userId) { RoleVo.QueryRole role = new RoleVo.QueryRole(); //角色显示的角色 List visibleList = new ArrayList<>();