1.新增pro生产环境配置。
2.新增CMINMSGS和COUTMSGS 脚本 3.去除启动自动获取最新动态的功能。 4.完善测试以上功能。修改Sender为OSH5
This commit is contained in:
zhouxiunai
@@ -11,12 +11,11 @@ import java.util.Date;
|
||||
*/
|
||||
@Entity
|
||||
@Table(name="CMINMSGS")
|
||||
@SequenceGenerator(name = "sequenceGenerator", sequenceName = "SEQ_CMINMSGS")
|
||||
public class Cminmsg implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy=GenerationType.SEQUENCE,generator="sequenceGenerator")
|
||||
@GeneratedValue(strategy=GenerationType.IDENTITY)
|
||||
@Column(name="CMINMSGS_ID")
|
||||
private long cminmsgsId;
|
||||
|
||||
|
||||
@@ -1,136 +1,190 @@
|
||||
package com.gzzn.omms.msgexchangeapi.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import javax.persistence.*;
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
/**
|
||||
* The persistent class for the CMINMSGS database table.
|
||||
* The persistent class for the COUTMSGS database table.
|
||||
*
|
||||
*/
|
||||
@Entity
|
||||
@Table(name="CMOUTMSGS")
|
||||
@Table(name="COUTMSGS")
|
||||
public class Cmoutmsg implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy=GenerationType.SEQUENCE)
|
||||
@Column(name="CMINMSGS_ID")
|
||||
private long cminmsgsId;
|
||||
@GeneratedValue(strategy=GenerationType.IDENTITY)
|
||||
@Column(name="COUTMSGS_ID")
|
||||
private int coutmsgsId;
|
||||
|
||||
@Temporal(TemporalType.TIMESTAMP)
|
||||
@Column(name="COUTMSGS_ACK_DATE_RECV")
|
||||
private Date coutmsgsAckDateRecv;
|
||||
|
||||
@Column(name="COUTMSGS_ACK_REQD")
|
||||
private int coutmsgsAckReqd;
|
||||
|
||||
@Column(name="COUTMSGS_ACK_RESEND_TIMES")
|
||||
private int coutmsgsAckResendTimes;
|
||||
|
||||
@Lob
|
||||
@Column(name="CMINMSGS_CLOB_MSG")
|
||||
private String cminmsgsClobMsg;
|
||||
@Column(name="COUTMSGS_CLOB_MSG")
|
||||
private String coutmsgsClobMsg;
|
||||
|
||||
@Temporal(TemporalType.TIMESTAMP)
|
||||
@Column(name="CMINMSGS_DATE_PROCESSED")
|
||||
private Date cminmsgsDateProcessed;
|
||||
@Column(name="COUTMSGS_DATE_INSERTED")
|
||||
private Date coutmsgsDateInserted;
|
||||
|
||||
@Temporal(TemporalType.TIMESTAMP)
|
||||
@Column(name="CMINMSGS_DATE_RECEIVED")
|
||||
private Date cminmsgsDateReceived;
|
||||
@Column(name="COUTMSGS_DATE_SENT")
|
||||
private Date coutmsgsDateSent;
|
||||
|
||||
@Column(name="CMINMSGS_STATUS")
|
||||
private String cminmsgsStatus;
|
||||
@Column(name="COUTMSGS_ENCRYPT")
|
||||
private int coutmsgsEncrypt;
|
||||
|
||||
@Temporal(TemporalType.TIMESTAMP)
|
||||
@Column(name="CMINMSGS_SUBSYSTEM_DATE_SENT")
|
||||
private Date cminmsgsSubsystemDateSent;
|
||||
@Column(name="COUTMSGS_ERROR")
|
||||
private int coutmsgsError;
|
||||
|
||||
@Column(name="CMINMSGS_SUBSYSTEM_NAME")
|
||||
private String cminmsgsSubsystemName;
|
||||
@Column(name="COUTMSGS_FINAL_GROUP_IND")
|
||||
private int coutmsgsFinalGroupInd;
|
||||
|
||||
@Column(name="CMINMSGS_SUBSYSTEM_SEQUENCE")
|
||||
private String cminmsgsSubsystemSequence;
|
||||
@Column(name="COUTMSGS_GROUP_ID")
|
||||
private int coutmsgsGroupId;
|
||||
|
||||
@Column(name="CMINMSGS_SUBSYSTEM_SUBTYPE")
|
||||
private String cminmsgsSubsystemSubtype;
|
||||
@Column(name="COUTMSGS_GROUP_ORDER")
|
||||
private int coutmsgsGroupOrder;
|
||||
|
||||
@Column(name="CMINMSGS_SUBSYSTEM_TYPE")
|
||||
private String cminmsgsSubsystemType;
|
||||
@Column(name="COUTMSGS_NO_MESSAGES")
|
||||
private int coutmsgsNoMessages;
|
||||
|
||||
@Column(name="COUTMSGS_TRUEFALS_GROUP")
|
||||
private int coutmsgsTruefalsGroup;
|
||||
|
||||
@Column(name="ROUTINGID")
|
||||
private String routingid;
|
||||
|
||||
public Cmoutmsg() {
|
||||
}
|
||||
|
||||
public long getCminmsgsId() {
|
||||
return this.cminmsgsId;
|
||||
public int getCoutmsgsId() {
|
||||
return this.coutmsgsId;
|
||||
}
|
||||
|
||||
public void setCminmsgsId(long cminmsgsId) {
|
||||
this.cminmsgsId = cminmsgsId;
|
||||
public void setCoutmsgsId(int coutmsgsId) {
|
||||
this.coutmsgsId = coutmsgsId;
|
||||
}
|
||||
|
||||
public String getCminmsgsClobMsg() {
|
||||
return this.cminmsgsClobMsg;
|
||||
public Date getCoutmsgsAckDateRecv() {
|
||||
return this.coutmsgsAckDateRecv;
|
||||
}
|
||||
|
||||
public void setCminmsgsClobMsg(String cminmsgsClobMsg) {
|
||||
this.cminmsgsClobMsg = cminmsgsClobMsg;
|
||||
public void setCoutmsgsAckDateRecv(Date coutmsgsAckDateRecv) {
|
||||
this.coutmsgsAckDateRecv = coutmsgsAckDateRecv;
|
||||
}
|
||||
|
||||
public Date getCminmsgsDateProcessed() {
|
||||
return this.cminmsgsDateProcessed;
|
||||
public int getCoutmsgsAckReqd() {
|
||||
return this.coutmsgsAckReqd;
|
||||
}
|
||||
|
||||
public void setCminmsgsDateProcessed(Date cminmsgsDateProcessed) {
|
||||
this.cminmsgsDateProcessed = cminmsgsDateProcessed;
|
||||
public void setCoutmsgsAckReqd(int coutmsgsAckReqd) {
|
||||
this.coutmsgsAckReqd = coutmsgsAckReqd;
|
||||
}
|
||||
|
||||
public Date getCminmsgsDateReceived() {
|
||||
return this.cminmsgsDateReceived;
|
||||
public int getCoutmsgsAckResendTimes() {
|
||||
return this.coutmsgsAckResendTimes;
|
||||
}
|
||||
|
||||
public void setCminmsgsDateReceived(Date cminmsgsDateReceived) {
|
||||
this.cminmsgsDateReceived = cminmsgsDateReceived;
|
||||
public void setCoutmsgsAckResendTimes(int coutmsgsAckResendTimes) {
|
||||
this.coutmsgsAckResendTimes = coutmsgsAckResendTimes;
|
||||
}
|
||||
|
||||
public String getCminmsgsStatus() {
|
||||
return this.cminmsgsStatus;
|
||||
public String getCoutmsgsClobMsg() {
|
||||
return this.coutmsgsClobMsg;
|
||||
}
|
||||
|
||||
public void setCminmsgsStatus(String cminmsgsStatus) {
|
||||
this.cminmsgsStatus = cminmsgsStatus;
|
||||
public void setCoutmsgsClobMsg(String coutmsgsClobMsg) {
|
||||
this.coutmsgsClobMsg = coutmsgsClobMsg;
|
||||
}
|
||||
|
||||
public Date getCminmsgsSubsystemDateSent() {
|
||||
return this.cminmsgsSubsystemDateSent;
|
||||
public Date getCoutmsgsDateInserted() {
|
||||
return this.coutmsgsDateInserted;
|
||||
}
|
||||
|
||||
public void setCminmsgsSubsystemDateSent(Date cminmsgsSubsystemDateSent) {
|
||||
this.cminmsgsSubsystemDateSent = cminmsgsSubsystemDateSent;
|
||||
public void setCoutmsgsDateInserted(Date coutmsgsDateInserted) {
|
||||
this.coutmsgsDateInserted = coutmsgsDateInserted;
|
||||
}
|
||||
|
||||
public String getCminmsgsSubsystemName() {
|
||||
return this.cminmsgsSubsystemName;
|
||||
public Date getCoutmsgsDateSent() {
|
||||
return this.coutmsgsDateSent;
|
||||
}
|
||||
|
||||
public void setCminmsgsSubsystemName(String cminmsgsSubsystemName) {
|
||||
this.cminmsgsSubsystemName = cminmsgsSubsystemName;
|
||||
public void setCoutmsgsDateSent(Date coutmsgsDateSent) {
|
||||
this.coutmsgsDateSent = coutmsgsDateSent;
|
||||
}
|
||||
|
||||
public String getCminmsgsSubsystemSequence() {
|
||||
return this.cminmsgsSubsystemSequence;
|
||||
public int getCoutmsgsEncrypt() {
|
||||
return this.coutmsgsEncrypt;
|
||||
}
|
||||
|
||||
public void setCminmsgsSubsystemSequence(String cminmsgsSubsystemSequence) {
|
||||
this.cminmsgsSubsystemSequence = cminmsgsSubsystemSequence;
|
||||
public void setCoutmsgsEncrypt(int coutmsgsEncrypt) {
|
||||
this.coutmsgsEncrypt = coutmsgsEncrypt;
|
||||
}
|
||||
|
||||
public String getCminmsgsSubsystemSubtype() {
|
||||
return this.cminmsgsSubsystemSubtype;
|
||||
public int getCoutmsgsError() {
|
||||
return this.coutmsgsError;
|
||||
}
|
||||
|
||||
public void setCminmsgsSubsystemSubtype(String cminmsgsSubsystemSubtype) {
|
||||
this.cminmsgsSubsystemSubtype = cminmsgsSubsystemSubtype;
|
||||
public void setCoutmsgsError(int coutmsgsError) {
|
||||
this.coutmsgsError = coutmsgsError;
|
||||
}
|
||||
|
||||
public String getCminmsgsSubsystemType() {
|
||||
return this.cminmsgsSubsystemType;
|
||||
public int getCoutmsgsFinalGroupInd() {
|
||||
return this.coutmsgsFinalGroupInd;
|
||||
}
|
||||
|
||||
public void setCminmsgsSubsystemType(String cminmsgsSubsystemType) {
|
||||
this.cminmsgsSubsystemType = cminmsgsSubsystemType;
|
||||
public void setCoutmsgsFinalGroupInd(int coutmsgsFinalGroupInd) {
|
||||
this.coutmsgsFinalGroupInd = coutmsgsFinalGroupInd;
|
||||
}
|
||||
|
||||
public int getCoutmsgsGroupId() {
|
||||
return this.coutmsgsGroupId;
|
||||
}
|
||||
|
||||
public void setCoutmsgsGroupId(int coutmsgsGroupId) {
|
||||
this.coutmsgsGroupId = coutmsgsGroupId;
|
||||
}
|
||||
|
||||
public int getCoutmsgsGroupOrder() {
|
||||
return this.coutmsgsGroupOrder;
|
||||
}
|
||||
|
||||
public void setCoutmsgsGroupOrder(int coutmsgsGroupOrder) {
|
||||
this.coutmsgsGroupOrder = coutmsgsGroupOrder;
|
||||
}
|
||||
|
||||
public int getCoutmsgsNoMessages() {
|
||||
return this.coutmsgsNoMessages;
|
||||
}
|
||||
|
||||
public void setCoutmsgsNoMessages(int coutmsgsNoMessages) {
|
||||
this.coutmsgsNoMessages = coutmsgsNoMessages;
|
||||
}
|
||||
|
||||
public int getCoutmsgsTruefalsGroup() {
|
||||
return this.coutmsgsTruefalsGroup;
|
||||
}
|
||||
|
||||
public void setCoutmsgsTruefalsGroup(int coutmsgsTruefalsGroup) {
|
||||
this.coutmsgsTruefalsGroup = coutmsgsTruefalsGroup;
|
||||
}
|
||||
|
||||
public String getRoutingid() {
|
||||
return this.routingid;
|
||||
}
|
||||
|
||||
public void setRoutingid(String routingid) {
|
||||
this.routingid = routingid;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -64,7 +64,7 @@ import javax.xml.bind.annotation.XmlType;
|
||||
public enum SUBSYSTEMS {
|
||||
|
||||
AODB,
|
||||
OMMS,
|
||||
OSH5,
|
||||
BHS,
|
||||
FIDS,
|
||||
RMS,
|
||||
|
||||
@@ -73,6 +73,7 @@ public class FlopBaseHandler implements IBaseHandler {
|
||||
}
|
||||
else {
|
||||
//没有该动态航班信息
|
||||
this.updateCminmsgToProcessed(cminmsg);
|
||||
logger.warn("没有flid为:{}的消息",flop.getFLID());
|
||||
return HandlerResult.failure();
|
||||
}
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
package com.gzzn.omms.msgexchangeapi.runner;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.ScheduledExecutorService;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -12,7 +13,6 @@ import org.springframework.stereotype.Component;
|
||||
|
||||
import com.gzzn.omms.msgexchangeapi.redis.RedisKeyConstant;
|
||||
import com.gzzn.omms.msgexchangeapi.redis.RedisService;
|
||||
import com.gzzn.omms.msgexchangeapi.service.ICmoutmsgService;
|
||||
|
||||
@Component
|
||||
public class AppRunner implements CommandLineRunner {
|
||||
@@ -22,28 +22,26 @@ public class AppRunner implements CommandLineRunner {
|
||||
@Autowired
|
||||
RedisService redisService;
|
||||
|
||||
@Autowired
|
||||
private ICmoutmsgService cmoutmsgService;
|
||||
|
||||
@Value("${msgExchange.waitDateLeftOffset}")
|
||||
private Long waitDateLeftOffset;
|
||||
|
||||
@Value("${msgExchange.intervalSeconds}")
|
||||
private Long intervalSeconds;
|
||||
|
||||
@Override
|
||||
public void run(String... args) throws Exception {
|
||||
|
||||
logger.info("发送获取动态航班日计划的消息");
|
||||
|
||||
|
||||
Date nowDate = new Date();
|
||||
Date waitDate = new Date(nowDate.getTime() - waitDateLeftOffset);//往后偏移指定时钟，避免因不同应用系统时钟相差过大导致的问题。
|
||||
cmoutmsgService.sendSchdGetMsg(null,null);//发送获取当天日计划的申请
|
||||
|
||||
logger.info("app runner start");
|
||||
|
||||
//
|
||||
redisService.set(RedisKeyConstant.KEY_ISWAITSCHD, true); //等待返回日计划状态
|
||||
redisService.set(RedisKeyConstant.KEY_WAITSCHDDATE,waitDate); //初始化消息进度
|
||||
|
||||
logger.info("发送获取动态航班日计划的消息完成");
|
||||
|
||||
Executors.newFixedThreadPool(1).execute(new SchdWaitRunner());
|
||||
redisService.set(RedisKeyConstant.KEY_LASTBEGINID,0L);
|
||||
|
||||
|
||||
//启动消息采集线程
|
||||
ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(1);
|
||||
scheduledExecutorService.scheduleAtFixedRate(new MsgExchangeRunner(), 0, intervalSeconds , TimeUnit.SECONDS);
|
||||
|
||||
logger.info("app runner end");
|
||||
}//end function run
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.gzzn.omms.msgexchangeapi.service;
|
||||
|
||||
import java.math.BigInteger;
|
||||
import java.util.Date;
|
||||
import java.util.Locale;
|
||||
|
||||
@@ -28,13 +29,15 @@ public class CmoutmsgServiceImpl implements ICmoutmsgService {
|
||||
|
||||
public Boolean sendSchdGetMsg(Date startDate,Date endDate)
|
||||
{
|
||||
Long nowtime = System.currentTimeMillis();
|
||||
//构造消息
|
||||
MSG rqfdMsg = new MSGBuilder().
|
||||
setMETA(
|
||||
new METABuilder()
|
||||
.setSNDR(SUBSYSTEMS.OMMS)
|
||||
.setSNDR(SUBSYSTEMS.OSH5)
|
||||
.setTYPE(MESSAGETYPES.RQFD)
|
||||
.setSTYP(MESSAGESUBTYPES.NONE)
|
||||
.setDTTM(new BigInteger(nowtime.toString()))
|
||||
.build()
|
||||
)
|
||||
.build();
|
||||
@@ -53,8 +56,9 @@ public class CmoutmsgServiceImpl implements ICmoutmsgService {
|
||||
|
||||
//发送消息到数据库
|
||||
Cmoutmsg cmoutmsg = new Cmoutmsg();
|
||||
cmoutmsg.setCminmsgsClobMsg(exchangeService.objectToXmlstr(rqfdMsg));
|
||||
cmoutmsg.setCminmsgsStatus("VALID");
|
||||
cmoutmsg.setCoutmsgsDateInserted(new Date());
|
||||
cmoutmsg.setCoutmsgsClobMsg(exchangeService.objectToXmlstr(rqfdMsg));
|
||||
cmoutmsg.setRoutingid(SUBSYSTEMS.OSH5.name());
|
||||
|
||||
Cmoutmsg rtCmoutmsg = cmoutmsgDao.save(cmoutmsg);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user