实体调整

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

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

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

@@ -31,7 +31,6 @@ public class MsgwAlarmLog extends StringPropertyUUIDEntity {
 	@Size(max = 255)
 	@Column(name = "MESSAGE_ID")
 	private String messageId;//主表id
-	@Size(max = 100)
 	@Column(name = "MESSAGE_TYPE")
 	@Enumerated(EnumType.STRING)
 	private MessageType messageType;//消息类型

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

@@ -35,8 +35,7 @@ public class MsgwClient extends StringPropertyUUIDEntity {
 	@Size(max = 50)
 	@Column(name = "CLIENT_CODE")
 	private String clientCode;//客户端唯一标识
-	@NotBlank
-	@Size(max = 50)
+	@NotNull
 	@Column(name = "MESSAGE_TYPE")
 	@Enumerated(EnumType.STRING)
 	private MessageType messageType;//客户端id

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

@@ -36,8 +36,7 @@ public class MsgwSendApply extends StringPropertyUUIDEntity {
 	@Size(max = 50)
 	@Column(name = "MODEL_ID")
 	private String modelId;//模板id
-	@NotBlank
-	@Size(max = 20)
+	@NotNull
 	@Column(name = "MESSAGE_TYPE")
 	@Enumerated(EnumType.STRING)
 	private MessageType messageType;//发送客户端类型

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

@@ -5,7 +5,6 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 import javax.persistence.*;
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -40,8 +39,7 @@ public class MsgwSendDetails extends StringPropertyUUIDEntity {
 	@Size(max = 50)
 	@Column(name = "MODEL_ID")
 	private String modelId;//模板id
-	@NotBlank
-	@Size(max = 20)
+	@NotNull
 	@Column(name = "MESSAGE_TYPE")
 	@Enumerated(EnumType.STRING)
 	private MessageType messageType;//发送客户端类型
@@ -53,12 +51,10 @@ public class MsgwSendDetails extends StringPropertyUUIDEntity {
 	@Size(max = 100)
 	@Column(name = "RECEIVER_ID")
 	private String receiverId;//接收人id
-	@NotBlank
 	@Size(max = 64)
 	@Column(name = "REQUEST_CLASS_NAME")
 	private String requestClassName;//发送类名
-	@NotBlank
-	@Size(max = 255)
+	@NotNull
 	@Column(name = "SEND_RESULT")
 	@Enumerated(EnumType.STRING)
 	private MessageResult sendResult;//发送结果

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/IasServiceType.java

@@ -5,6 +5,7 @@ import cn.com.taiji.core.model.comm.protocol.SignServiceCommand;
 import cn.com.taiji.core.model.comm.protocol.SignServiceSystem;
 import cn.com.taiji.core.model.comm.protocol.SignServiceType;
 import cn.com.taiji.core.model.comm.protocol.ias.bill.BillServiceCmd;
+import cn.com.taiji.core.model.comm.protocol.ias.message.ChannelServiceCmd;
 import cn.com.taiji.core.model.comm.protocol.ias.order.OrderServiceCmd;
 import cn.com.taiji.core.model.comm.protocol.ias.portal.PortalServiceCmd;
 import cn.com.taiji.core.model.comm.protocol.ias.province.ProvinceCmd;
@@ -21,6 +22,7 @@ public enum IasServiceType implements SignServiceType {
     PORTAL("统一认证", "^PORTAL_\\S+\\.json$", PortalServiceCmd.values()),
     ORDER("发行接口", "^ORDER_\\S+\\.json$", OrderServiceCmd.values()),
     VALID("校验接口", "^VALID_\\S+\\.json$", ValidServiceCmd.values()),
+    NOTICE("消息发送", "^NOTICE\\S+\\.json$", ChannelServiceCmd.values()),
     ;
 
     @Getter

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/message/ChannelServiceCmd.java

@@ -23,7 +23,7 @@ public enum ChannelServiceCmd implements SignServiceCommand {
 
     @Override
     public SignServiceType getServiceType() {
-        return IasServiceType.PORTAL;
+        return IasServiceType.NOTICE;
     }
 
     public static ChannelServiceCmd fromIfCode(String ifCode) {

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/MyCommHandleManager.java

@@ -4,6 +4,7 @@ import cn.com.taiji.core.manager.comm.AbstractCommHandleManager;
 import cn.com.taiji.core.model.comm.protocol.ias.IasServiceSystem;
 import cn.com.taiji.core.model.comm.protocol.ias.IasServiceType;
 import cn.com.taiji.ias.manager.handler.BillServiceHandler;
+import cn.com.taiji.ias.manager.handler.ChannelSendHandler;
 import cn.com.taiji.ias.manager.handler.PortalServiceHandler;
 import cn.com.taiji.ias.manager.handler.ProvinceHandler;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +27,8 @@ public class MyCommHandleManager extends AbstractCommHandleManager {
     private PortalServiceHandler portalServiceHandler;
     @Autowired
     private ProvinceHandler provinceHandler;
+    @Autowired
+    private ChannelSendHandler channelSendHandler;
 
     public MyCommHandleManager() {
         super(IasServiceSystem.ISSUES);
@@ -37,6 +40,7 @@ public class MyCommHandleManager extends AbstractCommHandleManager {
         registerJsonService(billServiceHandler);
         registerJsonService(portalServiceHandler);
         registerJsonService(provinceHandler);
+        registerJsonService(channelSendHandler);
     }
 
     @Override