Merge remote-tracking branch 'remotes/epmet/release'

tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java

@@ -21,6 +21,7 @@ import com.tduck.cloud.common.validator.group.AddGroup;
 import com.tduck.cloud.common.validator.group.UpdateGroup;
 import com.tduck.cloud.project.constant.ProjectRedisKeyConstants;
 import com.tduck.cloud.project.entity.*;
+import com.tduck.cloud.project.entity.enums.ProjectClientEnum;
 import com.tduck.cloud.project.entity.enums.ProjectSourceTypeEnum;
 import com.tduck.cloud.project.entity.enums.ProjectStatusEnum;
 import com.tduck.cloud.project.entity.struct.ItemDefaultValueStruct;
@@ -83,6 +84,7 @@ public class UserProjectController {
         project.setUserId(userId);
         project.setStatus(ProjectStatusEnum.CREATE);
         project.setSourceType(ProjectSourceTypeEnum.BLANK);
+        project.setClient(ProjectClientEnum.NONE.getCode());
         projectService.save(project);
         return Result.success(project.getKey());
     }
@@ -213,6 +215,8 @@ public class UserProjectController {
         entity.setStatus(ProjectStatusEnum.RELEASE);
         if (StringUtils.isNotEmpty(request.getClient())) {
             entity.setClient(request.getClient());
+        }else {
+            entity.setClient(ProjectClientEnum.NONE.getCode());
         }
         return Result.success(projectService.updateById(entity));
     }

tduck-project/src/main/java/com/tduck/cloud/project/entity/enums/ProjectClientEnum.java

@@ -0,0 +1,52 @@
+package com.tduck.cloud.project.entity.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author : smalljop
+ * @description : 项目所属类型
+ * @create : 2020-12-04 13:35
+ **/
+@AllArgsConstructor
+@Getter
+@NoArgsConstructor
+public enum ProjectClientEnum {
+
+    /**
+     *
+     */
+    RESI("resi", "居民端"),
+    GOV("gov", "工作端"),
+    OPER("oper", "运营端"),
+    NONE("none", "不限制")
+    ;
+
+
+    @EnumValue
+    @JsonValue
+    private String code;
+
+    private String desc;
+
+
+    /**
+     * 枚举入参注解
+     *
+     * @param code
+     * @return
+     */
+    @JsonCreator
+    public static ProjectClientEnum getByCode(String code) {
+        for (ProjectClientEnum statusEnum : values()) {
+            if (statusEnum.getCode().equalsIgnoreCase(code)) {
+                return statusEnum;
+            }
+        }
+        return null;
+    }
+}