删掉字段

tduck-account/src/main/java/com/tduck/cloud/account/entity/UserEntity.java

@@ -62,10 +62,6 @@ public class UserEntity extends BaseEntity<UserEntity> {
      * 最后登录Ip
      */
     private String lastLoginIp;
-    /**
-     * 状态
-     */
-    private Boolean deleted;
 
 
 }

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.<UserProjectEntity>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.<UserProjectEntity>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.<UserProjectEntity>lambdaQuery().eq(UserProjectEntity::getUserId, userId)
-                        .eq(UserProjectEntity::getDeleted, true)
+                        .eq(UserProjectEntity::getDelFlag, true)
                         .orderByDesc(BaseEntity::getUpdatedTime));
         List<UserProjectEntity> records = page.getRecords();
         List<RecycleProjectVO> 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.<UserProjectEntity>lambdaQuery().eq(UserProjectEntity::getKey, request.getKey()));
         return Result.success(flag);

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 )