msgw 实体优化

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

@@ -0,0 +1,49 @@
+package cn.com.taiji.core.entity.dict;
+
+/**
+ * @author shake
+ * @projectName GeneraAuditStatusEnum
+ * @date 2023/3/30 11:08
+ * @description 通用审核枚举类
+ */
+public enum AuditStatusEnum {
+
+	// 审核
+	AUDIT("AUDIT","审核中"),
+	COMPLETE("COMPLETE","审核通过"),
+	FAIL("FAIL", "驳回"),
+	NO_AUDIT("NO_AUDIT", "无需审核（机审）"),
+	;
+
+	private String code;
+	private String value;
+
+	AuditStatusEnum(String code, String value) {
+		this.code = code;
+		this.value = value;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+	public static AuditStatusEnum findByCode(String code) {
+		for (AuditStatusEnum instance : AuditStatusEnum.values()) {
+			if (instance.code.equals(code)) {
+				return instance;
+			}
+		}
+		return null;
+	}
+}

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

@@ -40,7 +40,7 @@ public class MsgwAlarmConfig extends StringPropertyUUIDEntity {
 	@Size(max = 100)
 	@Column(name = "MESSAGE_TYPE")
 	@Enumerated(EnumType.STRING)
-	private MessageType messageType;//消息类型
+	private MessageType messageType;//发送客户端类型
 	@NotBlank
 	@Size(max = 100)
 	@Column(name = "STATUS")

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

@@ -2,14 +2,13 @@ package cn.com.taiji.core.entity.msgw;
 
 import java.time.LocalDateTime;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
+import cn.com.taiji.core.entity.dict.msgw.MessageType;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -37,8 +36,9 @@ public class MsgwClient extends StringPropertyUUIDEntity {
 	private String clientCode;//客户端唯一标识
 	@NotBlank
 	@Size(max = 50)
-	@Column(name = "CLIENT_ID")
-	private String clientId;//客户端id
+	@Column(name = "MESSAGE_TYPE")
+	@Enumerated(EnumType.STRING)
+	private MessageType messageType;//客户端id
 	@NotNull
 	@Column(name = "STATUS")
 	private Integer status;//客户端状态

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

@@ -11,6 +11,8 @@ 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.msgw.MessageType;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -36,8 +38,9 @@ public class MsgwSendApply extends StringPropertyUUIDEntity {
 	private String modelId;//模板id
 	@NotBlank
 	@Size(max = 20)
-	@Column(name = "CLIENT_TYPE")
-	private String clientType;//客户端类型
+	@Column(name = "MESSAGE_TYPE")
+	@Enumerated(EnumType.STRING)
+	private MessageType messageType;//发送客户端类型
 	@Size(max = 32)
 	@Column(name = "AUDITOR_OPEN_ID")
 	private String auditorOpenId;//审核人openId
@@ -48,7 +51,8 @@ public class MsgwSendApply extends StringPropertyUUIDEntity {
 	private String reason;//审核意见
 	@NotNull
 	@Column(name = "STATUS")
-	private Integer status;//审核状态,0未审核,1已审核
+	@Enumerated(EnumType.STRING)
+	private AuditStatusEnum status;//审核状态,0未审核,1已审核,2已驳回
 	@Size(max = 255)
 	@Column(name = "ATTACHMENT_NAME")
 	private String attachmentName;//附件名称

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

@@ -45,9 +45,6 @@ public class MsgwSendDetails extends StringPropertyUUIDEntity {
 	@Column(name = "MESSAGE_TYPE")
 	@Enumerated(EnumType.STRING)
 	private MessageType messageType;//发送客户端类型
-	@Size(max = 32)
-	@Column(name = "MESSAGE_CHANNEL")
-	private String messageChannel;//发送渠道
 	@NotBlank
 	@Size(max = 50)
 	@Column(name = "TITLE")
@@ -61,9 +58,8 @@ public class MsgwSendDetails extends StringPropertyUUIDEntity {
 	@Column(name = "SEND_RESULT")
 	@Enumerated(EnumType.STRING)
 	private MessageResult sendResult;//发送结果
-	@Digits(integer=0,fraction=-127)
 	@Column(name = "RETRY_NUM")
-	private BigDecimal retryNum;//发送次数
+	private Integer retryNum;//发送次数
 	@Size(max = 255)
 	@Column(name = "DESCRIPTION")
 	private String description;//发送失败原因

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

@@ -2,6 +2,8 @@ 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.msgw.MessageType;
 import cn.com.taiji.core.entity.msgw.MsgwSendApply;
 import lombok.Getter;
 import lombok.Setter;
@@ -10,8 +12,8 @@ import lombok.Setter;
 @Setter
 public class MsgwSendApplyPageRequest extends JpaDateTimePageableDataRequest<MsgwSendApply>{
 
-
-
+	private MessageType messageType;
+	private AuditStatusEnum status;
 
 	public MsgwSendApplyPageRequest() {
 		this.orderBy="id";
@@ -21,7 +23,11 @@ public class MsgwSendApplyPageRequest extends JpaDateTimePageableDataRequest<Msg
 	@Override
 	public HqlBuilder toSelectHql(){
 		HqlBuilder hql = new HqlBuilder("from MsgwSendApply where 1=1 ");
-
+		hql.append(" and messageType=:messageType", messageType);
+		hql.append(" and status=:status", status);
+		hql.append(" and insertTime>=:startTime", startTime);
+		hql.append(" and insertTime<=:endTime", endTime);
+		hql.append( " order by insertTime desc ");
 		return hql;
 	}
 

zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/manager/AbstractCommManager.java

@@ -3,18 +3,16 @@ package cn.com.taiji.msgw.manager;
 import java.io.IOException;
 import java.util.concurrent.Callable;
 
-import cn.com.taiji.msgw.manager.FieldMsgConvertor;
-import feign.RetryableException;
 import org.apache.http.NoHttpResponseException;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import cn.com.taiji.common.manager.AbstractManager;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.binclient.ApiRequestException;
 import cn.com.taiji.common.model.file.FileProtocolSystemError;
 import cn.com.taiji.common.pub.LambdaTools;
 import cn.com.taiji.common.pub.json.JsonTools;
 import cn.com.taiji.common.validation.MyViolationException;
+import cn.com.taiji.core.manager.cache.RedisCacheManager;
 import cn.com.taiji.core.manager.comm.client.IOFunction;
 import cn.com.taiji.core.manager.comm.client.feign.FeignClientManager;
 import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeRequest;
@@ -22,8 +20,9 @@ import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeResponse;
 import cn.com.taiji.core.model.comm.protocol.SignJsonResponse;
 import cn.com.taiji.core.model.comm.protocol.valid.FieldMsgBuilder;
 import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
+import feign.RetryableException;
 
-public abstract class AbstractCommManager extends AbstractManager {
+public abstract class AbstractCommManager extends RedisCacheManager {
 
     @Autowired
     protected FeignClientManager feignClientManager;