Bladeren bron

实体调整

master
zouhantao 2 maanden geleden
bovenliggende
commit
221d57e364

+ 1
- 2
gly-base-core/src/main/java/cn/com/taiji/core/entity/msgw/MsgwAlarmConfig.java Bestand weergeven

@Size(max = 100) @Size(max = 100)
@Column(name = "MESSAGE_CLIENT_ID") @Column(name = "MESSAGE_CLIENT_ID")
private String messageClientId;//消息客户端id private String messageClientId;//消息客户端id
@NotBlank
@Size(max = 100)
@NotNull
@Column(name = "MESSAGE_TYPE") @Column(name = "MESSAGE_TYPE")
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
private MessageType messageType;//发送客户端类型 private MessageType messageType;//发送客户端类型

+ 0
- 1
gly-base-core/src/main/java/cn/com/taiji/core/entity/msgw/MsgwAlarmLog.java Bestand weergeven

@Size(max = 255) @Size(max = 255)
@Column(name = "MESSAGE_ID") @Column(name = "MESSAGE_ID")
private String messageId;//主表id private String messageId;//主表id
@Size(max = 100)
@Column(name = "MESSAGE_TYPE") @Column(name = "MESSAGE_TYPE")
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
private MessageType messageType;//消息类型 private MessageType messageType;//消息类型

+ 1
- 2
gly-base-core/src/main/java/cn/com/taiji/core/entity/msgw/MsgwClient.java Bestand weergeven

@Size(max = 50) @Size(max = 50)
@Column(name = "CLIENT_CODE") @Column(name = "CLIENT_CODE")
private String clientCode;//客户端唯一标识 private String clientCode;//客户端唯一标识
@NotBlank
@Size(max = 50)
@NotNull
@Column(name = "MESSAGE_TYPE") @Column(name = "MESSAGE_TYPE")
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
private MessageType messageType;//客户端id private MessageType messageType;//客户端id

+ 1
- 2
gly-base-core/src/main/java/cn/com/taiji/core/entity/msgw/MsgwSendApply.java Bestand weergeven

@Size(max = 50) @Size(max = 50)
@Column(name = "MODEL_ID") @Column(name = "MODEL_ID")
private String modelId;//模板id private String modelId;//模板id
@NotBlank
@Size(max = 20)
@NotNull
@Column(name = "MESSAGE_TYPE") @Column(name = "MESSAGE_TYPE")
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
private MessageType messageType;//发送客户端类型 private MessageType messageType;//发送客户端类型

+ 2
- 6
gly-base-core/src/main/java/cn/com/taiji/core/entity/msgw/MsgwSendDetails.java Bestand weergeven

import java.time.LocalDateTime; import java.time.LocalDateTime;


import javax.persistence.*; import javax.persistence.*;
import javax.validation.constraints.Digits;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
@Size(max = 50) @Size(max = 50)
@Column(name = "MODEL_ID") @Column(name = "MODEL_ID")
private String modelId;//模板id private String modelId;//模板id
@NotBlank
@Size(max = 20)
@NotNull
@Column(name = "MESSAGE_TYPE") @Column(name = "MESSAGE_TYPE")
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
private MessageType messageType;//发送客户端类型 private MessageType messageType;//发送客户端类型
@Size(max = 100) @Size(max = 100)
@Column(name = "RECEIVER_ID") @Column(name = "RECEIVER_ID")
private String receiverId;//接收人id private String receiverId;//接收人id
@NotBlank
@Size(max = 64) @Size(max = 64)
@Column(name = "REQUEST_CLASS_NAME") @Column(name = "REQUEST_CLASS_NAME")
private String requestClassName;//发送类名 private String requestClassName;//发送类名
@NotBlank
@Size(max = 255)
@NotNull
@Column(name = "SEND_RESULT") @Column(name = "SEND_RESULT")
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
private MessageResult sendResult;//发送结果 private MessageResult sendResult;//发送结果

+ 2
- 0
gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/IasServiceType.java Bestand weergeven

import cn.com.taiji.core.model.comm.protocol.SignServiceSystem; 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.SignServiceType;
import cn.com.taiji.core.model.comm.protocol.ias.bill.BillServiceCmd; 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.order.OrderServiceCmd;
import cn.com.taiji.core.model.comm.protocol.ias.portal.PortalServiceCmd; import cn.com.taiji.core.model.comm.protocol.ias.portal.PortalServiceCmd;
import cn.com.taiji.core.model.comm.protocol.ias.province.ProvinceCmd; import cn.com.taiji.core.model.comm.protocol.ias.province.ProvinceCmd;
PORTAL("统一认证", "^PORTAL_\\S+\\.json$", PortalServiceCmd.values()), PORTAL("统一认证", "^PORTAL_\\S+\\.json$", PortalServiceCmd.values()),
ORDER("发行接口", "^ORDER_\\S+\\.json$", OrderServiceCmd.values()), ORDER("发行接口", "^ORDER_\\S+\\.json$", OrderServiceCmd.values()),
VALID("校验接口", "^VALID_\\S+\\.json$", ValidServiceCmd.values()), VALID("校验接口", "^VALID_\\S+\\.json$", ValidServiceCmd.values()),
NOTICE("消息发送", "^NOTICE\\S+\\.json$", ChannelServiceCmd.values()),
; ;


@Getter @Getter

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



@Override @Override
public SignServiceType getServiceType() { public SignServiceType getServiceType() {
return IasServiceType.PORTAL;
return IasServiceType.NOTICE;
} }


public static ChannelServiceCmd fromIfCode(String ifCode) { public static ChannelServiceCmd fromIfCode(String ifCode) {

+ 4
- 0
zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/MyCommHandleManager.java Bestand weergeven

import cn.com.taiji.core.model.comm.protocol.ias.IasServiceSystem; import cn.com.taiji.core.model.comm.protocol.ias.IasServiceSystem;
import cn.com.taiji.core.model.comm.protocol.ias.IasServiceType; 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.BillServiceHandler;
import cn.com.taiji.ias.manager.handler.ChannelSendHandler;
import cn.com.taiji.ias.manager.handler.PortalServiceHandler; import cn.com.taiji.ias.manager.handler.PortalServiceHandler;
import cn.com.taiji.ias.manager.handler.ProvinceHandler; import cn.com.taiji.ias.manager.handler.ProvinceHandler;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
private PortalServiceHandler portalServiceHandler; private PortalServiceHandler portalServiceHandler;
@Autowired @Autowired
private ProvinceHandler provinceHandler; private ProvinceHandler provinceHandler;
@Autowired
private ChannelSendHandler channelSendHandler;


public MyCommHandleManager() { public MyCommHandleManager() {
super(IasServiceSystem.ISSUES); super(IasServiceSystem.ISSUES);
registerJsonService(billServiceHandler); registerJsonService(billServiceHandler);
registerJsonService(portalServiceHandler); registerJsonService(portalServiceHandler);
registerJsonService(provinceHandler); registerJsonService(provinceHandler);
registerJsonService(channelSendHandler);
} }


@Override @Override

Laden…
Annuleren
Opslaan