Merge remote-tracking branch 'origin/master'

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/AuditStatusEnum.java → gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/AuditStatus.java

@@ -1,12 +1,9 @@
 package cn.com.taiji.core.entity.dict;
 
 /**
- * @author shake
- * @projectName GeneraAuditStatusEnum
- * @date 2023/3/30 11:08
  * @description 通用审核枚举类
  */
-public enum AuditStatusEnum {
+public enum AuditStatus {
 
 	// 审核
 	AUDIT("AUDIT","审核中"),
@@ -18,7 +15,7 @@ public enum AuditStatusEnum {
 	private String code;
 	private String value;
 
-	AuditStatusEnum(String code, String value) {
+	AuditStatus(String code, String value) {
 		this.code = code;
 		this.value = value;
 	}
@@ -38,8 +35,8 @@ public enum AuditStatusEnum {
 	public void setValue(String value) {
 		this.value = value;
 	}
-	public static AuditStatusEnum findByCode(String code) {
-		for (AuditStatusEnum instance : AuditStatusEnum.values()) {
+	public static AuditStatus findByCode(String code) {
+		for (AuditStatus instance : AuditStatus.values()) {
 			if (instance.code.equals(code)) {
 				return instance;
 			}

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/EnableStatus.java

@@ -0,0 +1,36 @@
+package cn.com.taiji.core.entity.dict;
+
+/**
+ * 停用启用
+ */
+public enum EnableStatus {
+
+	ENABLE("启用", 1),
+	DISABLE("停用", 0),
+	;
+
+	private String value;
+	private Integer code;
+
+	EnableStatus(String value, Integer code) {
+		this.value = value;
+		this.code = code;
+	}
+
+	public Integer getCode() {
+		return code;
+	}
+
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+}

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/GlobalAutoStartEnum.java

@@ -5,10 +5,10 @@ import lombok.Getter;
 @Getter
 public enum GlobalAutoStartEnum
 {
-    NONE("都不启动"),//
-    NONE_EXCEPT("不启动除了EXCEPT"),//
-    OPTION("取决于taskInfo的autoStart参数"),//
-    ALL("全部启动"),//
+    NONE("都不启动"),
+    NONE_EXCEPT("不启动除了EXCEPT"),
+    OPTION("取决于taskInfo的autoStart参数"),
+    ALL("全部启动"),
     ;
     private final String value;
 

gly-base-core/src/main/java/cn/com/taiji/core/entity/msgw/MsgwSendApply.java

@@ -11,7 +11,7 @@ import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
-import cn.com.taiji.core.entity.dict.AuditStatusEnum;
+import cn.com.taiji.core.entity.dict.AuditStatus;
 import cn.com.taiji.core.entity.dict.msgw.MessageType;
 import lombok.Getter;
 import lombok.Setter;

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/msgw/MsgwSendApplyPageRequest.java

@@ -2,7 +2,7 @@ package cn.com.taiji.core.repo.request.msgw;
 
 import cn.com.taiji.common.pub.dao.HqlBuilder;
 import cn.com.taiji.common.repo.request.jpa.JpaDateTimePageableDataRequest;
-import cn.com.taiji.core.entity.dict.AuditStatusEnum;
+import cn.com.taiji.core.entity.dict.AuditStatus;
 import cn.com.taiji.core.entity.dict.msgw.MessageType;
 import cn.com.taiji.core.entity.msgw.MsgwSendApply;
 import lombok.Getter;
@@ -13,7 +13,7 @@ import lombok.Setter;
 public class MsgwSendApplyPageRequest extends JpaDateTimePageableDataRequest<MsgwSendApply>{
 
 	private MessageType messageType;
-	private AuditStatusEnum status;
+	private AuditStatus status;
 
 	public MsgwSendApplyPageRequest() {
 		this.orderBy="id";