项目添加字段 是否被回收

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

tduck-common/src/main/java/com/tduck/cloud/common/entity/BaseEntity.java

@@ -47,7 +47,7 @@ public class BaseEntity<T> extends Model {
     /**
      * 更新人ID
      */
-    @TableField(fill = FieldFill.INSERT)
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     protected String updatedBy;
 
 

tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectEntity.java

@@ -69,5 +69,10 @@ public class UserProjectEntity extends BaseEntity<UserProjectEntity> {
      */
     private Integer type;
 
+    /***
+     * 回收状态 0:未回收；1已回收
+     */
+    private Boolean recycled;
+
 
 }