From b69a4639abb500c78f726ff14effec2e2eb0da26 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 16 Sep 2021 16:35:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E6=8E=89=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/tduck/cloud/account/entity/UserEntity.java | 4 ---- .../cloud/api/web/controller/UserProjectController.java | 8 ++++---- .../com/tduck/cloud/common/constant/CommonConstants.java | 1 + 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tduck-account/src/main/java/com/tduck/cloud/account/entity/UserEntity.java b/tduck-account/src/main/java/com/tduck/cloud/account/entity/UserEntity.java index e2ecb11..3738fa1 100644 --- a/tduck-account/src/main/java/com/tduck/cloud/account/entity/UserEntity.java +++ b/tduck-account/src/main/java/com/tduck/cloud/account/entity/UserEntity.java @@ -62,10 +62,6 @@ public class UserEntity extends BaseEntity { * 最后登录Ip */ private String lastLoginIp; - /** - * 状态 - */ - private Boolean deleted; } 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 6aa71b2..4af45e7 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 @@ -157,7 +157,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::getDeleted, false) + .eq(UserProjectEntity::getDelFlag, 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 +214,7 @@ public class UserProjectController { public Result deleteProject(@RequestBody UserProjectEntity request) { boolean del = projectService.update( new UserProjectEntity() {{ - setDeleted(Boolean.TRUE); + setDelFlag(CommonConstants.ConstantNumber.ONE_STR); }}, Wrappers.lambdaQuery().eq(UserProjectEntity::getKey, request.getKey())); return Result.success(del); @@ -489,7 +489,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::getDeleted, true) + .eq(UserProjectEntity::getDelFlag, true) .orderByDesc(BaseEntity::getUpdatedTime)); List records = page.getRecords(); List projectVOList = records.stream().map(item -> { @@ -508,7 +508,7 @@ public class UserProjectController { public Result restoreRecycleProject(@RequestBody UserProjectEntity request) { boolean flag = projectService.update( new UserProjectEntity() {{ - setDeleted(Boolean.FALSE); + setDelFlag(CommonConstants.ConstantNumber.ZERO_STR); }}, Wrappers.lambdaQuery().eq(UserProjectEntity::getKey, request.getKey())); return Result.success(flag); diff --git a/tduck-common/src/main/java/com/tduck/cloud/common/constant/CommonConstants.java b/tduck-common/src/main/java/com/tduck/cloud/common/constant/CommonConstants.java index 7dd5376..161d239 100644 --- a/tduck-common/src/main/java/com/tduck/cloud/common/constant/CommonConstants.java +++ b/tduck-common/src/main/java/com/tduck/cloud/common/constant/CommonConstants.java @@ -57,6 +57,7 @@ public interface CommonConstants { * @Fields ONE : ( 1 ) */ Integer ONE = 1; + String ONE_STR = "1"; /** * @Fields TOW : ( 2 )