zhangFan / analysis_imf · 提交

转到一个项目

作者 朱兆平
提交 c665c4fcd27b38d8b5ce5c59ddfab853daf421cd 1 个父辈 5bacde64

修复IMF客户端异常问题导致不获取数据,优化卡口业务部分代码

内嵌 并排对比
正在显示 7 个修改的文件 包含 80 行增加 和 37 行删除
... ... @@ -61,3 +61,7 @@ feign.okhttp.enabled=true
feign.hystrix.enabled=true
# 请求连接超时时间（毫秒）
feign.httpclient.connection-timeout=3000
#码头接口通知地址,注意尾部带/符号
wharf.interface.host=http://10.50.3.66:1983/
#新舱单运单查询数据接口,注意尾部带/符号
nmms.interface.host=http://10.50.3.82:8081/
... ...
... ... @@ -18,28 +18,30 @@ public class IMF_Tesk {
public static IMFClient client = null;
@Scheduled(fixedRate = 5000)
private static void start() throws Exception {
PropertyConfigurator.configure("config/log4j.properties");
client = IMFClientFactory.createInstance();
String loginname = FileTool.readProperties("loginname");
String loginpass = FileTool.readProperties("loginpass");
if (client != null) {
/**
* 从IMF接收报文
*/
if (!KAKO_Reader.isrunning) {
KAKO_Reader kako_reader = new KAKO_Reader(client);
kako_reader.start();
logger.info("*********读取线程已开启***********");
} else {
logger.info("*********读取线程已开启-不再启动线程*********");
}
private static void start() {
//尝试catch SDK异常
try{
PropertyConfigurator.configure("config/log4j.properties");
client = IMFClientFactory.createInstance();
String loginname = FileTool.readProperties("loginname");
String loginpass = FileTool.readProperties("loginpass");
if (client != null && LOGIN_OK) {
/**
* 从IMF接收报文
*/
if (!KAKO_Reader.isrunning) {
KAKO_Reader kako_reader = new KAKO_Reader(client);
kako_reader.start();
logger.info("*********读取线程重新开启***********");
} else {
logger.info("*********读取线程已开启-不再启动线程*********");
}
/**
* 往IMF发送报文
*/
/**
* 往IMF发送报文
*/
/*if(!KAKO_Sender.isrunning){
KAKO_Sender kako_sender = new KAKO_Sender(client);
kako_sender.start();
... ... @@ -48,10 +50,17 @@ public class IMF_Tesk {
logger.info("<<<<<<<<<KAKO发送线程已开启-不再启动线程>>>>>>>>>>>>");
}*/
}
if (!LOGIN_OK){
loginIMF(client, loginname, loginpass, "config/imf_config.properties");
}
}catch (Exception e){
logger.info("!!!!![IMF-ERROR]-IMF客户端异常!!!!!----->"+ e.toString());
//异常后短线, 下一次定时任务时重新登录客户端
client.disconnect();
LOGIN_OK = false;
}
if (!LOGIN_OK){
loginIMF(client, loginname, loginpass, "config/imf_config.properties");
}
}
... ...
... ... @@ -2,6 +2,7 @@ package com.sy.IMF;
import com.caac.imf.api.IMFClient;
import com.sy.bwAnalysis.AnalysisRoute;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
public class KAKO_Reader extends Thread{
... ... @@ -13,29 +14,36 @@ public class KAKO_Reader extends Thread{
this.client = client;
}
@Override
public void run() {
try{
isrunning =true;
logger.info("********已进入读取线程**********");
logger.info("********读取线程状态true**********");
logger.info("********Client-INFO= "+client+"********");
Thread t =Thread.currentThread();
while(true) {
if (IMF_Tesk.LOGIN_OK){
String message = this.client.getMSG();
logger.info("读取线程已获取到消息");
if (message != null) {
logger.info(t.toString()+"读取线程已获取到消息");
if (message != null && StringUtils.isNotEmpty(message)) {
// logger.info(message);
AnalysisRoute.analysis(message);
// if(message.indexOf("<TYPE>CARM</TYPE>") > 0){
// this.client.sendMSG();
// }
}else {
logger.info("[READER-INFO]-获取到空消息,不处理");
}
}
else {
//logger.info("***");
logger.info("[READER-INFO]-CLIENT为未登录状态,不获取消息!!!!!");
}
try {
Thread.sleep(1000L);
Thread.sleep(500L);
} catch (InterruptedException var3) {
logger.info("********读取线程循环获取消息异常---->"+var3.toString());
var3.printStackTrace();
}
... ... @@ -44,7 +52,7 @@ public class KAKO_Reader extends Thread{
}catch (Exception e){
isrunning=false;
logger.info("****************读取线程不在了****************");
logger.info("解析消息出错----------->"+e.toString());
logger.info("读取线程异常----------->"+e.toString());
}
isrunning=false;
}
... ...
... ... @@ -145,7 +145,7 @@ public class AnalysisRoute {
v_express_billno billno = clrAnalysis.toBill(message);
route.clrService.save(billno);
} else if (stype.equals("IS1")) {
airone_im_stock imStock = imStockAnalysis.toImStock(message);
airone_im_stock imStock = ImStockAnalysis.toImStock(message);
T_AIR_REPERTORY repertory = route.repertoryService.selectByPermaryKey(imStock.getMawbNo());
if(repertory!=null){
repertory.setCnt(repertory.getCnt()+imStock.getCnt());
... ...
... ... @@ -25,14 +25,16 @@ public class CommandInfoAnalysis {
bean.setCheckResult(info.getCheckResult());
bean.setEsealId(info.getSeal().getEsealId());
bean.setSealKey(info.getSeal().getSealKey());
bean.setVeName(info.getGps().getVeName());
bean.setGpsId(info.getGps().getGpsId());
bean.setDestCustoms(info.getGps().getDestCostoms());
bean.setOriginCustoms(info.getGps().getOpiginCostoms());
if(info.getGps()!=null){
bean.setVeName(info.getGps().getVeName());
bean.setGpsId(info.getGps().getGpsId());
bean.setDestCustoms(info.getGps().getDestCostoms());
bean.setOriginCustoms(info.getGps().getOpiginCostoms());
}
bean.setFormId(info.getFormId());
bean.setOpHint(info.getOpHint());
return bean;
}
}
... ...
... ... @@ -16,6 +16,7 @@ import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.util.EntityUtils;
import org.apache.log4j.PropertyConfigurator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
import org.apache.log4j.Logger;
... ... @@ -51,6 +52,12 @@ public class LiftBar {
private BusnesslistinfoService busnesslistinfoService;
@Autowired
BusnessViewService busnessViewService;
@Value("${wharf.interface.host}")
private String wharfHost;
@Value("${nmms.interface.host}")
private String nmmsHost;
private static LiftBar logic = new LiftBar();
//从配置文件中读取货物重差可控范围
private static String checkWt = FileTool.readProperties("grossWt");
... ... @@ -77,6 +84,8 @@ public class LiftBar {
logic.feignService=this.feignService;
logic.busnesslistinfoService=this.busnesslistinfoService;
logic.busnessViewService=this.busnessViewService;
logic.wharfHost=this.wharfHost;
logic.nmmsHost=this.nmmsHost;
}
/**
... ... @@ -269,7 +278,7 @@ public class LiftBar {
* @param IEtype
*/
public static void sendData(String stationCode, String carNo, boolean IEtype) {
String url = "http://10.50.3.73:8881/air-api/car/channelCar?stationCode=" + stationCode + "&carNo=" + carNo + "&isPickup=" + IEtype;
String url = logic.wharfHost+"air-api/car/channelCar?stationCode=" + stationCode + "&carNo=" + carNo + "&isPickup=" + IEtype;
try {
HttpClient httpClient = new DefaultHttpClient();
HttpGet httpGet = new HttpGet(url);
... ... @@ -403,7 +412,7 @@ public class LiftBar {
if (!(waybill.indexOf("-") != -1)) {
waybill = waybill.substring(0, 3) + "-" + waybill.substring(3);
}
String url = "http://10.50.3.82:8081/orig/orig?waybill=" + waybill + "&imp=" + imp;
String url = logic.nmmsHost+"orig/orig?waybill=" + waybill + "&imp=" + imp;
// String url = "http://tjfx.15miaoo.com:8003/tj/orig/orig?waybill=" + waybill + "&imp=" + imp;
StringBuilder json = new StringBuilder();
Map map = null;
... ...
package com.sy;
import com.sy.bwAnalysis.AnalysisRoute;
import com.sy.logic.LiftBar;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
... ... @@ -9,8 +11,17 @@ import org.springframework.test.context.junit4.SpringRunner;
@SpringBootTest
public class AnalysisImfApplicationTests {
private static String message = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<MSG><META><SNDR>KAO</SNDR><RCVR></RCVR><SEQN>20220117192051</SEQN><DDTM>20220117192051</DDTM><TYPE>KAKO</TYPE><STYP>CARM</STYP></META><COMMAND_INFO AREA_ID=\"4604499001\" CHNL_NO=\"4604444412\" I_E_TYPE=\"E\" SEQ_NO=\"20220117192014000017\"><CHECK_RESULT>00000000100000000000</CHECK_RESULT><OP_HINT>直接放行</OP_HINT><SEAL><ESEAL_ID>CNSM2816998419</ESEAL_ID><SEAL_KEY>1234567890</SEAL_KEY><OPEN_TIMES/><ESEAL_IC_NO/></SEAL><SZ_MSG/></COMMAND_INFO></MSG>";
@Test
public void contextLoads() {
AnalysisRoute.analysis(message);
LiftBar.sendData("1","aaa",true);
System.out.println("99");
}
}
... ...