From 9e4d174f67f11d2b38d8c119ef7b41255a109f17 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 17 Sep 2021 12:52:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B7=BB=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20=E6=98=AF=E5=90=A6=E8=A2=AB=E5=9B=9E=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/web/controller/UserProjectController.java | 14 ++++++++------ .../com/tduck/cloud/common/entity/BaseEntity.java | 2 +- .../cloud/project/entity/UserProjectEntity.java | 5 +++++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java index 4af45e7..ecf3ac3 100644 --- a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java +++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java @@ -101,7 +101,7 @@ public class UserProjectController { UserProjectEntity userProjectEntity = new UserProjectEntity(); BeanUtil.copyProperties(projectTemplateEntity, userProjectEntity, UserProjectEntity.Fields.status); userProjectEntity.setSourceType(ProjectSourceTypeEnum.TEMPLATE); - userProjectEntity.setSourceId(projectTemplateEntity.getId().toString()); + userProjectEntity.setSourceId(projectTemplateEntity.getId()); userProjectEntity.setKey(IdUtil.fastSimpleUUID()); userProjectEntity.setUserId(userId); userProjectEntity.setStatus(ProjectStatusEnum.CREATE); @@ -143,7 +143,9 @@ public class UserProjectController { @Login @GetMapping("/user/project/list") public Result listProjects(QueryProjectRequest.List request, @RequestAttribute String userId) { - List entityList = projectService.list(Wrappers.lambdaQuery().eq(UserProjectEntity::getUserId, userId) + List entityList = projectService.list(Wrappers.lambdaQuery() + .eq(UserProjectEntity::getRecycled, false) + .eq(UserProjectEntity::getUserId, userId) .eq(ObjectUtil.isNotNull(request.getStatus()), UserProjectEntity::getStatus, request.getStatus()) .orderByDesc(BaseEntity::getUpdatedTime)); return Result.success(entityList); @@ -157,7 +159,7 @@ public class UserProjectController { public Result queryMyProjects(@RequestAttribute String userId, QueryProjectRequest.Page request) { return Result.success(projectService.page(request.toMybatisPage(), Wrappers.lambdaQuery().eq(UserProjectEntity::getUserId, userId) - .eq(UserProjectEntity::getDelFlag, false) + .eq(UserProjectEntity::getRecycled, false) .eq(ObjectUtil.isNotNull(request.getStatus()), UserProjectEntity::getStatus, request.getStatus()) .like(StrUtil.isNotBlank(request.getName()), UserProjectEntity::getName, request.getName()) .le(ObjectUtil.isNotNull(request.getEndDateTime()), UserProjectEntity::getUpdatedTime, request.getEndDateTime()) @@ -214,7 +216,7 @@ public class UserProjectController { public Result deleteProject(@RequestBody UserProjectEntity request) { boolean del = projectService.update( new UserProjectEntity() {{ - setDelFlag(CommonConstants.ConstantNumber.ONE_STR); + setRecycled(true); }}, Wrappers.lambdaQuery().eq(UserProjectEntity::getKey, request.getKey())); return Result.success(del); @@ -489,7 +491,7 @@ public class UserProjectController { public Result queryRecycleProjects(@RequestAttribute String userId, QueryProjectRequest.Page request) { Page page = projectService.page(request.toMybatisPage(), Wrappers.lambdaQuery().eq(UserProjectEntity::getUserId, userId) - .eq(UserProjectEntity::getDelFlag, true) + .eq(UserProjectEntity::getRecycled, true) .orderByDesc(BaseEntity::getUpdatedTime)); List records = page.getRecords(); List projectVOList = records.stream().map(item -> { @@ -508,7 +510,7 @@ public class UserProjectController { public Result restoreRecycleProject(@RequestBody UserProjectEntity request) { boolean flag = projectService.update( new UserProjectEntity() {{ - setDelFlag(CommonConstants.ConstantNumber.ZERO_STR); + setRecycled(false); }}, Wrappers.lambdaQuery().eq(UserProjectEntity::getKey, request.getKey())); return Result.success(flag); diff --git a/tduck-common/src/main/java/com/tduck/cloud/common/entity/BaseEntity.java b/tduck-common/src/main/java/com/tduck/cloud/common/entity/BaseEntity.java index 6699054..11928b0 100644 --- a/tduck-common/src/main/java/com/tduck/cloud/common/entity/BaseEntity.java +++ b/tduck-common/src/main/java/com/tduck/cloud/common/entity/BaseEntity.java @@ -47,7 +47,7 @@ public class BaseEntity extends Model { /** * 更新人ID */ - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) protected String updatedBy; diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectEntity.java index 9bb7f1a..c44e2ae 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectEntity.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectEntity.java @@ -69,5 +69,10 @@ public class UserProjectEntity extends BaseEntity { */ private Integer type; + /*** + * 回收状态 0:未回收；1已回收 + */ + private Boolean recycled; + }