zhangFan / analysis_imf · 提交

转到一个项目

作者 朱兆平
提交 b06e0aeb2607a2856c44350f3422af8b89f53c2b 1 个父辈 3165bdf4

金二路由验证优化,根据场站编号确定此场站是否有申报业务的金二业务配置,再进行判定

内嵌 并排对比
正在显示 6 个修改的文件 包含 62 行增加 和 39 行删除
... ... @@ -15,7 +15,7 @@ public interface LandRouterConfigDao {
List<LandRouterConfig> selectByGatherInfo(LandRouterConfig record);
List<LandRouterConfig> selectByBussType(String businessType);
List<LandRouterConfig> selectByBussType(LandRouterConfig record);
int updateByPrimaryKeySelective(LandRouterConfig record);
... ...
package com.sy.model;
import lombok.Data;
public enum ChannelEnum {
WEST_IN_1 ("4604000000","4604333311"),
WEST_EX_1 ("4604000000","4604333322"),
NORTH_K1_IN_1 ("4604600000","4604601010"),
NORTH_K1_EX_1 ("4604600000","4604600010"),
NORTH_K1_EX_2 ("4604600000","4604600011"),
NORTH_K3_IN_1 ("4604600000","4604601030"),
NORTH_K3_EX_1 ("4604600000","4604600030"),
ZBQ_IN_6 ("4600329012","4600011006"),
ZBQ_EX_5 ("4600329012","4600010005"),
ZBQ_NEI_IN_1 ("4612199001","4612031001"),
ZBQ_NEI_EX_1 ("4612199001","4612030001"),
;
private String area;
private String channel;
ChannelEnum(String area, String channel) {
this.area = area;
this.channel = channel;
}
public String getArea() {
return area;
}
public void setArea(String area) {
this.area = area;
}
public String getChannel() {
return channel;
}
public void setChannel(String channel) {
this.channel = channel;
}
}
... ...
... ... @@ -195,7 +195,7 @@ public class MessageRouterX21 implements MessageRouter {
*/
private void cacheWithSeqno(GatherInfo info){
if (info!=null && StringUtils.isNotEmpty(info.getSeqno())) {
redisService.set(info.getSeqno(), JSON.toJSONString(info),60*60*24);
redisService.set(info.getSeqno(), JSON.toJSONString(info),60*60*24*3);
}
}
... ...
... ... @@ -82,7 +82,7 @@ public class MessageRouterX22 implements MessageRouter {
* 通知卡口
*/
CommandClient.Client(gatherInfo,commandInfoX22.getOpHint());
record(gatherInfo,false,gatherInfo.getSeqno()+"金二验放失败:"+commandInfoX22.getOpHint(),null);
record(gatherInfo,false,gatherInfo.getSeqno()+"-金二验放失败:"+commandInfoX22.getOpHint(),null);
}
}
else{
... ...
... ... @@ -37,12 +37,13 @@
and business_type = #{businessType,jdbcType=VARCHAR}
</select>
<select id="selectByBussType" parameterType="java.lang.String" resultMap="BaseResultMap">
<select id="selectByBussType" parameterType="com.sy.model.LandRouterConfig" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from land_router_config
where
business_type = #{businessType,jdbcType=VARCHAR}
and area_id = #{areaId,jdbcType=VARCHAR}
and gather_receiver = 'G2'
and `status` = 'Y'
</select>
... ...
... ... @@ -5,6 +5,7 @@ import com.sy.bwAnalysis.GatherInfoAnalysis;
import com.sy.bwAnalysis.MessageAnalysis;
import com.sy.bwAssist.Message;
import com.sy.mapper.LandListDao;
import com.sy.model.ChannelEnum;
import com.sy.model.GatherInfo;
import com.sy.service.RedisService;
import com.sy.service.router.MessageRouter;
... ... @@ -27,20 +28,6 @@ import javax.annotation.Resource;
public class GatherInfoHandleImplTest {
private AnalysisRoute analysisRoute=new AnalysisRoute();
private static String AREA_BEIHUO= "4604600000";
//一号卡口
private static String CHANEL_BEIHUO_C1_I1 = "4604601010";
private static String CHANEL_BEIHUO_C1_E1 = "4604600010";
private static String CHANEL_BEIHUO_C1_E2 = "4604600011";
//三号卡卡口一
private static String CHANEL_BEIHUO_I3 = "4604601030";
private static String CHANEL_BEIHUO_E3_3= "4604600030";
//二维码
private static String BARCODE = "9fc-4149-b8e2-28bfc18cd22b";
@Autowired
RedisService redisService;
... ... @@ -56,15 +43,12 @@ public class GatherInfoHandleImplTest {
private LandListDao landListDao;
//车牌号
private String voNo = "豫A61CR7";
//备案重量
private String vo_weight = "2000";
//过卡重量
private String cross_weight= "2324";
private String voNo = "豫K823A9";
//二维码
private static String BARCODE = "932-4b18-8931-bd28b4e9abc7";
//场站编号
private String areaID = "4604600000";
//通道编号
private String chnlNo = "4604601010";
//进出场类型I/E
private String ie = "I";
... ... @@ -143,7 +127,7 @@ public class GatherInfoHandleImplTest {
private static String RESULT_CODE_DES_SUC = "海关放行";
private static String RESULT_CODE_DES_ERR = "不放行";
private static String RESULT_CODE_DES_ERR = "海关不放行";
//X22指令报文
private static String X22_COMMANDINFO_XML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
... ... @@ -177,13 +161,12 @@ public class GatherInfoHandleImplTest {
@Test
public void exportDownload_I() {
//车牌号
String voNo = "豫A61CR7";
//过卡重量
String cross_weight= "1660";
String cross_weight= String.valueOf(5724);
//场站编号
String areaID = AREA_BEIHUO;
String areaID = ChannelEnum.NORTH_K1_IN_1.getArea();
//通道编号
String chnlNo = CHANEL_BEIHUO_C1_I1;
String chnlNo = ChannelEnum.NORTH_K1_IN_1.getChannel();
//进出场类型I/E
String ie = "I";
//二维码
... ... @@ -213,14 +196,12 @@ public class GatherInfoHandleImplTest {
public void exportDownload_E(){
PropertyConfigurator.configure("config/log4j.properties");
//车牌号
String voNo = "豫A61CR7";
//过卡重量
String cross_weight= String.valueOf(1660+24255);
String cross_weight= String.valueOf(4622);
//场站编号
String areaID = AREA_BEIHUO;
String areaID = ChannelEnum.NORTH_K1_EX_2.getArea();
//通道编号
String chnlNo = CHANEL_BEIHUO_C1_E1;
String chnlNo = ChannelEnum.NORTH_K1_EX_2.getChannel();
//进出场类型I/E
String ie = "E";
//二维码
... ... @@ -248,10 +229,8 @@ public class GatherInfoHandleImplTest {
*/
@Test
public void X22Test(){
landListDao.releaseBarcode("20220624063118000004");
X22_COMMANDINFO_XML= X22_COMMANDINFO_XML.replace("${AREA_ID}",AREA_BEIHUO)
.replace("${CHNL_NO}",CHANEL_BEIHUO_C1_E1)
X22_COMMANDINFO_XML= X22_COMMANDINFO_XML.replace("${AREA_ID}",ChannelEnum.NORTH_K1_IN_1.getArea())
.replace("${CHNL_NO}",ChannelEnum.NORTH_K1_IN_1.getChannel())
.replace("${I_E_TYPE}","E")
.replace("${SEQ_NO}","20220624063118000004")
.replace("${CHECK_RESULT}",CHCEK_RESULT_CODE_E_SUC)
... ...