From 672f0e751405d554ea764c58afa0e5e40296242a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E4=B9=85=E5=93=A5?= <787952492@qq.com> Date: Wed, 8 Jun 2022 15:48:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E3=80=81=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=8D=89=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/admin/auth/AuthController.java | 10 ++++++++-- .../controller/admin/project/dto/ProjectPageDTO.java | 3 +++ .../controller/admin/project/vo/ProjectBaseVO.java | 3 +++ .../controller/admin/project/vo/ProjectExcelVO.java | 3 +++ .../admin/project/vo/ProjectExportReqVO.java | 3 +++ .../controller/admin/project/vo/ProjectPageReqVO.java | 3 +++ .../admin/project/vo/ProjectSearchPageReqVO.java | 3 +++ .../farm/controller/admin/task/vo/TaskBaseVO.java | 3 +++ .../farm/controller/admin/task/vo/TaskExcelVO.java | 3 +++ .../farm/controller/admin/task/vo/TaskExportReqVO.java | 3 +++ .../farm/controller/admin/task/vo/TaskPageReqVO.java | 3 +++ .../controller/admin/task/vo/TaskPageSearchReqVO.java | 3 +++ .../module/farm/dal/dataobject/project/ProjectDO.java | 3 +++ .../yudao/module/farm/dal/dataobject/task/TaskDO.java | 3 +++ .../farm/service/project/ProjectServiceImpl.java | 8 ++++++++ 15 files changed, 55 insertions(+), 2 deletions(-) diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java index 03889607..36126333 100644 --- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java +++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java @@ -110,9 +110,15 @@ public class AuthController { userService.updateUser(UserConvert.INSTANCE.convertFromEntity(user)); } - LoginUser login = AuthConvert.INSTANCE.convert(user); + LoginUser login1 = AuthConvert.INSTANCE.convert(user); + String token1 = userSessionService.createUserSession(login1, getClientIP(), getUserAgent()); + + AuthLoginReqVO login = AuthLoginReqVO.builder() + .username(cpuser.getUserId()) + .password("123456") + .platform("wxcp").build(); + String token = authService.login(login, getClientIP(), getUserAgent()); - String token = userSessionService.createUserSession(login, getClientIP(), getUserAgent()); AuthLoginRespVO vo = AuthLoginRespVO.builder().token(token).user(cpuser).build(); return CommonResult.success(vo); } diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/dto/ProjectPageDTO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/dto/ProjectPageDTO.java index 2485b522..01ef23f7 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/dto/ProjectPageDTO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/dto/ProjectPageDTO.java @@ -19,4 +19,7 @@ public class ProjectPageDTO extends PageDTO { @ApiModelProperty("时间筛选 1全部 2两周 3三天") private Integer timeLimit; + + @ApiModelProperty("true 草稿 false已发布") + private Boolean draft; } \ No newline at end of file diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectBaseVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectBaseVO.java index b635bb1a..2859655e 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectBaseVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectBaseVO.java @@ -48,4 +48,7 @@ public class ProjectBaseVO { @ApiModelProperty(value = "") private Integer weight; + @ApiModelProperty("草稿") + private Boolean draft; + } diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExcelVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExcelVO.java index ff546607..23c27943 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExcelVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExcelVO.java @@ -48,4 +48,7 @@ public class ProjectExcelVO { @ExcelProperty("") private Date createTime; + @ApiModelProperty("草稿") + private Boolean draft; + } diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExportReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExportReqVO.java index a2437489..1b89e435 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExportReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExportReqVO.java @@ -58,4 +58,7 @@ public class ProjectExportReqVO { @ApiModelProperty(value = "结束") private Date endCreateTime; + @ApiModelProperty("草稿") + private Boolean draft; + } diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectPageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectPageReqVO.java index 20a42f46..9f64ec81 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectPageReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectPageReqVO.java @@ -59,4 +59,7 @@ public class ProjectPageReqVO extends PageParam { @ApiModelProperty(value = "结束") private Date endCreateTime; + @ApiModelProperty("草稿") + private Boolean draft; + } diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectSearchPageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectSearchPageReqVO.java index f8baaeeb..9195e371 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectSearchPageReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectSearchPageReqVO.java @@ -65,4 +65,7 @@ public class ProjectSearchPageReqVO extends PageParam { @ApiModelProperty(value = "结束") private Date endCreateTime; + @ApiModelProperty("草稿") + private Boolean draft; + } diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskBaseVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskBaseVO.java index 1f1f5eb8..03154d13 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskBaseVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskBaseVO.java @@ -47,4 +47,7 @@ public class TaskBaseVO { @ApiModelProperty("任务状态") private TaskStatus status; + + @ApiModelProperty("草稿") + private Boolean draft; } diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExcelVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExcelVO.java index bfd3d3f4..c081babd 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExcelVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExcelVO.java @@ -51,4 +51,7 @@ public class TaskExcelVO { @ExcelProperty("") private Date createTime; + @ApiModelProperty("草稿") + private Boolean draft; + } diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExportReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExportReqVO.java index bde3ac21..471a05b5 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExportReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExportReqVO.java @@ -58,4 +58,7 @@ public class TaskExportReqVO { @ApiModelProperty(value = "结束") private Date endCreateTime; + @ApiModelProperty("草稿") + private Boolean draft; + } diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageReqVO.java index 90acbe95..6256f0e6 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageReqVO.java @@ -60,4 +60,7 @@ public class TaskPageReqVO extends PageParam { @ApiModelProperty(value = "结束") private Date endCreateTime; + @ApiModelProperty("草稿") + private Boolean draft; + } diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageSearchReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageSearchReqVO.java index d8c0df4c..6bc64e61 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageSearchReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageSearchReqVO.java @@ -66,4 +66,7 @@ public class TaskPageSearchReqVO extends PageParam { @ApiModelProperty(value = "结束") private LocalDateTime endCreateTime; + @ApiModelProperty("草稿") + private Boolean draft; + } diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/project/ProjectDO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/project/ProjectDO.java index e690c9bf..daead16e 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/project/ProjectDO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/project/ProjectDO.java @@ -66,4 +66,7 @@ public class ProjectDO extends BaseDO { private Integer tenantId; + @ApiModelProperty("草稿") + private Boolean draft; + } diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/task/TaskDO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/task/TaskDO.java index 5117460f..4fe2761e 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/task/TaskDO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/task/TaskDO.java @@ -73,4 +73,7 @@ public class TaskDO extends BaseDO { private TaskStatus status; + @ApiModelProperty("草稿") + private Boolean draft; + } diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImpl.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImpl.java index 74678e7f..ff561b0b 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImpl.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImpl.java @@ -45,6 +45,7 @@ import cn.iocoder.yudao.module.farm.convert.project.ProjectConvert; import cn.iocoder.yudao.module.farm.dal.mysql.project.ProjectMapper; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.*; /** @@ -143,6 +144,13 @@ public class ProjectServiceImpl implements ProjectService { queryWrapperX.between(ProjectDO::getCreateTime, startTime, nowTime); } + if (ObjectUtil.isNotEmpty(pageDTO.getDraft()) && pageDTO.getDraft()){ + //查看自己的草稿 + queryWrapperX.eqIfPresent(ProjectDO::getDraft, pageDTO.getDraft()); + queryWrapperX.eqIfPresent(ProjectDO::getCreator, getLoginUserId()); + } + + List list = projectMapper.selectList(queryWrapperX); if (ObjectUtil.isEmpty(list)){ return R.success(PageUtil.emptyPage(pageDTO, ProjectListDTO.class));