zhangFan / analysis_imf · 提交

转到一个项目

作者 朱兆平
提交 5430712a45f624dd29e5263005681b2917dc0b65 1 个父辈 bd672ad1

金二适配及本地抬杆放行优化

内嵌 并排对比
正在显示 25 个修改的文件 包含 1060 行增加 和 177 行删除
1 package com.sy; 1 package com.sy;
2 2
3 -import com.sy.bwAnalysis.AnalysisRoute;  
4 import org.mybatis.spring.annotation.MapperScan; 3 import org.mybatis.spring.annotation.MapperScan;
5 import org.springframework.boot.SpringApplication; 4 import org.springframework.boot.SpringApplication;
6 import org.springframework.boot.autoconfigure.SpringBootApplication; 5 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -17,49 +16,5 @@ public class AnalysisImfApplication { @@ -17,49 +16,5 @@ public class AnalysisImfApplication {
17 16
18 public static void main(String[] args) { 17 public static void main(String[] args) {
19 SpringApplication.run(AnalysisImfApplication.class, args); 18 SpringApplication.run(AnalysisImfApplication.class, args);
20 -  
21 - /*String message="<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +  
22 - "<MSG><META><SNDR>KAO</SNDR><RCVR></RCVR><SEQN>20200924082928</SEQN><DDTM>20200924082928</DDTM><TYPE>KAKO</TYPE><STYP>CARM</STYP></META><GATHER_INFO AREA_ID=\"\t\t4600329012\" CHNL_NO=\"\t\t4600010005\" I_E_TYPE=\"I\" SEQ_NO=\"20200924082701000001\">\n" +  
23 - " <IC>\n" +  
24 - " <DR_IC_NO/>\n" +  
25 - " <IC_DR_CUSTOMS_NO/>\n" +  
26 - " <IC_CO_CUSTOMS_NO/>\n" +  
27 - " <IC_BILL_NO/>\n" +  
28 - " <IC_FORM_TYPE/>\n" +  
29 - " <IC_GROSS_WT/>\n" +  
30 - " <IC_VE_CUSTOMS_NO/>\n" +  
31 - " <IC_VE_NAME/>\n" +  
32 - " <IC_CONTA_ID/>\n" +  
33 - " <IC_ESEAL_ID/>\n" +  
34 - " <IC_REG_DATETIME/>\n" +  
35 - " <IC_PER_DAY_DUE/>\n" +  
36 - " </IC>\n" +  
37 - " <WEIGHT>\n" +  
38 - " <GROSS_WT>1120.00</GROSS_WT>\n" +  
39 - " </WEIGHT>\n" +  
40 - " <CAR>\n" +  
41 - " <VE_NAME>苏H630D5\t</VE_NAME>\n" +  
42 - " <CAR_EC_NO/>\n" +  
43 - " <CAR_EC_NO2/>\n" +  
44 - " <VE_CUSTOMS_NO/>\n" +  
45 - " <VE_WT/>\n" +  
46 - " </CAR>\n" +  
47 - " <CONTA>\n" +  
48 - " <CONTA_NUM/>\n" +  
49 - " <CONTA_RECO>1</CONTA_RECO>\n" +  
50 - " <CONTA_ID_F/>\n" +  
51 - " <CONTA_ID_B/>\n" +  
52 - " <CONTA_MODEL_F/>\n" +  
53 - " <CONTA_MODEL_B/>\n" +  
54 - " </CONTA>\n" +  
55 - " <ORDER_NUM/>\n" +  
56 - " <BAR_CODE>20201029163743299076</BAR_CODE>\n" +  
57 - " <SEAL>\n" +  
58 - " <ESEAL_ID/>\n" +  
59 - " <SEAL_KEY/>\n" +  
60 - " </SEAL>\n" +  
61 - "</GATHER_INFO></MSG>";  
62 -  
63 - AnalysisRoute.analysis(message);*/  
64 } 19 }
65 } 20 }
@@ -31,8 +31,8 @@ public class AnalysisRoute implements Runnable{ @@ -31,8 +31,8 @@ public class AnalysisRoute implements Runnable{
31 @Autowired 31 @Autowired
32 private CLRService clrService; 32 private CLRService clrService;
33 33
34 - @Qualifier("GatherInfoService")  
35 @Autowired 34 @Autowired
  35 + @Qualifier("GatherInfoServiceImpl")
36 private GatherInfoService infoService; 36 private GatherInfoService infoService;
37 37
38 @Autowired 38 @Autowired
  1 +package com.sy.mapper;
  2 +
  3 +import com.sy.model.LandList;
  4 +
  5 +public interface LandListDao {
  6 + int deleteByPrimaryKey(String id);
  7 +
  8 + int insert(LandList record);
  9 +
  10 + int insertSelective(LandList record);
  11 +
  12 + LandList selectByPrimaryKey(String id);
  13 +
  14 + int updateByPrimaryKeySelective(LandList record);
  15 +
  16 + int updateByPrimaryKey(LandList record);
  17 +
  18 + /**
  19 + * 根据二维码 核销申请单
  20 + * @param barcode 二维码
  21 + * @return 更新数据量
  22 + */
  23 + int releaseBarcode(String barcode);
  24 +}
@@ -65,6 +65,10 @@ public class LandBusinessTypeList { @@ -65,6 +65,10 @@ public class LandBusinessTypeList {
65 65
66 private String remark2; 66 private String remark2;
67 67
  68 + private String remark3;
  69 +
  70 + private String veProperty;
  71 +
68 public String getIsthree() { 72 public String getIsthree() {
69 return isthree; 73 return isthree;
70 } 74 }
@@ -322,4 +326,20 @@ public class LandBusinessTypeList { @@ -322,4 +326,20 @@ public class LandBusinessTypeList {
322 public void setRemark2(String remark2) { 326 public void setRemark2(String remark2) {
323 this.remark2 = remark2 == null ? null : remark2.trim(); 327 this.remark2 = remark2 == null ? null : remark2.trim();
324 } 328 }
  329 +
  330 + public String getRemark3() {
  331 + return remark3;
  332 + }
  333 +
  334 + public void setRemark3(String remark3) {
  335 + this.remark3 = remark3;
  336 + }
  337 +
  338 + public String getVeProperty() {
  339 + return veProperty;
  340 + }
  341 +
  342 + public void setVeProperty(String veProperty) {
  343 + this.veProperty = veProperty;
  344 + }
325 } 345 }
  1 +package com.sy.model;
  2 +
  3 +import java.io.Serializable;
  4 +import java.util.Date;
  5 +import lombok.Data;
  6 +
  7 +/**
  8 + * land_list
  9 + * @author
  10 + */
  11 +@Data
  12 +public class LandList implements Serializable {
  13 + /**
  14 + * 主键
  15 + */
  16 + private String id;
  17 +
  18 + /**
  19 + * 发送二维码标识id
  20 + */
  21 + private String massageId;
  22 +
  23 + private String trailerFrameNo;
  24 +
  25 + /**
  26 + * 车架号
  27 + */
  28 + private String trailerLicenseNo;
  29 +
  30 + /**
  31 + * 主单列表
  32 + */
  33 + private String masterList;
  34 +
  35 + private Date prodectTime;
  36 +
  37 + /**
  38 + * 删除标识0：未删除，1删除
  39 + */
  40 + private String isDelete;
  41 +
  42 + /**
  43 + * 货代代码
  44 + */
  45 + private String agentno;
  46 +
  47 + /**
  48 + * 货代名称
  49 + */
  50 + private String agentname;
  51 +
  52 + /**
  53 + * 所在企业代码
  54 + */
  55 + private String cocode;
  56 +
  57 + /**
  58 + * 驾驶员姓名
  59 + */
  60 + private String drivername;
  61 +
  62 + /**
  63 + * 驾驶员ID
  64 + */
  65 + private String driverid;
  66 +
  67 + /**
  68 + * 起始海关代码
  69 + */
  70 + private String startport;
  71 +
  72 + /**
  73 + * 目的关区代码
  74 + */
  75 + private String endport;
  76 +
  77 + /**
  78 + * 起始场站
  79 + */
  80 + private String startsatation;
  81 +
  82 + /**
  83 + * 目的场站
  84 + */
  85 + private String endstation;
  86 +
  87 + /**
  88 + * 通道，卡口
  89 + */
  90 + private String aisle;
  91 +
  92 + /**
  93 + * 业务类型(1.出口送货，2：进口提货，3：分拨分流，4：货运调拨)
  94 + */
  95 + private String businesstype;
  96 +
  97 + /**
  98 + * 进出场标识
  99 + */
  100 + private String turnoverflag;
  101 +
  102 + /**
  103 + * 二维码
  104 + */
  105 + private String barcode;
  106 +
  107 + /**
  108 + * 校验标识
  109 + */
  110 + private String contrastflag;
  111 +
  112 + /**
  113 + * 创建人
  114 + */
  115 + private String createBy;
  116 +
  117 + /**
  118 + * 创建时间
  119 + */
  120 + private Date createDate;
  121 +
  122 + private String updateBy;
  123 +
  124 + private Date updateDate;
  125 +
  126 + /**
  127 + * 二维码是否失效：0：有效，1：无效
  128 + */
  129 + private String isvalid;
  130 +
  131 + /**
  132 + * 过卡重量
  133 + */
  134 + private Double aislewt;
  135 +
  136 + /**
  137 + * 是否空车：0空车，1不空车
  138 + */
  139 + private String isfull;
  140 +
  141 + /**
  142 + * 车辆装载货物总重量
  143 + */
  144 + private String remark;
  145 +
  146 + /**
  147 + * 进出差值
  148 + */
  149 + private String remark1;
  150 +
  151 + /**
  152 + * 車輛備案重量
  153 + */
  154 + private String remark2;
  155 +
  156 + private String remark3;
  157 +
  158 + private String isthree;
  159 +
  160 + /**
  161 + * 申請單位
  162 + */
  163 + private String veproperty;
  164 +
  165 + /**
  166 + * 介质类型 1 IC卡
  167 + 2 二维码
  168 + 3 电子车牌
  169 + 4 车牌号
  170 + */
  171 + private String mediumtype;
  172 +
  173 + /**
  174 + * 数据中心统一编号seqn
  175 + */
  176 + private String seqn;
  177 +
  178 + /**
  179 + * 车次确认编号
  180 + */
  181 + private String trainsconfirmationNumber;
  182 +
  183 + /**
  184 + * 申报状态
  185 + */
  186 + private String applicationStatus;
  187 +
  188 + /**
  189 + * 企业信用代码
  190 + */
  191 + private String enterpriseCreditCode;
  192 +
  193 + /**
  194 + * 组织机构代码
  195 + */
  196 + private String organizationCode;
  197 +
  198 + /**
  199 + * 申报人员编号
  200 + */
  201 + private String declarePersonnelNumbers;
  202 +
  203 + /**
  204 + * 运输方式 2 海运 4公路 5航空
  205 + */
  206 + private String modeTransportation;
  207 +
  208 + private static final long serialVersionUID = 1L;
  209 +}
@@ -43,6 +43,11 @@ public class LandRouterConfig implements Serializable { @@ -43,6 +43,11 @@ public class LandRouterConfig implements Serializable {
43 private String businessType; 43 private String businessType;
44 44
45 /** 45 /**
  46 + * 流转申请业务类型 进口业务=I 还是出口业务=E
  47 + */
  48 + private String ieType;
  49 +
  50 + /**
46 * 对应金二业务类型码 51 * 对应金二业务类型码
47 */ 52 */
48 private String g2BusinessType; 53 private String g2BusinessType;
1 package com.sy.service; 1 package com.sy.service;
2 2
3 import com.sy.model.GatherInfo; 3 import com.sy.model.GatherInfo;
4 -import com.sy.model.LandBusinessTypeList;  
5 4
6 public interface GatherInfoService { 5 public interface GatherInfoService {
7 6
@@ -11,6 +10,4 @@ public interface GatherInfoService { @@ -11,6 +10,4 @@ public interface GatherInfoService {
11 * 根据过卡进行抬杆指令处理 10 * 根据过卡进行抬杆指令处理
12 */ 11 */
13 void handel(GatherInfo info); 12 void handel(GatherInfo info);
14 -  
15 -  
16 } 13 }
@@ -60,7 +60,7 @@ public class CommandLogImpl implements CommandLogService { @@ -60,7 +60,7 @@ public class CommandLogImpl implements CommandLogService {
60 command.setInGrossWeight(inWt); 60 command.setInGrossWeight(inWt);
61 command.setGoodsWeight(goodsWt); 61 command.setGoodsWeight(goodsWt);
62 command.setActualGoodsWeight(diffVal); 62 command.setActualGoodsWeight(diffVal);
63 - if(list_infos.size()>0){ 63 + if(list_infos!=null && list_infos.size()>0){
64 command.setMasterList(Arrays.toString(toStrArry(list_infos))); 64 command.setMasterList(Arrays.toString(toStrArry(list_infos)));
65 } 65 }
66 insert(command); 66 insert(command);
@@ -4,18 +4,19 @@ import com.alibaba.fastjson.JSON; @@ -4,18 +4,19 @@ import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONArray; 4 import com.alibaba.fastjson.JSONArray;
5 import com.alibaba.fastjson.JSONObject; 5 import com.alibaba.fastjson.JSONObject;
6 import com.sy.crossDomain.buildBarCode; 6 import com.sy.crossDomain.buildBarCode;
  7 +import com.sy.mapper.LandListDao;
7 import com.sy.model.*; 8 import com.sy.model.*;
8 import com.sy.service.*; 9 import com.sy.service.*;
9 import com.sy.socket.CommandClient; 10 import com.sy.socket.CommandClient;
10 import com.sy.utils.FileTool; 11 import com.sy.utils.FileTool;
  12 +import lombok.extern.slf4j.Slf4j;
11 import org.apache.commons.lang.StringUtils; 13 import org.apache.commons.lang.StringUtils;
12 -import org.slf4j.Logger;  
13 -import org.slf4j.LoggerFactory;  
14 import org.springframework.beans.factory.annotation.Autowired; 14 import org.springframework.beans.factory.annotation.Autowired;
15 import org.springframework.beans.factory.annotation.Value; 15 import org.springframework.beans.factory.annotation.Value;
16 import org.springframework.stereotype.Component; 16 import org.springframework.stereotype.Component;
17 17
18 import javax.annotation.PostConstruct; 18 import javax.annotation.PostConstruct;
  19 +import javax.annotation.Resource;
19 import javax.validation.constraints.NotNull; 20 import javax.validation.constraints.NotNull;
20 import java.math.BigDecimal; 21 import java.math.BigDecimal;
21 import java.util.*; 22 import java.util.*;
@@ -23,10 +24,10 @@ import java.util.stream.Collectors; @@ -23,10 +24,10 @@ import java.util.stream.Collectors;
23 24
24 import static com.sy.service.impl.ResMessageServiceImpl.toStrArry; 25 import static com.sy.service.impl.ResMessageServiceImpl.toStrArry;
25 26
  27 +@Slf4j
26 @Component("GatherInfoHandle") 28 @Component("GatherInfoHandle")
27 public class GatherInfoHandle implements GatherInfoService { 29 public class GatherInfoHandle implements GatherInfoService {
28 30
29 - private static final Logger logger = LoggerFactory.getLogger(GatherInfoHandle.class);  
30 private static GatherInfoHandle gatherInfoHandle; 31 private static GatherInfoHandle gatherInfoHandle;
31 32
32 //逻辑判断后的返回信息定义 33 //逻辑判断后的返回信息定义
@@ -58,11 +59,15 @@ public class GatherInfoHandle implements GatherInfoService { @@ -58,11 +59,15 @@ public class GatherInfoHandle implements GatherInfoService {
58 private RedisService redisService; 59 private RedisService redisService;
59 60
60 @Autowired 61 @Autowired
61 - BusnesslistinfoService busnesslistinfoService; 62 + private BusnesslistinfoService busnesslistinfoService;
  63 +
  64 + @Resource
  65 + private LandListDao landListDao;
62 66
63 @Value("${devdebug}") 67 @Value("${devdebug}")
64 private Boolean debug; 68 private Boolean debug;
65 69
  70 +
66 /** 71 /**
67 * 进出场申请表 72 * 进出场申请表
68 */ 73 */
@@ -171,6 +176,8 @@ public class GatherInfoHandle implements GatherInfoService { @@ -171,6 +176,8 @@ public class GatherInfoHandle implements GatherInfoService {
171 //入区核放 176 //入区核放
172 if(chanelInCheck()){ 177 if(chanelInCheck()){
173 pass(); 178 pass();
  179 + log.info("[X21-SUCCESS]:[IN]-车辆入区直接放行");
  180 + return;
174 }else{ 181 }else{
175 inStationInfo(); //入场信息获取 182 inStationInfo(); //入场信息获取
176 setListinfos(); //流转申请表体获取 183 setListinfos(); //流转申请表体获取
@@ -185,11 +192,13 @@ public class GatherInfoHandle implements GatherInfoService { @@ -185,11 +192,13 @@ public class GatherInfoHandle implements GatherInfoService {
185 releaseFormCheck(); //流转申请单核销 192 releaseFormCheck(); //流转申请单核销
186 } 193 }
187 } 194 }
  195 + }else{
  196 + log.info("[X21-ERROR]:{}车辆验放失败",info.getVename());
188 } 197 }
189 - logger.info("[X21-ERROR]:车辆过磅验放失败"); 198 +
190 199
191 }catch (Exception e){ 200 }catch (Exception e){
192 - logger.error("放行判定异常",e); 201 + log.error("放行判定异常",e);
193 CommandClient.Client(gatherInfo, "放行判定异常"); 202 CommandClient.Client(gatherInfo, "放行判定异常");
194 } 203 }
195 204
@@ -217,7 +226,7 @@ public class GatherInfoHandle implements GatherInfoService { @@ -217,7 +226,7 @@ public class GatherInfoHandle implements GatherInfoService {
217 private boolean veNameCheck(String veName){ 226 private boolean veNameCheck(String veName){
218 //1. 若无车牌号，返回未识别错误 227 //1. 若无车牌号，返回未识别错误
219 if (StringUtils.isEmpty(vaName)) { 228 if (StringUtils.isEmpty(vaName)) {
220 - logger.error(NO_CHEPAI+vaName); 229 + log.error(NO_CHEPAI+vaName);
221 sendBw(info,false,NO_CHEPAI + vaName,null,listinfos); 230 sendBw(info,false,NO_CHEPAI + vaName,null,listinfos);
222 //CommandClient.Client(info, NO_CHEPAI + vaName); 231 //CommandClient.Client(info, NO_CHEPAI + vaName);
223 return false; 232 return false;
@@ -233,7 +242,7 @@ public class GatherInfoHandle implements GatherInfoService { @@ -233,7 +242,7 @@ public class GatherInfoHandle implements GatherInfoService {
233 LandRoadVe ve = gatherInfoHandle.veService.selectByFrameNo(vaName); 242 LandRoadVe ve = gatherInfoHandle.veService.selectByFrameNo(vaName);
234 //若无备案信息或者黑名单，返回车辆未备案或者识别错误, 243 //若无备案信息或者黑名单，返回车辆未备案或者识别错误,
235 if (ve == null && !veBlackListCheck(ve)) { 244 if (ve == null && !veBlackListCheck(ve)) {
236 - logger.error(NORECORD+vaName); 245 + log.error(NORECORD+vaName);
237 sendBw(info,false,NORECORD + vaName,null,listinfos); 246 sendBw(info,false,NORECORD + vaName,null,listinfos);
238 //CommandClient.Client(info, NORECORD + vaName); 247 //CommandClient.Client(info, NORECORD + vaName);
239 return false; 248 return false;
@@ -250,7 +259,7 @@ public class GatherInfoHandle implements GatherInfoService { @@ -250,7 +259,7 @@ public class GatherInfoHandle implements GatherInfoService {
250 */ 259 */
251 private boolean veBlackListCheck(LandRoadVe ve){ 260 private boolean veBlackListCheck(LandRoadVe ve){
252 if("Y".equals(ve.getVeState())){ 261 if("Y".equals(ve.getVeState())){
253 - logger.info(BLACKLIST+vaName); 262 + log.info(BLACKLIST+vaName);
254 sendBw(info,false,BLACKLIST + vaName,null,listinfos); 263 sendBw(info,false,BLACKLIST + vaName,null,listinfos);
255 return false; 264 return false;
256 } 265 }
@@ -264,11 +273,11 @@ public class GatherInfoHandle implements GatherInfoService { @@ -264,11 +273,11 @@ public class GatherInfoHandle implements GatherInfoService {
264 */ 273 */
265 private boolean LandBusinessFormCheck(){ 274 private boolean LandBusinessFormCheck(){
266 try { 275 try {
267 - logger.info("车辆-{}核碰缓存",info.getVename()); 276 + log.info("车辆-{}核碰缓存",info.getVename());
268 landBusinessTypeListList = new ArrayList<>(); 277 landBusinessTypeListList = new ArrayList<>();
269 //通过车牌号，二维码，场站，通道号，进出类型查询进出场站申请列表 278 //通过车牌号，二维码，场站，通道号，进出类型查询进出场站申请列表
270 if (info==null){ 279 if (info==null){
271 - logger.error("info 实体为NULL"); 280 + log.error("info 实体为NULL");
272 return false; 281 return false;
273 } 282 }
274 283
@@ -281,7 +290,7 @@ public class GatherInfoHandle implements GatherInfoService { @@ -281,7 +290,7 @@ public class GatherInfoHandle implements GatherInfoService {
281 landBusinessTypeListList = list; 290 landBusinessTypeListList = list;
282 //4. 若查询结果为null，返回无相对应进出场申请 291 //4. 若查询结果为null，返回无相对应进出场申请
283 if (list == null || list.isEmpty()) { 292 if (list == null || list.isEmpty()) {
284 - logger.error(vaName+IEPORSE); 293 + log.error(vaName+IEPORSE);
285 sendBw(info,false,vaName+IEPORSE,null,listinfos); 294 sendBw(info,false,vaName+IEPORSE,null,listinfos);
286 return false; 295 return false;
287 } 296 }
@@ -292,21 +301,22 @@ public class GatherInfoHandle implements GatherInfoService { @@ -292,21 +301,22 @@ public class GatherInfoHandle implements GatherInfoService {
292 landBusinessTypeList = item; 301 landBusinessTypeList = item;
293 //离场装载货物重量 302 //离场装载货物重量
294 goodsWt = Double.parseDouble(landBusinessTypeList.getRemark()); 303 goodsWt = Double.parseDouble(landBusinessTypeList.getRemark());
295 - logger.info("车辆-{}的申请缓存信息核碰成功,通道:{}",info.getVename(),info.getChnlno()); 304 + log.info("车辆-{}的申请缓存信息核碰成功,通道:{}",info.getVename(),info.getChnlno());
296 return true; 305 return true;
297 } 306 }
298 } 307 }
299 308
300 //核碰流转申请失败 309 //核碰流转申请失败
301 - logger.info("[CACHE]:车辆-{}的流转申请校验失败,无对应流转申请信息",info.getVename()); 310 + log.info("[CACHE]:车辆-{}的流转申请校验失败,无对应流转申请信息",info.getVename());
302 }else { 311 }else {
303 - logger.error("[CACHE-ERROR]:未找到车辆-{}的申请缓存信息",info.getVename());  
304 - logger.info("[CACHE-ERROR]:未找到车辆-{}的申请缓存信息,或者流转已超期失效",info.getVename()); 312 + log.error("[CACHE-ERROR]:未找到车辆-{}的申请缓存信息",info.getVename());
  313 + log.info("[CACHE-ERROR]:未找到车辆-{}的申请缓存信息,或者流转已超期失效",info.getVename());
  314 + sendBw(info,false,info.getVename()+IEPORSE+",或者流转已超期失效",null,listinfos);
305 return false; 315 return false;
306 } 316 }
307 }catch (Exception e){ 317 }catch (Exception e){
308 e.printStackTrace(); 318 e.printStackTrace();
309 - logger.error("[CACHE-PARSE-ERROR]:",e); 319 + log.error("[CACHE-PARSE-ERROR]:",e);
310 return false; 320 return false;
311 } 321 }
312 322
@@ -322,7 +332,7 @@ public class GatherInfoHandle implements GatherInfoService { @@ -322,7 +332,7 @@ public class GatherInfoHandle implements GatherInfoService {
322 */ 332 */
323 private boolean weightCheck(GatherInfo info){ 333 private boolean weightCheck(GatherInfo info){
324 if(info.getGrosswt().compareTo(BigDecimal.ZERO) > 0){ 334 if(info.getGrosswt().compareTo(BigDecimal.ZERO) > 0){
325 - logger.info("过磅重量校验通过，过磅重量大于0"); 335 + log.info("过磅重量校验通过，过磅重量大于0");
326 }else{ 336 }else{
327 sendBw(info,false,NOGrossWt + growssWt,new LandBusinessTypeList(),listinfos); 337 sendBw(info,false,NOGrossWt + growssWt,new LandBusinessTypeList(),listinfos);
328 return false; 338 return false;
@@ -344,7 +354,7 @@ public class GatherInfoHandle implements GatherInfoService { @@ -344,7 +354,7 @@ public class GatherInfoHandle implements GatherInfoService {
344 //todo:快件暂不校验直接放行,不过得录单 354 //todo:快件暂不校验直接放行,不过得录单
345 //todo:换单货物校验逻辑待定 355 //todo:换单货物校验逻辑待定
346 //todo:未来取消货物类型判定. 356 //todo:未来取消货物类型判定.
347 - logger.info("车辆装载货物为:" + landBusinessTypeList.getCocode()); 357 + log.info("车辆装载货物为:" + landBusinessTypeList.getCocode());
348 return true; 358 return true;
349 } 359 }
350 return false; 360 return false;
@@ -369,7 +379,7 @@ public class GatherInfoHandle implements GatherInfoService { @@ -369,7 +379,7 @@ public class GatherInfoHandle implements GatherInfoService {
369 private void inStationInfo(){ 379 private void inStationInfo(){
370 List<LandBusinessTypeList> stationInChanleInfo= gatherInfoHandle.listService.selectwt(info.getVename(),info.getBarcode(),info.getAreaid(),"I"); 380 List<LandBusinessTypeList> stationInChanleInfo= gatherInfoHandle.listService.selectwt(info.getVename(),info.getBarcode(),info.getAreaid(),"I");
371 if (stationInChanleInfo.isEmpty()){ 381 if (stationInChanleInfo.isEmpty()){
372 - logger.info("未查询到车辆:{}的入场信息",info.getVename()); 382 + log.info("未查询到车辆:{}的入场信息",info.getVename());
373 }else { 383 }else {
374 for(LandBusinessTypeList typeList:stationInChanleInfo){ 384 for(LandBusinessTypeList typeList:stationInChanleInfo){
375 if(typeList.getAislewt()!=null){ 385 if(typeList.getAislewt()!=null){
@@ -408,13 +418,13 @@ public class GatherInfoHandle implements GatherInfoService { @@ -408,13 +418,13 @@ public class GatherInfoHandle implements GatherInfoService {
408 * @return true 抬杆放行 418 * @return true 抬杆放行
409 */ 419 */
410 private boolean checkRelease(){ 420 private boolean checkRelease(){
411 - logger.info("[进出场申请]-业务类型为:"+landBusinessTypeList.getCocode()+landBusinessTypeList.getBusinesstype()); 421 + log.info("[进出场申请]-业务类型为:"+landBusinessTypeList.getCocode()+landBusinessTypeList.getBusinesstype());
412 switch (landBusinessTypeList.getBusinesstype()){ 422 switch (landBusinessTypeList.getBusinesstype()){
413 case "空车业务": 423 case "空车业务":
414 if(gatherInfoHandle.weightCheckHandleService.checkEmpty(growssWt,selfWt)){ 424 if(gatherInfoHandle.weightCheckHandleService.checkEmpty(growssWt,selfWt)){
415 return true; 425 return true;
416 }else{ 426 }else{
417 - logger.error("[空车业务]-出场重量未通过校验:"+GROWSSEXCETION); 427 + log.error("[空车业务]-出场重量未通过校验:"+GROWSSEXCETION);
418 sendBw(info,false,GROWSSEXCETION,landBusinessTypeList,listinfos); 428 sendBw(info,false,GROWSSEXCETION,landBusinessTypeList,listinfos);
419 return false; 429 return false;
420 } 430 }
@@ -423,7 +433,7 @@ public class GatherInfoHandle implements GatherInfoService { @@ -423,7 +433,7 @@ public class GatherInfoHandle implements GatherInfoService {
423 if (gatherInfoHandle.weightCheckHandleService.checkExportDownLoading(growssWt, selfWt, goodsWt,inWt)){ 433 if (gatherInfoHandle.weightCheckHandleService.checkExportDownLoading(growssWt, selfWt, goodsWt,inWt)){
424 return true; 434 return true;
425 }else{ 435 }else{
426 - logger.error("[出口送货]-出场重量未通过校验:"+GROWSSEXCETION); 436 + log.error("[出口送货]-出场重量未通过校验:"+GROWSSEXCETION);
427 sendBw(info,false,GROWSSEXCETION,landBusinessTypeList,listinfos); 437 sendBw(info,false,GROWSSEXCETION,landBusinessTypeList,listinfos);
428 return false; 438 return false;
429 } 439 }
@@ -434,21 +444,21 @@ public class GatherInfoHandle implements GatherInfoService { @@ -434,21 +444,21 @@ public class GatherInfoHandle implements GatherInfoService {
434 /** 444 /**
435 * 退库货物不校验运单放行. 445 * 退库货物不校验运单放行.
436 */ 446 */
437 - logger.info("[退库业务]-重量核验通过."); 447 + log.info("[退库业务]-重量核验通过.");
438 }else{ 448 }else{
439 //检查运单放行 449 //检查运单放行
440 if (gatherInfoHandle.resMessageService.checkManifestRelease(info,listinfos)){ 450 if (gatherInfoHandle.resMessageService.checkManifestRelease(info,listinfos)){
441 return true; 451 return true;
442 }else { 452 }else {
443 //有运单未放行 453 //有运单未放行
444 - logger.error("[进口提货]-出场未通过校验:"+FANGXING+landBusinessTypeList.getMasterList()); 454 + log.error("[进口提货]-出场未通过校验:"+FANGXING+landBusinessTypeList.getMasterList());
445 sendBw(info,false,FANGXING+landBusinessTypeList.getMasterList(),landBusinessTypeList,listinfos); 455 sendBw(info,false,FANGXING+landBusinessTypeList.getMasterList(),landBusinessTypeList,listinfos);
446 return false; 456 return false;
447 } 457 }
448 } 458 }
449 //todo:装载运单历史数据累加超重判定 459 //todo:装载运单历史数据累加超重判定
450 }else{ 460 }else{
451 - logger.error("[进口提货]-出场重量未通过校验:"+GROWSSEXCETION); 461 + log.error("[进口提货]-出场重量未通过校验:"+GROWSSEXCETION);
452 sendBw(info,false,GROWSSEXCETION,landBusinessTypeList,listinfos); 462 sendBw(info,false,GROWSSEXCETION,landBusinessTypeList,listinfos);
453 return false; 463 return false;
454 } 464 }
@@ -458,14 +468,14 @@ public class GatherInfoHandle implements GatherInfoService { @@ -458,14 +468,14 @@ public class GatherInfoHandle implements GatherInfoService {
458 //todo:检查分拨申请 468 //todo:检查分拨申请
459 boolean allocatCheck = checkNmmsAllocate(landBusinessTypeList.getMasterList()); 469 boolean allocatCheck = checkNmmsAllocate(landBusinessTypeList.getMasterList());
460 if(!allocatCheck){ 470 if(!allocatCheck){
461 - logger.error("[分拨业务]-分拨申请舱单未通过校验:"+FENBO); 471 + log.error("[分拨业务]-分拨申请舱单未通过校验:"+FENBO);
462 sendBw(info,false,FENBO,landBusinessTypeList,listinfos); 472 sendBw(info,false,FENBO,landBusinessTypeList,listinfos);
463 return false; 473 return false;
464 } 474 }
465 return true; 475 return true;
466 //todo:分拨运抵通知,重车入场视为运抵 476 //todo:分拨运抵通知,重车入场视为运抵
467 }else{ 477 }else{
468 - logger.error("[分拨业务]-出场重量未通过校验:"+GROWSSEXCETION); 478 + log.error("[分拨业务]-出场重量未通过校验:"+GROWSSEXCETION);
469 sendBw(info,false,GROWSSEXCETION,landBusinessTypeList,listinfos); 479 sendBw(info,false,GROWSSEXCETION,landBusinessTypeList,listinfos);
470 return false; 480 return false;
471 } 481 }
@@ -476,18 +486,18 @@ public class GatherInfoHandle implements GatherInfoService { @@ -476,18 +486,18 @@ public class GatherInfoHandle implements GatherInfoService {
476 return true; 486 return true;
477 }else { 487 }else {
478 //有运单未放行 488 //有运单未放行
479 - logger.error("[调拨业务]-出场未通过校验:"+FANGXING+landBusinessTypeList.getMasterList()); 489 + log.error("[调拨业务]-出场未通过校验:"+FANGXING+landBusinessTypeList.getMasterList());
480 sendBw(info,false,FANGXING,landBusinessTypeList,listinfos); 490 sendBw(info,false,FANGXING,landBusinessTypeList,listinfos);
481 return false; 491 return false;
482 } 492 }
483 //todo:检查ULD放行. 493 //todo:检查ULD放行.
484 }else{ 494 }else{
485 - logger.error("[调拨业务]-出场未通过校验:"+GROWSSEXCETION); 495 + log.error("[调拨业务]-出场未通过校验:"+GROWSSEXCETION);
486 sendBw(info,false,GROWSSEXCETION,landBusinessTypeList,listinfos); 496 sendBw(info,false,GROWSSEXCETION,landBusinessTypeList,listinfos);
487 return false; 497 return false;
488 } 498 }
489 default: 499 default:
490 - logger.error("[未知业务类型]-出场未通过校验"); 500 + log.error("[未知业务类型]-出场未通过校验");
491 break; 501 break;
492 } 502 }
493 503
@@ -552,7 +562,7 @@ public class GatherInfoHandle implements GatherInfoService { @@ -552,7 +562,7 @@ public class GatherInfoHandle implements GatherInfoService {
552 if (temp.isEmpty()){ 562 if (temp.isEmpty()){
553 563
554 //todo:流转申请状态核销 564 //todo:流转申请状态核销
555 - logger.info("[进出场申请]-流转申请已核销:"+vaName); 565 + log.info("[进出场申请]-流转申请已核销:"+vaName);
556 //二维码核销 566 //二维码核销
557 releaseBarCode(); 567 releaseBarCode();
558 } 568 }
@@ -568,11 +578,16 @@ public class GatherInfoHandle implements GatherInfoService { @@ -568,11 +578,16 @@ public class GatherInfoHandle implements GatherInfoService {
568 //二维码失效通知,已进入场站的与缓存比较. 578 //二维码失效通知,已进入场站的与缓存比较.
569 if(count==0){ 579 if(count==0){
570 //todo:测试注释掉,二维码释放 580 //todo:测试注释掉,二维码释放
571 - logger.info("[进出场申请]-二维码释放:"+vaName); 581 + log.info("[进出场申请]-二维码释放:"+vaName);
572 if (!gatherInfoHandle.debug){ 582 if (!gatherInfoHandle.debug){
573 buildBarCode.cancleBarCode(vaName); 583 buildBarCode.cancleBarCode(vaName);
574 } 584 }
  585 + int rc = gatherInfoHandle.landListDao.releaseBarcode(info.getBarcode());
  586 + //车辆流转申请缓存删除
575 gatherInfoHandle.redisService.del(info.getVename()); 587 gatherInfoHandle.redisService.del(info.getVename());
  588 + //车辆过卡信息缓存删除-X22金二判定时候生成的这个缓存
  589 + gatherInfoHandle.redisService.del(info.getSeqno());
  590 + log.info("[流转申请]-车辆{}二维码已核销:{}",vaName,info.getBarcode());
576 } 591 }
577 } 592 }
578 593
@@ -599,16 +614,16 @@ public class GatherInfoHandle implements GatherInfoService { @@ -599,16 +614,16 @@ public class GatherInfoHandle implements GatherInfoService {
599 return check; 614 return check;
600 } 615 }
601 616
602 - logger.info(String.format("开始发送指令：车牌%s，场站%s，通道%s，重量%s",info.getVename(),info.getAreaid(),info.getChnlno(),info.getGrosswt())); 617 + log.info(String.format("开始发送指令：车牌%s，场站%s，通道%s，重量%s",info.getVename(),info.getAreaid(),info.getChnlno(),info.getGrosswt()));
603 boolean flag = false; 618 boolean flag = false;
604 if (check) { 619 if (check) {
605 CommandClient.Client(info, PERMITTHOUGH); 620 CommandClient.Client(info, PERMITTHOUGH);
606 - logger.info("=============>>>>>>>>放行报文发送成功<<<<<<<<<=============="); 621 + log.info("=============>>>>>>>>放行报文发送成功<<<<<<<<<==============");
607 flag = true; 622 flag = true;
608 record(); 623 record();
609 } else { 624 } else {
610 CommandClient.Client(info, reason); 625 CommandClient.Client(info, reason);
611 - logger.info("=============>>>>>>>>重量异常报文发送成功<<<<<<<<<=============="); 626 + log.info("=============>>>>>>>>重量异常报文发送成功<<<<<<<<<==============");
612 } 627 }
613 commandlog(info,check,reason,land,list_infos); 628 commandlog(info,check,reason,land,list_infos);
614 return flag; 629 return flag;
@@ -672,10 +687,10 @@ public class GatherInfoHandle implements GatherInfoService { @@ -672,10 +687,10 @@ public class GatherInfoHandle implements GatherInfoService {
672 * @return 687 * @return
673 */ 688 */
674 private Map nmmsAllocate(@NotNull String waybill){ 689 private Map nmmsAllocate(@NotNull String waybill){
675 - logger.info("新舱单查询分拨申请数据开始"); 690 + log.info("新舱单查询分拨申请数据开始");
676 Feign_Allocate_Search feignAllocateSearch = new Feign_Allocate_Search(waybill,0,10); 691 Feign_Allocate_Search feignAllocateSearch = new Feign_Allocate_Search(waybill,0,10);
677 Map map = gatherInfoHandle.nmmsService.getAllocate(feignAllocateSearch); 692 Map map = gatherInfoHandle.nmmsService.getAllocate(feignAllocateSearch);
678 - logger.info(""+map); 693 + log.info(""+map);
679 return map; 694 return map;
680 } 695 }
681 696
@@ -693,7 +708,7 @@ public class GatherInfoHandle implements GatherInfoService { @@ -693,7 +708,7 @@ public class GatherInfoHandle implements GatherInfoService {
693 //中文逗号替换 708 //中文逗号替换
694 waybill = waybill.replace("，", ","); 709 waybill = waybill.replace("，", ",");
695 String[] maifest = waybill.split(","); 710 String[] maifest = waybill.split(",");
696 - logger.info("运单列表:" + waybill); 711 + log.info("运单列表:" + waybill);
697 boolean flag = false; 712 boolean flag = false;
698 713
699 for (String awb : maifest) { 714 for (String awb : maifest) {
@@ -706,18 +721,18 @@ public class GatherInfoHandle implements GatherInfoService { @@ -706,18 +721,18 @@ public class GatherInfoHandle implements GatherInfoService {
706 JSONObject awbinfo = ds.getJSONObject(0); 721 JSONObject awbinfo = ds.getJSONObject(0);
707 if (awbinfo.containsKey("RECEIPTINFORMATION")){ 722 if (awbinfo.containsKey("RECEIPTINFORMATION")){
708 if (awbinfo.getString("RECEIPTINFORMATION").contains("39301") || awbinfo.getString("RECEIPTINFORMATION").contains("39103")){ 723 if (awbinfo.getString("RECEIPTINFORMATION").contains("39301") || awbinfo.getString("RECEIPTINFORMATION").contains("39103")){
709 - logger.info("运单:{},分拨回执查询结果:{}",awb,awbinfo.getString("RECEIPTINFORMATION")); 724 + log.info("运单:{},分拨回执查询结果:{}",awb,awbinfo.getString("RECEIPTINFORMATION"));
710 }else { 725 }else {
711 - logger.info("运单{}分拨申请回执不正常:{}",awb,awbinfo.getString("RECEIPTINFORMATION")); 726 + log.info("运单{}分拨申请回执不正常:{}",awb,awbinfo.getString("RECEIPTINFORMATION"));
712 return false; 727 return false;
713 } 728 }
714 } 729 }
715 }else { 730 }else {
716 - logger.info("运单:{}分拨申请回执未查询到,或未进行分拨申请",awb); 731 + log.info("运单:{}分拨申请回执未查询到,或未进行分拨申请",awb);
717 return false; 732 return false;
718 } 733 }
719 }else{ 734 }else{
720 - logger.info("运单:{}分拨申请回执未查询到,或未进行分拨申请",awb); 735 + log.info("运单:{}分拨申请回执未查询到,或未进行分拨申请",awb);
721 return false; 736 return false;
722 } 737 }
723 738
@@ -6,7 +6,7 @@ import com.sy.service.GatherInfoService; @@ -6,7 +6,7 @@ import com.sy.service.GatherInfoService;
6 import org.springframework.beans.factory.annotation.Autowired; 6 import org.springframework.beans.factory.annotation.Autowired;
7 import org.springframework.stereotype.Service; 7 import org.springframework.stereotype.Service;
8 8
9 -@Service("GatherInfoService") 9 +@Service("GatherInfoServiceImpl")
10 public class GatherInfoServiceImpl implements GatherInfoService { 10 public class GatherInfoServiceImpl implements GatherInfoService {
11 11
12 @Autowired 12 @Autowired
@@ -7,9 +7,9 @@ import com.sy.model.GatherInfo; @@ -7,9 +7,9 @@ import com.sy.model.GatherInfo;
7 import com.sy.model.LandBusinessTypeList; 7 import com.sy.model.LandBusinessTypeList;
8 import com.sy.service.LandBusListService; 8 import com.sy.service.LandBusListService;
9 import com.sy.service.RedisService; 9 import com.sy.service.RedisService;
  10 +import lombok.extern.slf4j.Slf4j;
10 import org.apache.commons.lang.StringUtils; 11 import org.apache.commons.lang.StringUtils;
11 -import org.slf4j.Logger;  
12 -import org.slf4j.LoggerFactory; 12 +
13 import org.springframework.beans.factory.annotation.Autowired; 13 import org.springframework.beans.factory.annotation.Autowired;
14 import org.springframework.stereotype.Service; 14 import org.springframework.stereotype.Service;
15 15
@@ -17,9 +17,9 @@ import java.util.ArrayList; @@ -17,9 +17,9 @@ import java.util.ArrayList;
17 import java.util.List; 17 import java.util.List;
18 18
19 @Service 19 @Service
  20 +@Slf4j
20 public class LandBusListServiceImpl implements LandBusListService { 21 public class LandBusListServiceImpl implements LandBusListService {
21 22
22 - private static final Logger logger = LoggerFactory.getLogger(LandBusListServiceImpl.class);  
23 23
24 @Autowired 24 @Autowired
25 private LandBusinessTypeListMapper listMapper; 25 private LandBusinessTypeListMapper listMapper;
@@ -128,21 +128,29 @@ public class LandBusListServiceImpl implements LandBusListService { @@ -128,21 +128,29 @@ public class LandBusListServiceImpl implements LandBusListService {
128 list = JSONArray.parseArray(landBusinessJson,LandBusinessTypeList.class); 128 list = JSONArray.parseArray(landBusinessJson,LandBusinessTypeList.class);
129 //4. 若查询结果为null，返回无相对应进出场申请 129 //4. 若查询结果为null，返回无相对应进出场申请
130 if (list == null || list.isEmpty()) { 130 if (list == null || list.isEmpty()) {
131 - logger.error(gatherInfo.getVename()+"无相对应进出场申请"); 131 + log.error(gatherInfo.getVename()+"无相对应进出场申请");
132 return null; 132 return null;
133 } 133 }
134 134
135 for (LandBusinessTypeList item : list) { 135 for (LandBusinessTypeList item : list) {
136 136
137 - if (item.getAisle().equals(gatherInfo.getChnlno()) && item.getBarcode().equals(gatherInfo.getBarcode())){  
138 -  
139 - logger.info("车辆-{}的申请缓存信息核碰成功,通道:{}",gatherInfo.getVename(),gatherInfo.getChnlno()); 137 + /**
  138 + * 通道对碰有了.二维码不一致怎么办?
  139 + */
  140 + if (item.getAisle().equals(gatherInfo.getChnlno())){
  141 + if (item.getBarcode().equals(gatherInfo.getBarcode())){
  142 + log.info("车辆-{}的申请缓存信息核碰成功,通道:{}",gatherInfo.getVename(),gatherInfo.getChnlno());
140 return item; 143 return item;
  144 + }else {
  145 + log.error("[BARCODE-ERROR]:车辆-{}的申请缓存信息核碰失败,通道:{},二维码信息不一致",gatherInfo.getVename(),gatherInfo.getChnlno());
  146 + return null;
  147 + }
  148 +
141 } 149 }
142 } 150 }
143 }else { 151 }else {
144 - logger.error("未找到车辆-{}的申请缓存信息",gatherInfo.getVename());  
145 - logger.info("未找到车辆-{}的申请缓存信息,或者流转已超期失效",gatherInfo.getVename()); 152 + log.error("未找到车辆-{}的申请缓存信息",gatherInfo.getVename());
  153 + log.info("未找到车辆-{}的申请缓存信息,或者流转已超期失效",gatherInfo.getVename());
146 return null; 154 return null;
147 } 155 }
148 }catch (Exception e){ 156 }catch (Exception e){
@@ -2,8 +2,7 @@ package com.sy.service.impl; @@ -2,8 +2,7 @@ package com.sy.service.impl;
2 2
3 import com.sy.model.AdvanceArrive; 3 import com.sy.model.AdvanceArrive;
4 import com.sy.service.FeignService; 4 import com.sy.service.FeignService;
5 -import org.slf4j.Logger;  
6 -import org.slf4j.LoggerFactory; 5 +import lombok.extern.slf4j.Slf4j;
7 import org.springframework.stereotype.Service; 6 import org.springframework.stereotype.Service;
8 7
9 import java.util.Map; 8 import java.util.Map;
@@ -15,14 +14,14 @@ import java.util.Map; @@ -15,14 +14,14 @@ import java.util.Map;
15 * @email vokes0069@163.com 14 * @email vokes0069@163.com
16 */ 15 */
17 @Service 16 @Service
  17 +@Slf4j
18 public class MessageServiceHystrix implements FeignService { 18 public class MessageServiceHystrix implements FeignService {
19 19
20 - private static final Logger logger = LoggerFactory.getLogger(MessageServiceHystrix.class);  
21 20
22 21
23 @Override 22 @Override
24 public Map<String, Object> sendMessage(AdvanceArrive arrive) { 23 public Map<String, Object> sendMessage(AdvanceArrive arrive) {
25 - logger.info("发送数据成功",arrive); 24 + log.info("发送数据成功",arrive);
26 return null; 25 return null;
27 } 26 }
28 } 27 }
@@ -7,7 +7,7 @@ import com.sy.model.RESMESSAGE; @@ -7,7 +7,7 @@ import com.sy.model.RESMESSAGE;
7 import com.sy.service.CommandLogService; 7 import com.sy.service.CommandLogService;
8 import com.sy.service.ResMessageService; 8 import com.sy.service.ResMessageService;
9 import com.sy.socket.CommandClient; 9 import com.sy.socket.CommandClient;
10 -import org.apache.log4j.Logger; 10 +import lombok.extern.slf4j.Slf4j;
11 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
12 import org.springframework.stereotype.Service; 12 import org.springframework.stereotype.Service;
13 13
@@ -22,10 +22,11 @@ import java.util.stream.Collectors; @@ -22,10 +22,11 @@ import java.util.stream.Collectors;
22 * @time 2019-${MOUTH}-22 21:32 22 * @time 2019-${MOUTH}-22 21:32
23 */ 23 */
24 @Service 24 @Service
  25 +@Slf4j
25 public class ResMessageServiceImpl implements ResMessageService { 26 public class ResMessageServiceImpl implements ResMessageService {
26 - private static final Logger logger = Logger.getLogger(ResMessageServiceImpl.class);  
27 private static String FANGXING="-等运单未放行"; 27 private static String FANGXING="-等运单未放行";
28 private static String AWB_EMPTY="未申请装载运单"; 28 private static String AWB_EMPTY="未申请装载运单";
  29 +
29 @Autowired 30 @Autowired
30 private RESMESSAGEMapper mapper; 31 private RESMESSAGEMapper mapper;
31 32
@@ -65,7 +66,7 @@ public class ResMessageServiceImpl implements ResMessageService { @@ -65,7 +66,7 @@ public class ResMessageServiceImpl implements ResMessageService {
65 } 66 }
66 }).collect(Collectors.toList()); 67 }).collect(Collectors.toList());
67 68
68 - logger.info("运单列表:" + toStrArry(list_infos)); 69 + log.info("运单列表:" + toStrArry(list_infos));
69 boolean flag = false; 70 boolean flag = false;
70 71
71 /** 72 /**
@@ -89,7 +90,7 @@ public class ResMessageServiceImpl implements ResMessageService { @@ -89,7 +90,7 @@ public class ResMessageServiceImpl implements ResMessageService {
89 } 90 }
90 } 91 }
91 if (!noRelease.isEmpty()) { 92 if (!noRelease.isEmpty()) {
92 - logger.info(Arrays.toString(noRelease.toArray())+FANGXING); 93 + log.info(Arrays.toString(noRelease.toArray())+FANGXING);
93 commandLogService.commandlog(info,false,Arrays.toString(noRelease.toArray())+FANGXING,null,list_infos, 94 commandLogService.commandlog(info,false,Arrays.toString(noRelease.toArray())+FANGXING,null,list_infos,
94 new Double("0.0"),new Double("0.0"),new Double("0.0"),new Double("0.0")); 95 new Double("0.0"),new Double("0.0"),new Double("0.0"),new Double("0.0"));
95 CommandClient.Client(info, Arrays.toString(noRelease.toArray())+FANGXING); 96 CommandClient.Client(info, Arrays.toString(noRelease.toArray())+FANGXING);
@@ -97,6 +98,11 @@ public class ResMessageServiceImpl implements ResMessageService { @@ -97,6 +98,11 @@ public class ResMessageServiceImpl implements ResMessageService {
97 } 98 }
98 } 99 }
99 } 100 }
  101 + //todo:如果只拉集装器的判定
  102 + else{
  103 + log.info("[放行判定]:{}","集装器与散杂货放行");
  104 + return true;
  105 + }
100 106
101 107
102 return flag; 108 return flag;
1 package com.sy.service.impl; 1 package com.sy.service.impl;
2 2
3 -import com.sy.logic.LiftBar;  
4 import com.sy.service.WeightCheckHandleService; 3 import com.sy.service.WeightCheckHandleService;
5 import com.sy.utils.FileTool; 4 import com.sy.utils.FileTool;
6 -import org.slf4j.Logger;  
7 -import org.slf4j.LoggerFactory; 5 +import lombok.extern.slf4j.Slf4j;
8 import org.springframework.stereotype.Service; 6 import org.springframework.stereotype.Service;
9 7
10 import java.text.DecimalFormat; 8 import java.text.DecimalFormat;
11 import java.text.NumberFormat; 9 import java.text.NumberFormat;
12 import java.text.ParseException; 10 import java.text.ParseException;
13 11
  12 +@Slf4j
14 @Service 13 @Service
15 public class WeightCheckHandleServiceImpl implements WeightCheckHandleService { 14 public class WeightCheckHandleServiceImpl implements WeightCheckHandleService {
16 - private static final Logger logger = LoggerFactory.getLogger(LiftBar.class);  
17 15
18 //从配置文件中读取货物重差可控范围 16 //从配置文件中读取货物重差可控范围
19 private static String checkWt = FileTool.readProperties("grossWt"); 17 private static String checkWt = FileTool.readProperties("grossWt");
@@ -76,7 +74,7 @@ public class WeightCheckHandleServiceImpl implements WeightCheckHandleService { @@ -76,7 +74,7 @@ public class WeightCheckHandleServiceImpl implements WeightCheckHandleService {
76 74
77 result2 = Double.parseDouble(df.format(Math.abs((grossWt-wt)) / grossWt)); 75 result2 = Double.parseDouble(df.format(Math.abs((grossWt-wt)) / grossWt));
78 76
79 - logger.info("[WEIGHT-CHECK]-进出场比对差值:{},空车出场差值:{},进出场比对重量差:{},空车比对重量差:{}",result,result2,Math.abs(inWt - goodsWt - grossWt),Math.abs(grossWt-wt)); 77 + log.info("[WEIGHT-CHECK]-进出场比对差值:{},空车出场差值:{},进出场比对重量差:{},空车比对重量差:{}",result,result2,Math.abs(inWt - goodsWt - grossWt),Math.abs(grossWt-wt));
80 } 78 }
81 double range = valueDob(); 79 double range = valueDob();
82 if (result <= range || result2 <= range) { 80 if (result <= range || result2 <= range) {
@@ -122,8 +120,8 @@ public class WeightCheckHandleServiceImpl implements WeightCheckHandleService { @@ -122,8 +120,8 @@ public class WeightCheckHandleServiceImpl implements WeightCheckHandleService {
122 goodCheckResult = Double.parseDouble(df.format(Math.abs((grossWt-inWt-goodsWt)) / goodsWt)); 120 goodCheckResult = Double.parseDouble(df.format(Math.abs((grossWt-inWt-goodsWt)) / goodsWt));
123 } 121 }
124 double range = valueDob(); 122 double range = valueDob();
125 - logger.info("[WEIGHT-CHECK]-实际离场拉货重量:{},申请离场拉货重量:{},货重差值:{},货重误差:{}",grossWt-inWt,goodsWt,grossWt-inWt-goodsWt,goodCheckResult);  
126 - logger.info("[WEIGHT-CHECK]-进出场比对差值:{},提货离场差值:{},进出场比对重量差:{}",result,result1,Math.abs(inWt - grossWt)); 123 + log.info("[WEIGHT-CHECK]-实际离场拉货重量:{},申请离场拉货重量:{},货重差值:{},货重误差:{}",grossWt-inWt,goodsWt,grossWt-inWt-goodsWt,goodCheckResult);
  124 + log.info("[WEIGHT-CHECK]-进出场比对差值:{},提货离场差值:{},进出场比对重量差:{}",result,result1,Math.abs(inWt - grossWt));
127 125
128 126
129 if (result <= range || goodCheckResult<=range) { 127 if (result <= range || goodCheckResult<=range) {
@@ -228,8 +226,8 @@ public class WeightCheckHandleServiceImpl implements WeightCheckHandleService { @@ -228,8 +226,8 @@ public class WeightCheckHandleServiceImpl implements WeightCheckHandleService {
228 try { 226 try {
229 m = nf.parse(checkWt);//将百分数转换成Number类型 227 m = nf.parse(checkWt);//将百分数转换成Number类型
230 } catch (ParseException e) { 228 } catch (ParseException e) {
231 - logger.info("重量校验消息异常---"+e.toString());  
232 - logger.info(e.getMessage()); 229 + log.info("重量校验消息异常---"+e.toString());
  230 + log.info(e.getMessage());
233 } 231 }
234 return m.doubleValue(); 232 return m.doubleValue();
235 } 233 }
@@ -12,9 +12,8 @@ import com.sy.service.LandBusListService; @@ -12,9 +12,8 @@ import com.sy.service.LandBusListService;
12 import com.sy.service.RedisService; 12 import com.sy.service.RedisService;
13 import com.sy.service.impl.GatherInfoHandle; 13 import com.sy.service.impl.GatherInfoHandle;
14 import com.sy.socket.CommandClient; 14 import com.sy.socket.CommandClient;
  15 +import lombok.extern.slf4j.Slf4j;
15 import org.apache.commons.lang.StringUtils; 16 import org.apache.commons.lang.StringUtils;
16 -import org.slf4j.Logger;  
17 -import org.slf4j.LoggerFactory;  
18 import org.springframework.beans.factory.annotation.Autowired; 17 import org.springframework.beans.factory.annotation.Autowired;
19 import org.springframework.beans.factory.annotation.Value; 18 import org.springframework.beans.factory.annotation.Value;
20 import org.springframework.stereotype.Service; 19 import org.springframework.stereotype.Service;
@@ -22,9 +21,14 @@ import org.springframework.stereotype.Service; @@ -22,9 +21,14 @@ import org.springframework.stereotype.Service;
22 import javax.annotation.Resource; 21 import javax.annotation.Resource;
23 import java.util.List; 22 import java.util.List;
24 23
  24 +/**
  25 + * X21 车辆过卡信息与金二路由处理.
  26 + * todo: 直接从业务整表进行二维码判定是不是更合理?
  27 + *
  28 + */
  29 +@Slf4j
25 @Service("X21") 30 @Service("X21")
26 public class MessageRouterX21 implements MessageRouter { 31 public class MessageRouterX21 implements MessageRouter {
27 - private static final Logger logger = LoggerFactory.getLogger(MessageRouterX21.class);  
28 /** 32 /**
29 * 金二与本地认证兼容性开关 33 * 金二与本地认证兼容性开关
30 * Y 是金二业务必须走金二 34 * Y 是金二业务必须走金二
@@ -47,7 +51,7 @@ public class MessageRouterX21 implements MessageRouter { @@ -47,7 +51,7 @@ public class MessageRouterX21 implements MessageRouter {
47 51
48 @Override 52 @Override
49 public void route(Message message) { 53 public void route(Message message) {
50 - logger.info("处理X21:gatherInfo"); 54 + log.info("处理X21:gatherInfo");
51 GatherInfoAnalysis gatherInfoAnalysis = new GatherInfoAnalysis(); 55 GatherInfoAnalysis gatherInfoAnalysis = new GatherInfoAnalysis();
52 GatherInfo info = gatherInfoAnalysis.toJavaBean(message); 56 GatherInfo info = gatherInfoAnalysis.toJavaBean(message);
53 57
@@ -68,14 +72,20 @@ public class MessageRouterX21 implements MessageRouter { @@ -68,14 +72,20 @@ public class MessageRouterX21 implements MessageRouter {
68 */ 72 */
69 private void routerCheckG2(GatherInfo info){ 73 private void routerCheckG2(GatherInfo info){
70 /** 74 /**
71 - * 通过业务类型进行核对  
72 - * 1. 获取进出场申请信息,主要获取业务类型 75 + * X21通道信息与流转信息比对
  76 + * 1. 从缓存获取车辆进出场申请信息,有流转信息再进行通道对碰.
  77 + * 无流转信息则说明缓存失效或者二维码不对.
73 */ 78 */
74 LandBusinessTypeList landBusinessTypeList = landBusListService.getLandBusinessTypeListByGather(info); 79 LandBusinessTypeList landBusinessTypeList = landBusListService.getLandBusinessTypeListByGather(info);
75 if (landBusinessTypeList!=null){ 80 if (landBusinessTypeList!=null){
76 rightChnelCheck(landBusinessTypeList.getBusinesstype(),info); 81 rightChnelCheck(landBusinessTypeList.getBusinesstype(),info);
77 }else { 82 }else {
78 - 83 + /**
  84 + * 对应进出场申请数据
  85 + */
  86 + log.error("[G2]-X21与流转信息核碰失败,未有流转缓存或者二维码对碰不成功");
  87 + CommandClient.Client(info,"G2-未找到通道对应申报信息,或二维码信息不一致");
  88 + record(info,false,"G2-未找到通道对应申报信息",null);
79 } 89 }
80 90
81 91
@@ -110,7 +120,19 @@ public class MessageRouterX21 implements MessageRouter { @@ -110,7 +120,19 @@ public class MessageRouterX21 implements MessageRouter {
110 List<LandRouterConfig> routerConfigs = landRouterConfigDao.selectByBussType(businessType); 120 List<LandRouterConfig> routerConfigs = landRouterConfigDao.selectByBussType(businessType);
111 //有金二与业务类型绑定 121 //有金二与业务类型绑定
112 if (!routerConfigs.isEmpty()){ 122 if (!routerConfigs.isEmpty()){
  123 + /**
  124 + * 路由配置的卡口 是进出卡口都有 还是只有进或者出
  125 + * 根据X21过的通道类型(进卡口/出卡口)来判定,对应流转申报业务类型 的 进出卡口业务是否有金二通道配置
  126 + */
  127 + boolean anyMatch = routerConfigs.stream().anyMatch(router-> router.getChanelType().equals(info.getIetype()));
113 128
  129 + /**
  130 + * 有对应卡口进出类型的配置
  131 + * 继续判定
  132 + * 1 通道是否走对. 走对 将X21报文给金二,由三宝转成X81
  133 + * 2 没走对 返回 走错通道.业务结束.
  134 + */
  135 + if (anyMatch){
114 //是否走对通道的判定 136 //是否走对通道的判定
115 for (LandRouterConfig routerConfig : routerConfigs) { 137 for (LandRouterConfig routerConfig : routerConfigs) {
116 138
@@ -118,13 +140,14 @@ public class MessageRouterX21 implements MessageRouter { @@ -118,13 +140,14 @@ public class MessageRouterX21 implements MessageRouter {
118 /** 140 /**
119 * 查找到金二与通道的验放配置 141 * 查找到金二与通道的验放配置
120 */ 142 */
121 - 143 + log.info("[G2-ROUTER]-车辆[{}]流转为金二业务,转金二处理",info.getVename());
122 //缓存X21,用来接收海关的x82指令核对.收到X22指令后进行核销此缓存.走金二验放的才缓存 144 //缓存X21,用来接收海关的x82指令核对.收到X22指令后进行核销此缓存.走金二验放的才缓存
123 cacheWithSeqno(info); 145 cacheWithSeqno(info);
  146 + log.debug("[G2-ROUTER-CACHE]-车辆[{}]流转已缓存[SEQNO]:{}",info.getVename(),info.getSeqno());
124 //将X21报文发给三宝,让三宝发给金二 147 //将X21报文发给三宝,让三宝发给金二
125 sendToSample(info); 148 sendToSample(info);
126 record(info,true,"已转金二验放-[SEQN]:"+info.getSeqno(),null); 149 record(info,true,"已转金二验放-[SEQN]:"+info.getSeqno(),null);
127 - logger.info("[G2]>>为[金二业务],已将[{}]过卡信息发送与金二",info.getVename()); 150 + log.info("[G2]>>为[金二业务],已将[{}]过卡信息发送与金二",info.getVename());
128 return; 151 return;
129 } 152 }
130 } 153 }
@@ -134,14 +157,25 @@ public class MessageRouterX21 implements MessageRouter { @@ -134,14 +157,25 @@ public class MessageRouterX21 implements MessageRouter {
134 * 为提高抬杆效率 157 * 为提高抬杆效率
135 */ 158 */
136 //todo:走错通道的回执指令处理 159 //todo:走错通道的回执指令处理
  160 + log.info("走错通道");
  161 + CommandClient.Client(info,"G2-未找到通道对应申报信息,或二维码信息不一致");
137 record(info,false,"走错通道-[SEQN]:"+info.getSeqno(),null); 162 record(info,false,"走错通道-[SEQN]:"+info.getSeqno(),null);
138 - logger.info("走错通道");  
139 163
140 - }else { 164 + }
  165 + /**
  166 + * 有对应卡口进出类型的配置.
  167 + * 说明没有金二配置
  168 + * 走本地
  169 + */
  170 + else{
141 //没有金二配置,走本地 171 //没有金二配置,走本地
142 X21Local(info); 172 X21Local(info);
143 } 173 }
  174 + }else {
144 175
  176 + //没有金二配置,走本地
  177 + X21Local(info);
  178 + }
145 179
146 } 180 }
147 181
@@ -3,29 +3,23 @@ package com.sy.service.router; @@ -3,29 +3,23 @@ package com.sy.service.router;
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.sy.bwAnalysis.CommandInfoAnalysis; 4 import com.sy.bwAnalysis.CommandInfoAnalysis;
5 import com.sy.bwAssist.Message; 5 import com.sy.bwAssist.Message;
6 -import com.sy.mapper.LandRouterConfigDao;  
7 import com.sy.model.GatherInfo; 6 import com.sy.model.GatherInfo;
8 import com.sy.model.LandBusinessTypeList; 7 import com.sy.model.LandBusinessTypeList;
9 -import com.sy.model.LandRouterConfig;  
10 import com.sy.model.CommandInfoX22; 8 import com.sy.model.CommandInfoX22;
11 import com.sy.service.CommandLogService; 9 import com.sy.service.CommandLogService;
12 -import com.sy.service.LandBusListService;  
13 import com.sy.service.RedisService; 10 import com.sy.service.RedisService;
14 import com.sy.service.impl.GatherInfoHandle; 11 import com.sy.service.impl.GatherInfoHandle;
15 import com.sy.socket.CommandClient; 12 import com.sy.socket.CommandClient;
  13 +import lombok.extern.slf4j.Slf4j;
16 import org.apache.commons.lang.StringUtils; 14 import org.apache.commons.lang.StringUtils;
17 -import org.slf4j.Logger;  
18 -import org.slf4j.LoggerFactory;  
19 import org.springframework.beans.factory.annotation.Autowired; 15 import org.springframework.beans.factory.annotation.Autowired;
20 import org.springframework.beans.factory.annotation.Value; 16 import org.springframework.beans.factory.annotation.Value;
21 import org.springframework.stereotype.Service; 17 import org.springframework.stereotype.Service;
22 18
23 -import javax.annotation.Resource;  
24 -import java.util.List;  
25 19
26 @Service("X22") 20 @Service("X22")
  21 +@Slf4j
27 public class MessageRouterX22 implements MessageRouter { 22 public class MessageRouterX22 implements MessageRouter {
28 - private static final Logger logger = LoggerFactory.getLogger(MessageRouterX22.class);  
29 23
30 @Value("${g2.switch}") 24 @Value("${g2.switch}")
31 private boolean g2Switch; 25 private boolean g2Switch;
@@ -40,7 +34,8 @@ public class MessageRouterX22 implements MessageRouter { @@ -40,7 +34,8 @@ public class MessageRouterX22 implements MessageRouter {
40 /** 34 /**
41 * 放行的code标识 35 * 放行的code标识
42 */ 36 */
43 - private static String CODE_RELEASE = "00000000200000000000"; 37 + private static String CODE_RELEASE_I = "00000000200000000000";
  38 + private static String CODE_RELEASE_E = "00000000100000000000";
44 39
45 40
46 41
@@ -53,7 +48,7 @@ public class MessageRouterX22 implements MessageRouter { @@ -53,7 +48,7 @@ public class MessageRouterX22 implements MessageRouter {
53 @Override 48 @Override
54 public void route(Message message) { 49 public void route(Message message) {
55 try { 50 try {
56 - logger.info("处理X22:CommandInfo"); 51 + log.info("处理X22:CommandInfo");
57 CommandInfoAnalysis commandInfoAnalysis = new CommandInfoAnalysis(); 52 CommandInfoAnalysis commandInfoAnalysis = new CommandInfoAnalysis();
58 CommandInfoX22 commandInfoX22 = commandInfoAnalysis.toJavaBean(message); 53 CommandInfoX22 commandInfoX22 = commandInfoAnalysis.toJavaBean(message);
59 54
@@ -67,7 +62,7 @@ public class MessageRouterX22 implements MessageRouter { @@ -67,7 +62,7 @@ public class MessageRouterX22 implements MessageRouter {
67 /** 62 /**
68 * 1. 判断指令是否放行 63 * 1. 判断指令是否放行
69 */ 64 */
70 - if (commandInfoX22.getCheckResult().equals(CODE_RELEASE)) { 65 + if (commandInfoX22.getCheckResult().equals(CODE_RELEASE_I) || commandInfoX22.getCheckResult().equals(CODE_RELEASE_E)) {
71 /** 66 /**
72 * todo:第一种.收到G2指令直接放行.并记录过卡与流转申请的核销 67 * todo:第一种.收到G2指令直接放行.并记录过卡与流转申请的核销
73 */ 68 */
@@ -87,13 +82,14 @@ public class MessageRouterX22 implements MessageRouter { @@ -87,13 +82,14 @@ public class MessageRouterX22 implements MessageRouter {
87 */ 82 */
88 CommandClient.Client(gatherInfo,commandInfoX22.getOpHint()); 83 CommandClient.Client(gatherInfo,commandInfoX22.getOpHint());
89 record(gatherInfo,false,gatherInfo.getSeqno()+"金二验放失败:"+commandInfoX22.getOpHint(),null); 84 record(gatherInfo,false,gatherInfo.getSeqno()+"金二验放失败:"+commandInfoX22.getOpHint(),null);
90 -  
91 -  
92 } 85 }
93 } 86 }
  87 + else{
  88 + log.info("[X22-ERROR]:未找到对应的SEQNO:[{}]过卡缓存数据",commandInfoX22.getSeqNo());
  89 + }
94 } 90 }
95 }catch (Exception e){ 91 }catch (Exception e){
96 - logger.error("[X22-ERROR]:",e); 92 + log.error("[X22-ERROR]:",e);
97 } 93 }
98 } 94 }
99 95
@@ -139,7 +139,7 @@ public class CommandClient { @@ -139,7 +139,7 @@ public class CommandClient {
139 * */ 139 * */
140 private static String getXmlInfo(GatherInfo info,String message) { 140 private static String getXmlInfo(GatherInfo info,String message) {
141 String flag = null; 141 String flag = null;
142 - if ("直接放行".equals(message)){ 142 + if ("直接放行".equals(message) || "海关放行".equals(message)){
143 flag = "00"; 143 flag = "00";
144 } else{ 144 } else{
145 flag = "11"; 145 flag = "11";
@@ -3,6 +3,7 @@ package com.sy.task; @@ -3,6 +3,7 @@ package com.sy.task;
3 import com.sy.bwAnalysis.AnalysisRoute; 3 import com.sy.bwAnalysis.AnalysisRoute;
4 import com.sy.utils.XMLThreadPoolFactory; 4 import com.sy.utils.XMLThreadPoolFactory;
5 import com.tianbo.util.IO.FileTool; 5 import com.tianbo.util.IO.FileTool;
  6 +import lombok.extern.slf4j.Slf4j;
6 import org.apache.commons.io.FileUtils; 7 import org.apache.commons.io.FileUtils;
7 import org.springframework.beans.factory.annotation.Value; 8 import org.springframework.beans.factory.annotation.Value;
8 import org.springframework.scheduling.annotation.Scheduled; 9 import org.springframework.scheduling.annotation.Scheduled;
@@ -18,10 +19,9 @@ import java.util.concurrent.ThreadPoolExecutor; @@ -18,10 +19,9 @@ import java.util.concurrent.ThreadPoolExecutor;
18 /** 19 /**
19 * 回执解析定时任务 20 * 回执解析定时任务
20 */ 21 */
  22 +@Slf4j
21 @Component 23 @Component
22 -  
23 public class TaskAnalysis { 24 public class TaskAnalysis {
24 - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(TaskAnalysis.class);  
25 //回执读取目录 25 //回执读取目录
26 @Value("${custom.receptDirectory}") 26 @Value("${custom.receptDirectory}")
27 private String receptDir; 27 private String receptDir;
@@ -33,14 +33,16 @@ @@ -33,14 +33,16 @@
33 <result column="REMARK" jdbcType="VARCHAR" property="remark" /> 33 <result column="REMARK" jdbcType="VARCHAR" property="remark" />
34 <result column="REMARK1" jdbcType="VARCHAR" property="remark1" /> 34 <result column="REMARK1" jdbcType="VARCHAR" property="remark1" />
35 <result column="REMARK2" jdbcType="VARCHAR" property="remark2" /> 35 <result column="REMARK2" jdbcType="VARCHAR" property="remark2" />
  36 + <result column="REMARK3" jdbcType="VARCHAR" property="remark3" />
36 <result column="ISTHREE" jdbcType="VARCHAR" property="isthree" /> 37 <result column="ISTHREE" jdbcType="VARCHAR" property="isthree" />
  38 + <result column="VEPROPERTY" jdbcType="VARCHAR" property="veProperty" />
37 </resultMap> 39 </resultMap>
38 <sql id="Base_Column_List"> 40 <sql id="Base_Column_List">
39 id, MASSAGE_ID, TRAILER_FRAME_NO, TRAILER_LICENSE_NO, MASTER_LIST, PRODECT_TIME, 41 id, MASSAGE_ID, TRAILER_FRAME_NO, TRAILER_LICENSE_NO, MASTER_LIST, PRODECT_TIME,
40 IS_DELETE, AGENTNO, AGENTNAME, COCODE, DRIVERNAME, DRIVERID, STARTPORT, ENDPORT, 42 IS_DELETE, AGENTNO, AGENTNAME, COCODE, DRIVERNAME, DRIVERID, STARTPORT, ENDPORT,
41 STARTSATATION, ENDSTATION, AISLE, BUSINESSTYPE, TURNOVERFLAG, BARCODE, CONTRASTFLAG, 43 STARTSATATION, ENDSTATION, AISLE, BUSINESSTYPE, TURNOVERFLAG, BARCODE, CONTRASTFLAG,
42 CREATE_BY, CREATE_DATE, UPDATE_BY, UPDATE_DATE, ISVALID, AISLEWT, ISFULL, REMARK, 44 CREATE_BY, CREATE_DATE, UPDATE_BY, UPDATE_DATE, ISVALID, AISLEWT, ISFULL, REMARK,
43 - REMARK1, REMARK2,ISTHREE 45 + REMARK1, REMARK2,ISTHREE,VEPROPERTY
44 </sql> 46 </sql>
45 <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap"> 47 <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
46 select 48 select
@@ -135,7 +137,7 @@ @@ -135,7 +137,7 @@
135 CREATE_BY, CREATE_DATE, UPDATE_BY, 137 CREATE_BY, CREATE_DATE, UPDATE_BY,
136 UPDATE_DATE, ISVALID, AISLEWT, 138 UPDATE_DATE, ISVALID, AISLEWT,
137 ISFULL, REMARK, REMARK1, 139 ISFULL, REMARK, REMARK1,
138 - REMARK2) 140 + REMARK2,REMARK3,VEPROPERTY)
139 values (#{id,jdbcType=VARCHAR}, #{massageId,jdbcType=VARCHAR}, #{trailerFrameNo,jdbcType=VARCHAR}, 141 values (#{id,jdbcType=VARCHAR}, #{massageId,jdbcType=VARCHAR}, #{trailerFrameNo,jdbcType=VARCHAR},
140 #{trailerLicenseNo,jdbcType=VARCHAR}, #{masterList,jdbcType=VARCHAR}, #{prodectTime,jdbcType=TIMESTAMP}, 142 #{trailerLicenseNo,jdbcType=VARCHAR}, #{masterList,jdbcType=VARCHAR}, #{prodectTime,jdbcType=TIMESTAMP},
141 #{isDelete,jdbcType=VARCHAR}, #{agentno,jdbcType=VARCHAR}, #{agentname,jdbcType=VARCHAR}, 143 #{isDelete,jdbcType=VARCHAR}, #{agentno,jdbcType=VARCHAR}, #{agentname,jdbcType=VARCHAR},
@@ -146,7 +148,7 @@ @@ -146,7 +148,7 @@
146 #{createBy,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 148 #{createBy,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR},
147 #{updateDate,jdbcType=TIMESTAMP}, #{isvalid,jdbcType=VARCHAR}, #{aislewt,jdbcType=DOUBLE}, 149 #{updateDate,jdbcType=TIMESTAMP}, #{isvalid,jdbcType=VARCHAR}, #{aislewt,jdbcType=DOUBLE},
148 #{isfull,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{remark1,jdbcType=VARCHAR}, 150 #{isfull,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{remark1,jdbcType=VARCHAR},
149 - #{remark2,jdbcType=VARCHAR}) 151 + #{remark2,jdbcType=VARCHAR},#{remark3,jdbcType=VARCHAR},#{veProperty,jdbcType=VARCHAR})
150 </insert> 152 </insert>
151 <insert id="insertSelective" parameterType="com.sy.model.LandBusinessTypeList"> 153 <insert id="insertSelective" parameterType="com.sy.model.LandBusinessTypeList">
152 insert into land_businesstype_list 154 insert into land_businesstype_list
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.sy.mapper.LandListDao">
  4 + <resultMap id="BaseResultMap" type="com.sy.model.LandList">
  5 + <id column="id" jdbcType="VARCHAR" property="id" />
  6 + <result column="MASSAGE_ID" jdbcType="VARCHAR" property="massageId" />
  7 + <result column="TRAILER_FRAME_NO" jdbcType="VARCHAR" property="trailerFrameNo" />
  8 + <result column="TRAILER_LICENSE_NO" jdbcType="VARCHAR" property="trailerLicenseNo" />
  9 + <result column="MASTER_LIST" jdbcType="VARCHAR" property="masterList" />
  10 + <result column="PRODECT_TIME" jdbcType="TIMESTAMP" property="prodectTime" />
  11 + <result column="IS_DELETE" jdbcType="VARCHAR" property="isDelete" />
  12 + <result column="AGENTNO" jdbcType="VARCHAR" property="agentno" />
  13 + <result column="AGENTNAME" jdbcType="VARCHAR" property="agentname" />
  14 + <result column="COCODE" jdbcType="VARCHAR" property="cocode" />
  15 + <result column="DRIVERNAME" jdbcType="VARCHAR" property="drivername" />
  16 + <result column="DRIVERID" jdbcType="VARCHAR" property="driverid" />
  17 + <result column="STARTPORT" jdbcType="VARCHAR" property="startport" />
  18 + <result column="ENDPORT" jdbcType="VARCHAR" property="endport" />
  19 + <result column="STARTSATATION" jdbcType="VARCHAR" property="startsatation" />
  20 + <result column="ENDSTATION" jdbcType="VARCHAR" property="endstation" />
  21 + <result column="AISLE" jdbcType="VARCHAR" property="aisle" />
  22 + <result column="BUSINESSTYPE" jdbcType="VARCHAR" property="businesstype" />
  23 + <result column="TURNOVERFLAG" jdbcType="VARCHAR" property="turnoverflag" />
  24 + <result column="BARCODE" jdbcType="VARCHAR" property="barcode" />
  25 + <result column="CONTRASTFLAG" jdbcType="VARCHAR" property="contrastflag" />
  26 + <result column="CREATE_BY" jdbcType="VARCHAR" property="createBy" />
  27 + <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
  28 + <result column="UPDATE_BY" jdbcType="VARCHAR" property="updateBy" />
  29 + <result column="UPDATE_DATE" jdbcType="TIMESTAMP" property="updateDate" />
  30 + <result column="ISVALID" jdbcType="VARCHAR" property="isvalid" />
  31 + <result column="AISLEWT" jdbcType="DOUBLE" property="aislewt" />
  32 + <result column="ISFULL" jdbcType="VARCHAR" property="isfull" />
  33 + <result column="REMARK" jdbcType="VARCHAR" property="remark" />
  34 + <result column="REMARK1" jdbcType="VARCHAR" property="remark1" />
  35 + <result column="REMARK2" jdbcType="VARCHAR" property="remark2" />
  36 + <result column="REMARK3" jdbcType="VARCHAR" property="remark3" />
  37 + <result column="ISTHREE" jdbcType="VARCHAR" property="isthree" />
  38 + <result column="VEPROPERTY" jdbcType="VARCHAR" property="veproperty" />
  39 + <result column="MEDIUMTYPE" jdbcType="VARCHAR" property="mediumtype" />
  40 + <result column="SEQN" jdbcType="VARCHAR" property="seqn" />
  41 + <result column="TRAINSCONFIRMATION_NUMBER" jdbcType="VARCHAR" property="trainsconfirmationNumber" />
  42 + <result column="APPLICATION_STATUS" jdbcType="VARCHAR" property="applicationStatus" />
  43 + <result column="ENTERPRISE_CREDIT_CODE" jdbcType="VARCHAR" property="enterpriseCreditCode" />
  44 + <result column="ORGANIZATION_CODE" jdbcType="VARCHAR" property="organizationCode" />
  45 + <result column="DECLARE_PERSONNEL_NUMBERS" jdbcType="VARCHAR" property="declarePersonnelNumbers" />
  46 + <result column="MODE_TRANSPORTATION" jdbcType="VARCHAR" property="modeTransportation" />
  47 + </resultMap>
  48 + <sql id="Base_Column_List">
  49 + id, MASSAGE_ID, TRAILER_FRAME_NO, TRAILER_LICENSE_NO, MASTER_LIST, PRODECT_TIME,
  50 + IS_DELETE, AGENTNO, AGENTNAME, COCODE, DRIVERNAME, DRIVERID, STARTPORT, ENDPORT,
  51 + STARTSATATION, ENDSTATION, AISLE, BUSINESSTYPE, TURNOVERFLAG, BARCODE, CONTRASTFLAG,
  52 + CREATE_BY, CREATE_DATE, UPDATE_BY, UPDATE_DATE, ISVALID, AISLEWT, ISFULL, REMARK,
  53 + REMARK1, REMARK2, REMARK3, ISTHREE, VEPROPERTY, MEDIUMTYPE, SEQN, TRAINSCONFIRMATION_NUMBER,
  54 + APPLICATION_STATUS, ENTERPRISE_CREDIT_CODE, ORGANIZATION_CODE, DECLARE_PERSONNEL_NUMBERS,
  55 + MODE_TRANSPORTATION
  56 + </sql>
  57 + <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
  58 + select
  59 + <include refid="Base_Column_List" />
  60 + from land_list
  61 + where id = #{id,jdbcType=VARCHAR}
  62 + </select>
  63 + <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
  64 + delete from land_list
  65 + where id = #{id,jdbcType=VARCHAR}
  66 + </delete>
  67 + <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.sy.model.LandList" useGeneratedKeys="true">
  68 + insert into land_list (MASSAGE_ID, TRAILER_FRAME_NO, TRAILER_LICENSE_NO,
  69 + MASTER_LIST, PRODECT_TIME, IS_DELETE,
  70 + AGENTNO, AGENTNAME, COCODE,
  71 + DRIVERNAME, DRIVERID, STARTPORT,
  72 + ENDPORT, STARTSATATION, ENDSTATION,
  73 + AISLE, BUSINESSTYPE, TURNOVERFLAG,
  74 + BARCODE, CONTRASTFLAG, CREATE_BY,
  75 + CREATE_DATE, UPDATE_BY, UPDATE_DATE,
  76 + ISVALID, AISLEWT, ISFULL,
  77 + REMARK, REMARK1, REMARK2,
  78 + REMARK3, ISTHREE, VEPROPERTY,
  79 + MEDIUMTYPE, SEQN, TRAINSCONFIRMATION_NUMBER,
  80 + APPLICATION_STATUS, ENTERPRISE_CREDIT_CODE,
  81 + ORGANIZATION_CODE, DECLARE_PERSONNEL_NUMBERS,
  82 + MODE_TRANSPORTATION)
  83 + values (#{massageId,jdbcType=VARCHAR}, #{trailerFrameNo,jdbcType=VARCHAR}, #{trailerLicenseNo,jdbcType=VARCHAR},
  84 + #{masterList,jdbcType=VARCHAR}, #{prodectTime,jdbcType=TIMESTAMP}, #{isDelete,jdbcType=VARCHAR},
  85 + #{agentno,jdbcType=VARCHAR}, #{agentname,jdbcType=VARCHAR}, #{cocode,jdbcType=VARCHAR},
  86 + #{drivername,jdbcType=VARCHAR}, #{driverid,jdbcType=VARCHAR}, #{startport,jdbcType=VARCHAR},
  87 + #{endport,jdbcType=VARCHAR}, #{startsatation,jdbcType=VARCHAR}, #{endstation,jdbcType=VARCHAR},
  88 + #{aisle,jdbcType=VARCHAR}, #{businesstype,jdbcType=VARCHAR}, #{turnoverflag,jdbcType=VARCHAR},
  89 + #{barcode,jdbcType=VARCHAR}, #{contrastflag,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR},
  90 + #{createDate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateDate,jdbcType=TIMESTAMP},
  91 + #{isvalid,jdbcType=VARCHAR}, #{aislewt,jdbcType=DOUBLE}, #{isfull,jdbcType=VARCHAR},
  92 + #{remark,jdbcType=VARCHAR}, #{remark1,jdbcType=VARCHAR}, #{remark2,jdbcType=VARCHAR},
  93 + #{remark3,jdbcType=VARCHAR}, #{isthree,jdbcType=VARCHAR}, #{veproperty,jdbcType=VARCHAR},
  94 + #{mediumtype,jdbcType=VARCHAR}, #{seqn,jdbcType=VARCHAR}, #{trainsconfirmationNumber,jdbcType=VARCHAR},
  95 + #{applicationStatus,jdbcType=VARCHAR}, #{enterpriseCreditCode,jdbcType=VARCHAR},
  96 + #{organizationCode,jdbcType=VARCHAR}, #{declarePersonnelNumbers,jdbcType=VARCHAR},
  97 + #{modeTransportation,jdbcType=VARCHAR})
  98 + </insert>
  99 + <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.sy.model.LandList" useGeneratedKeys="true">
  100 + insert into land_list
  101 + <trim prefix="(" suffix=")" suffixOverrides=",">
  102 + <if test="massageId != null">
  103 + MASSAGE_ID,
  104 + </if>
  105 + <if test="trailerFrameNo != null">
  106 + TRAILER_FRAME_NO,
  107 + </if>
  108 + <if test="trailerLicenseNo != null">
  109 + TRAILER_LICENSE_NO,
  110 + </if>
  111 + <if test="masterList != null">
  112 + MASTER_LIST,
  113 + </if>
  114 + <if test="prodectTime != null">
  115 + PRODECT_TIME,
  116 + </if>
  117 + <if test="isDelete != null">
  118 + IS_DELETE,
  119 + </if>
  120 + <if test="agentno != null">
  121 + AGENTNO,
  122 + </if>
  123 + <if test="agentname != null">
  124 + AGENTNAME,
  125 + </if>
  126 + <if test="cocode != null">
  127 + COCODE,
  128 + </if>
  129 + <if test="drivername != null">
  130 + DRIVERNAME,
  131 + </if>
  132 + <if test="driverid != null">
  133 + DRIVERID,
  134 + </if>
  135 + <if test="startport != null">
  136 + STARTPORT,
  137 + </if>
  138 + <if test="endport != null">
  139 + ENDPORT,
  140 + </if>
  141 + <if test="startsatation != null">
  142 + STARTSATATION,
  143 + </if>
  144 + <if test="endstation != null">
  145 + ENDSTATION,
  146 + </if>
  147 + <if test="aisle != null">
  148 + AISLE,
  149 + </if>
  150 + <if test="businesstype != null">
  151 + BUSINESSTYPE,
  152 + </if>
  153 + <if test="turnoverflag != null">
  154 + TURNOVERFLAG,
  155 + </if>
  156 + <if test="barcode != null">
  157 + BARCODE,
  158 + </if>
  159 + <if test="contrastflag != null">
  160 + CONTRASTFLAG,
  161 + </if>
  162 + <if test="createBy != null">
  163 + CREATE_BY,
  164 + </if>
  165 + <if test="createDate != null">
  166 + CREATE_DATE,
  167 + </if>
  168 + <if test="updateBy != null">
  169 + UPDATE_BY,
  170 + </if>
  171 + <if test="updateDate != null">
  172 + UPDATE_DATE,
  173 + </if>
  174 + <if test="isvalid != null">
  175 + ISVALID,
  176 + </if>
  177 + <if test="aislewt != null">
  178 + AISLEWT,
  179 + </if>
  180 + <if test="isfull != null">
  181 + ISFULL,
  182 + </if>
  183 + <if test="remark != null">
  184 + REMARK,
  185 + </if>
  186 + <if test="remark1 != null">
  187 + REMARK1,
  188 + </if>
  189 + <if test="remark2 != null">
  190 + REMARK2,
  191 + </if>
  192 + <if test="remark3 != null">
  193 + REMARK3,
  194 + </if>
  195 + <if test="isthree != null">
  196 + ISTHREE,
  197 + </if>
  198 + <if test="veproperty != null">
  199 + VEPROPERTY,
  200 + </if>
  201 + <if test="mediumtype != null">
  202 + MEDIUMTYPE,
  203 + </if>
  204 + <if test="seqn != null">
  205 + SEQN,
  206 + </if>
  207 + <if test="trainsconfirmationNumber != null">
  208 + TRAINSCONFIRMATION_NUMBER,
  209 + </if>
  210 + <if test="applicationStatus != null">
  211 + APPLICATION_STATUS,
  212 + </if>
  213 + <if test="enterpriseCreditCode != null">
  214 + ENTERPRISE_CREDIT_CODE,
  215 + </if>
  216 + <if test="organizationCode != null">
  217 + ORGANIZATION_CODE,
  218 + </if>
  219 + <if test="declarePersonnelNumbers != null">
  220 + DECLARE_PERSONNEL_NUMBERS,
  221 + </if>
  222 + <if test="modeTransportation != null">
  223 + MODE_TRANSPORTATION,
  224 + </if>
  225 + </trim>
  226 + <trim prefix="values (" suffix=")" suffixOverrides=",">
  227 + <if test="massageId != null">
  228 + #{massageId,jdbcType=VARCHAR},
  229 + </if>
  230 + <if test="trailerFrameNo != null">
  231 + #{trailerFrameNo,jdbcType=VARCHAR},
  232 + </if>
  233 + <if test="trailerLicenseNo != null">
  234 + #{trailerLicenseNo,jdbcType=VARCHAR},
  235 + </if>
  236 + <if test="masterList != null">
  237 + #{masterList,jdbcType=VARCHAR},
  238 + </if>
  239 + <if test="prodectTime != null">
  240 + #{prodectTime,jdbcType=TIMESTAMP},
  241 + </if>
  242 + <if test="isDelete != null">
  243 + #{isDelete,jdbcType=VARCHAR},
  244 + </if>
  245 + <if test="agentno != null">
  246 + #{agentno,jdbcType=VARCHAR},
  247 + </if>
  248 + <if test="agentname != null">
  249 + #{agentname,jdbcType=VARCHAR},
  250 + </if>
  251 + <if test="cocode != null">
  252 + #{cocode,jdbcType=VARCHAR},
  253 + </if>
  254 + <if test="drivername != null">
  255 + #{drivername,jdbcType=VARCHAR},
  256 + </if>
  257 + <if test="driverid != null">
  258 + #{driverid,jdbcType=VARCHAR},
  259 + </if>
  260 + <if test="startport != null">
  261 + #{startport,jdbcType=VARCHAR},
  262 + </if>
  263 + <if test="endport != null">
  264 + #{endport,jdbcType=VARCHAR},
  265 + </if>
  266 + <if test="startsatation != null">
  267 + #{startsatation,jdbcType=VARCHAR},
  268 + </if>
  269 + <if test="endstation != null">
  270 + #{endstation,jdbcType=VARCHAR},
  271 + </if>
  272 + <if test="aisle != null">
  273 + #{aisle,jdbcType=VARCHAR},
  274 + </if>
  275 + <if test="businesstype != null">
  276 + #{businesstype,jdbcType=VARCHAR},
  277 + </if>
  278 + <if test="turnoverflag != null">
  279 + #{turnoverflag,jdbcType=VARCHAR},
  280 + </if>
  281 + <if test="barcode != null">
  282 + #{barcode,jdbcType=VARCHAR},
  283 + </if>
  284 + <if test="contrastflag != null">
  285 + #{contrastflag,jdbcType=VARCHAR},
  286 + </if>
  287 + <if test="createBy != null">
  288 + #{createBy,jdbcType=VARCHAR},
  289 + </if>
  290 + <if test="createDate != null">
  291 + #{createDate,jdbcType=TIMESTAMP},
  292 + </if>
  293 + <if test="updateBy != null">
  294 + #{updateBy,jdbcType=VARCHAR},
  295 + </if>
  296 + <if test="updateDate != null">
  297 + #{updateDate,jdbcType=TIMESTAMP},
  298 + </if>
  299 + <if test="isvalid != null">
  300 + #{isvalid,jdbcType=VARCHAR},
  301 + </if>
  302 + <if test="aislewt != null">
  303 + #{aislewt,jdbcType=DOUBLE},
  304 + </if>
  305 + <if test="isfull != null">
  306 + #{isfull,jdbcType=VARCHAR},
  307 + </if>
  308 + <if test="remark != null">
  309 + #{remark,jdbcType=VARCHAR},
  310 + </if>
  311 + <if test="remark1 != null">
  312 + #{remark1,jdbcType=VARCHAR},
  313 + </if>
  314 + <if test="remark2 != null">
  315 + #{remark2,jdbcType=VARCHAR},
  316 + </if>
  317 + <if test="remark3 != null">
  318 + #{remark3,jdbcType=VARCHAR},
  319 + </if>
  320 + <if test="isthree != null">
  321 + #{isthree,jdbcType=VARCHAR},
  322 + </if>
  323 + <if test="veproperty != null">
  324 + #{veproperty,jdbcType=VARCHAR},
  325 + </if>
  326 + <if test="mediumtype != null">
  327 + #{mediumtype,jdbcType=VARCHAR},
  328 + </if>
  329 + <if test="seqn != null">
  330 + #{seqn,jdbcType=VARCHAR},
  331 + </if>
  332 + <if test="trainsconfirmationNumber != null">
  333 + #{trainsconfirmationNumber,jdbcType=VARCHAR},
  334 + </if>
  335 + <if test="applicationStatus != null">
  336 + #{applicationStatus,jdbcType=VARCHAR},
  337 + </if>
  338 + <if test="enterpriseCreditCode != null">
  339 + #{enterpriseCreditCode,jdbcType=VARCHAR},
  340 + </if>
  341 + <if test="organizationCode != null">
  342 + #{organizationCode,jdbcType=VARCHAR},
  343 + </if>
  344 + <if test="declarePersonnelNumbers != null">
  345 + #{declarePersonnelNumbers,jdbcType=VARCHAR},
  346 + </if>
  347 + <if test="modeTransportation != null">
  348 + #{modeTransportation,jdbcType=VARCHAR},
  349 + </if>
  350 + </trim>
  351 + </insert>
  352 + <update id="updateByPrimaryKeySelective" parameterType="com.sy.model.LandList">
  353 + update land_list
  354 + <set>
  355 + <if test="massageId != null">
  356 + MASSAGE_ID = #{massageId,jdbcType=VARCHAR},
  357 + </if>
  358 + <if test="trailerFrameNo != null">
  359 + TRAILER_FRAME_NO = #{trailerFrameNo,jdbcType=VARCHAR},
  360 + </if>
  361 + <if test="trailerLicenseNo != null">
  362 + TRAILER_LICENSE_NO = #{trailerLicenseNo,jdbcType=VARCHAR},
  363 + </if>
  364 + <if test="masterList != null">
  365 + MASTER_LIST = #{masterList,jdbcType=VARCHAR},
  366 + </if>
  367 + <if test="prodectTime != null">
  368 + PRODECT_TIME = #{prodectTime,jdbcType=TIMESTAMP},
  369 + </if>
  370 + <if test="isDelete != null">
  371 + IS_DELETE = #{isDelete,jdbcType=VARCHAR},
  372 + </if>
  373 + <if test="agentno != null">
  374 + AGENTNO = #{agentno,jdbcType=VARCHAR},
  375 + </if>
  376 + <if test="agentname != null">
  377 + AGENTNAME = #{agentname,jdbcType=VARCHAR},
  378 + </if>
  379 + <if test="cocode != null">
  380 + COCODE = #{cocode,jdbcType=VARCHAR},
  381 + </if>
  382 + <if test="drivername != null">
  383 + DRIVERNAME = #{drivername,jdbcType=VARCHAR},
  384 + </if>
  385 + <if test="driverid != null">
  386 + DRIVERID = #{driverid,jdbcType=VARCHAR},
  387 + </if>
  388 + <if test="startport != null">
  389 + STARTPORT = #{startport,jdbcType=VARCHAR},
  390 + </if>
  391 + <if test="endport != null">
  392 + ENDPORT = #{endport,jdbcType=VARCHAR},
  393 + </if>
  394 + <if test="startsatation != null">
  395 + STARTSATATION = #{startsatation,jdbcType=VARCHAR},
  396 + </if>
  397 + <if test="endstation != null">
  398 + ENDSTATION = #{endstation,jdbcType=VARCHAR},
  399 + </if>
  400 + <if test="aisle != null">
  401 + AISLE = #{aisle,jdbcType=VARCHAR},
  402 + </if>
  403 + <if test="businesstype != null">
  404 + BUSINESSTYPE = #{businesstype,jdbcType=VARCHAR},
  405 + </if>
  406 + <if test="turnoverflag != null">
  407 + TURNOVERFLAG = #{turnoverflag,jdbcType=VARCHAR},
  408 + </if>
  409 + <if test="barcode != null">
  410 + BARCODE = #{barcode,jdbcType=VARCHAR},
  411 + </if>
  412 + <if test="contrastflag != null">
  413 + CONTRASTFLAG = #{contrastflag,jdbcType=VARCHAR},
  414 + </if>
  415 + <if test="createBy != null">
  416 + CREATE_BY = #{createBy,jdbcType=VARCHAR},
  417 + </if>
  418 + <if test="createDate != null">
  419 + CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
  420 + </if>
  421 + <if test="updateBy != null">
  422 + UPDATE_BY = #{updateBy,jdbcType=VARCHAR},
  423 + </if>
  424 + <if test="updateDate != null">
  425 + UPDATE_DATE = #{updateDate,jdbcType=TIMESTAMP},
  426 + </if>
  427 + <if test="isvalid != null">
  428 + ISVALID = #{isvalid,jdbcType=VARCHAR},
  429 + </if>
  430 + <if test="aislewt != null">
  431 + AISLEWT = #{aislewt,jdbcType=DOUBLE},
  432 + </if>
  433 + <if test="isfull != null">
  434 + ISFULL = #{isfull,jdbcType=VARCHAR},
  435 + </if>
  436 + <if test="remark != null">
  437 + REMARK = #{remark,jdbcType=VARCHAR},
  438 + </if>
  439 + <if test="remark1 != null">
  440 + REMARK1 = #{remark1,jdbcType=VARCHAR},
  441 + </if>
  442 + <if test="remark2 != null">
  443 + REMARK2 = #{remark2,jdbcType=VARCHAR},
  444 + </if>
  445 + <if test="remark3 != null">
  446 + REMARK3 = #{remark3,jdbcType=VARCHAR},
  447 + </if>
  448 + <if test="isthree != null">
  449 + ISTHREE = #{isthree,jdbcType=VARCHAR},
  450 + </if>
  451 + <if test="veproperty != null">
  452 + VEPROPERTY = #{veproperty,jdbcType=VARCHAR},
  453 + </if>
  454 + <if test="mediumtype != null">
  455 + MEDIUMTYPE = #{mediumtype,jdbcType=VARCHAR},
  456 + </if>
  457 + <if test="seqn != null">
  458 + SEQN = #{seqn,jdbcType=VARCHAR},
  459 + </if>
  460 + <if test="trainsconfirmationNumber != null">
  461 + TRAINSCONFIRMATION_NUMBER = #{trainsconfirmationNumber,jdbcType=VARCHAR},
  462 + </if>
  463 + <if test="applicationStatus != null">
  464 + APPLICATION_STATUS = #{applicationStatus,jdbcType=VARCHAR},
  465 + </if>
  466 + <if test="enterpriseCreditCode != null">
  467 + ENTERPRISE_CREDIT_CODE = #{enterpriseCreditCode,jdbcType=VARCHAR},
  468 + </if>
  469 + <if test="organizationCode != null">
  470 + ORGANIZATION_CODE = #{organizationCode,jdbcType=VARCHAR},
  471 + </if>
  472 + <if test="declarePersonnelNumbers != null">
  473 + DECLARE_PERSONNEL_NUMBERS = #{declarePersonnelNumbers,jdbcType=VARCHAR},
  474 + </if>
  475 + <if test="modeTransportation != null">
  476 + MODE_TRANSPORTATION = #{modeTransportation,jdbcType=VARCHAR},
  477 + </if>
  478 + </set>
  479 + where id = #{id,jdbcType=VARCHAR}
  480 + </update>
  481 + <update id="updateByPrimaryKey" parameterType="com.sy.model.LandList">
  482 + update land_list
  483 + set MASSAGE_ID = #{massageId,jdbcType=VARCHAR},
  484 + TRAILER_FRAME_NO = #{trailerFrameNo,jdbcType=VARCHAR},
  485 + TRAILER_LICENSE_NO = #{trailerLicenseNo,jdbcType=VARCHAR},
  486 + MASTER_LIST = #{masterList,jdbcType=VARCHAR},
  487 + PRODECT_TIME = #{prodectTime,jdbcType=TIMESTAMP},
  488 + IS_DELETE = #{isDelete,jdbcType=VARCHAR},
  489 + AGENTNO = #{agentno,jdbcType=VARCHAR},
  490 + AGENTNAME = #{agentname,jdbcType=VARCHAR},
  491 + COCODE = #{cocode,jdbcType=VARCHAR},
  492 + DRIVERNAME = #{drivername,jdbcType=VARCHAR},
  493 + DRIVERID = #{driverid,jdbcType=VARCHAR},
  494 + STARTPORT = #{startport,jdbcType=VARCHAR},
  495 + ENDPORT = #{endport,jdbcType=VARCHAR},
  496 + STARTSATATION = #{startsatation,jdbcType=VARCHAR},
  497 + ENDSTATION = #{endstation,jdbcType=VARCHAR},
  498 + AISLE = #{aisle,jdbcType=VARCHAR},
  499 + BUSINESSTYPE = #{businesstype,jdbcType=VARCHAR},
  500 + TURNOVERFLAG = #{turnoverflag,jdbcType=VARCHAR},
  501 + BARCODE = #{barcode,jdbcType=VARCHAR},
  502 + CONTRASTFLAG = #{contrastflag,jdbcType=VARCHAR},
  503 + CREATE_BY = #{createBy,jdbcType=VARCHAR},
  504 + CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
  505 + UPDATE_BY = #{updateBy,jdbcType=VARCHAR},
  506 + UPDATE_DATE = #{updateDate,jdbcType=TIMESTAMP},
  507 + ISVALID = #{isvalid,jdbcType=VARCHAR},
  508 + AISLEWT = #{aislewt,jdbcType=DOUBLE},
  509 + ISFULL = #{isfull,jdbcType=VARCHAR},
  510 + REMARK = #{remark,jdbcType=VARCHAR},
  511 + REMARK1 = #{remark1,jdbcType=VARCHAR},
  512 + REMARK2 = #{remark2,jdbcType=VARCHAR},
  513 + REMARK3 = #{remark3,jdbcType=VARCHAR},
  514 + ISTHREE = #{isthree,jdbcType=VARCHAR},
  515 + VEPROPERTY = #{veproperty,jdbcType=VARCHAR},
  516 + MEDIUMTYPE = #{mediumtype,jdbcType=VARCHAR},
  517 + SEQN = #{seqn,jdbcType=VARCHAR},
  518 + TRAINSCONFIRMATION_NUMBER = #{trainsconfirmationNumber,jdbcType=VARCHAR},
  519 + APPLICATION_STATUS = #{applicationStatus,jdbcType=VARCHAR},
  520 + ENTERPRISE_CREDIT_CODE = #{enterpriseCreditCode,jdbcType=VARCHAR},
  521 + ORGANIZATION_CODE = #{organizationCode,jdbcType=VARCHAR},
  522 + DECLARE_PERSONNEL_NUMBERS = #{declarePersonnelNumbers,jdbcType=VARCHAR},
  523 + MODE_TRANSPORTATION = #{modeTransportation,jdbcType=VARCHAR}
  524 + where id = #{id,jdbcType=VARCHAR}
  525 + </update>
  526 +
  527 + <update id="releaseBarcode" parameterType="java.lang.String">
  528 + update land_list
  529 + set
  530 + ISVALID = '1'
  531 + where BARCODE = #{barcode,jdbcType=VARCHAR}
  532 + </update>
  533 +</mapper>
@@ -10,13 +10,14 @@ @@ -10,13 +10,14 @@
10 <result column="chanel_type" jdbcType="VARCHAR" property="chanelType" /> 10 <result column="chanel_type" jdbcType="VARCHAR" property="chanelType" />
11 <result column="business_type" jdbcType="VARCHAR" property="businessType" /> 11 <result column="business_type" jdbcType="VARCHAR" property="businessType" />
12 <result column="g2_business_type" jdbcType="VARCHAR" property="g2BusinessType" /> 12 <result column="g2_business_type" jdbcType="VARCHAR" property="g2BusinessType" />
  13 + <result column="ie_type" jdbcType="VARCHAR" property="ieType" />
13 <result column="identify_type" jdbcType="VARCHAR" property="identifyType" /> 14 <result column="identify_type" jdbcType="VARCHAR" property="identifyType" />
14 <result column="gather_receiver" jdbcType="VARCHAR" property="gatherReceiver" /> 15 <result column="gather_receiver" jdbcType="VARCHAR" property="gatherReceiver" />
15 <result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> 16 <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
16 <result column="status" jdbcType="VARCHAR" property="status" /> 17 <result column="status" jdbcType="VARCHAR" property="status" />
17 </resultMap> 18 </resultMap>
18 <sql id="Base_Column_List"> 19 <sql id="Base_Column_List">
19 - id, area_id, area_name, chanel_id, chanel_name, chanel_type, business_type, g2_business_type, 20 + id, area_id, area_name, chanel_id, chanel_name, chanel_type, business_type, g2_business_type,ie_type
20 identify_type, gather_receiver, create_time, `status` 21 identify_type, gather_receiver, create_time, `status`
21 </sql> 22 </sql>
22 <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap"> 23 <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -3,6 +3,7 @@ package com.sy; @@ -3,6 +3,7 @@ package com.sy;
3 import com.sy.bwAnalysis.AnalysisRoute; 3 import com.sy.bwAnalysis.AnalysisRoute;
4 import com.sy.logic.LiftBar; 4 import com.sy.logic.LiftBar;
5 import com.sy.utils.XMLThreadPoolFactory; 5 import com.sy.utils.XMLThreadPoolFactory;
  6 +import lombok.extern.slf4j.Slf4j;
6 import org.junit.Test; 7 import org.junit.Test;
7 import org.junit.runner.RunWith; 8 import org.junit.runner.RunWith;
8 import org.springframework.boot.test.context.SpringBootTest; 9 import org.springframework.boot.test.context.SpringBootTest;
@@ -12,10 +13,9 @@ import java.util.concurrent.ThreadPoolExecutor; @@ -12,10 +13,9 @@ import java.util.concurrent.ThreadPoolExecutor;
12 13
13 @RunWith(SpringRunner.class) 14 @RunWith(SpringRunner.class)
14 @SpringBootTest 15 @SpringBootTest
  16 +@Slf4j
15 public class BeihuoAllocateTests { 17 public class BeihuoAllocateTests {
16 18
17 - private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(LiftBar.class);  
18 -  
19 private static ThreadPoolExecutor threadPoolEs = XMLThreadPoolFactory.instance("kakou"); 19 private static ThreadPoolExecutor threadPoolEs = XMLThreadPoolFactory.instance("kakou");
20 private AnalysisRoute analysisRoute=new AnalysisRoute(); 20 private AnalysisRoute analysisRoute=new AnalysisRoute();
21 21
@@ -110,7 +110,7 @@ public class BeihuoAllocateTests { @@ -110,7 +110,7 @@ public class BeihuoAllocateTests {
110 //二维码 110 //二维码
111 String barcode = "9cc260"; 111 String barcode = "9cc260";
112 112
113 - logger.error("开始分拨业务进场测试1"); 113 + log.error("开始分拨业务进场测试1");
114 IMPORT_XML= IMPORT_XML.replace("${car}",voNo) 114 IMPORT_XML= IMPORT_XML.replace("${car}",voNo)
115 .replace("${cross_weight}",cross_weight) 115 .replace("${cross_weight}",cross_weight)
116 .replace("${areaID}",areaID) 116 .replace("${areaID}",areaID)
@@ -141,7 +141,7 @@ public class BeihuoAllocateTests { @@ -141,7 +141,7 @@ public class BeihuoAllocateTests {
141 //二维码 141 //二维码
142 String barcode = "9cc260"; 142 String barcode = "9cc260";
143 143
144 - logger.error("开始分拨离场测试1"); 144 + log.error("开始分拨离场测试1");
145 IMPORT_XML= IMPORT_XML.replace("${car}",voNo) 145 IMPORT_XML= IMPORT_XML.replace("${car}",voNo)
146 .replace("${cross_weight}",cross_weight) 146 .replace("${cross_weight}",cross_weight)
147 .replace("${areaID}",areaID) 147 .replace("${areaID}",areaID)
@@ -172,7 +172,7 @@ public class BeihuoAllocateTests { @@ -172,7 +172,7 @@ public class BeihuoAllocateTests {
172 //二维码 172 //二维码
173 String barcode = "9cc260"; 173 String barcode = "9cc260";
174 174
175 - logger.error("开始分拨业务进场测试1"); 175 + log.error("开始分拨业务进场测试1");
176 IMPORT_XML= IMPORT_XML.replace("${car}",voNo) 176 IMPORT_XML= IMPORT_XML.replace("${car}",voNo)
177 .replace("${cross_weight}",cross_weight) 177 .replace("${cross_weight}",cross_weight)
178 .replace("${areaID}",areaID) 178 .replace("${areaID}",areaID)
@@ -203,7 +203,7 @@ public class BeihuoAllocateTests { @@ -203,7 +203,7 @@ public class BeihuoAllocateTests {
203 //二维码 203 //二维码
204 String barcode = "9cc260"; 204 String barcode = "9cc260";
205 205
206 - logger.error("开始分拨离场测试1"); 206 + log.error("开始分拨离场测试1");
207 IMPORT_XML= IMPORT_XML.replace("${car}",voNo) 207 IMPORT_XML= IMPORT_XML.replace("${car}",voNo)
208 .replace("${cross_weight}",cross_weight) 208 .replace("${cross_weight}",cross_weight)
209 .replace("${areaID}",areaID) 209 .replace("${areaID}",areaID)
@@ -3,6 +3,7 @@ package com.sy; @@ -3,6 +3,7 @@ package com.sy;
3 import com.sy.bwAnalysis.AnalysisRoute; 3 import com.sy.bwAnalysis.AnalysisRoute;
4 import com.sy.logic.LiftBar; 4 import com.sy.logic.LiftBar;
5 import com.sy.utils.XMLThreadPoolFactory; 5 import com.sy.utils.XMLThreadPoolFactory;
  6 +import lombok.extern.slf4j.Slf4j;
6 import org.junit.Test; 7 import org.junit.Test;
7 import org.junit.runner.RunWith; 8 import org.junit.runner.RunWith;
8 import org.springframework.boot.test.context.SpringBootTest; 9 import org.springframework.boot.test.context.SpringBootTest;
@@ -13,9 +14,9 @@ import java.util.concurrent.TimeUnit; @@ -13,9 +14,9 @@ import java.util.concurrent.TimeUnit;
13 14
14 @RunWith(SpringRunner.class) 15 @RunWith(SpringRunner.class)
15 @SpringBootTest 16 @SpringBootTest
  17 +@Slf4j
16 public class BeihuoTests { 18 public class BeihuoTests {
17 19
18 - private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(LiftBar.class);  
19 20
20 private static ThreadPoolExecutor threadPoolEs = XMLThreadPoolFactory.instance("kakou"); 21 private static ThreadPoolExecutor threadPoolEs = XMLThreadPoolFactory.instance("kakou");
21 private AnalysisRoute analysisRoute=new AnalysisRoute(); 22 private AnalysisRoute analysisRoute=new AnalysisRoute();
@@ -110,7 +111,7 @@ public class BeihuoTests { @@ -110,7 +111,7 @@ public class BeihuoTests {
110 //二维码 111 //二维码
111 String barcode = "fb2-4fdb-aa62-b6ee0d33c915"; 112 String barcode = "fb2-4fdb-aa62-b6ee0d33c915";
112 113
113 - logger.error("开始进场测试"); 114 + log.error("开始进场测试");
114 IMPORT_XML= IMPORT_XML.replace("${car}",voNo) 115 IMPORT_XML= IMPORT_XML.replace("${car}",voNo)
115 .replace("${cross_weight}",cross_weight) 116 .replace("${cross_weight}",cross_weight)
116 .replace("${areaID}",areaID) 117 .replace("${areaID}",areaID)
@@ -141,7 +142,7 @@ public class BeihuoTests { @@ -141,7 +142,7 @@ public class BeihuoTests {
141 String ie = "E"; 142 String ie = "E";
142 //二维码 143 //二维码
143 String barcode = "f7f-461a-bb39-b61c0a4d5677"; 144 String barcode = "f7f-461a-bb39-b61c0a4d5677";
144 - logger.error("开始出口送货离场测试"); 145 + log.error("开始出口送货离场测试");
145 IMPORT_XML= IMPORT_XML.replace("${car}",voNo) 146 IMPORT_XML= IMPORT_XML.replace("${car}",voNo)
146 .replace("${cross_weight}",cross_weight) 147 .replace("${cross_weight}",cross_weight)
147 .replace("${areaID}",areaID) 148 .replace("${areaID}",areaID)
@@ -308,7 +309,7 @@ public class BeihuoTests { @@ -308,7 +309,7 @@ public class BeihuoTests {
308 * 309 *
309 */ 310 */
310 public void message(){ 311 public void message(){
311 - logger.error("开始进场测试"); 312 + log.error("开始进场测试");
312 IMPORT_XML= IMPORT_XML.replace("${car}",voNo) 313 IMPORT_XML= IMPORT_XML.replace("${car}",voNo)
313 .replace("${cross_weight}",cross_weight) 314 .replace("${cross_weight}",cross_weight)
314 .replace("${areaID}",areaID) 315 .replace("${areaID}",areaID)
@@ -17,6 +17,7 @@ class RedisServiceTest { @@ -17,6 +17,7 @@ class RedisServiceTest {
17 @Autowired 17 @Autowired
18 RedisService redisService; 18 RedisService redisService;
19 19
  20 +
20 @Test 21 @Test
21 void expire() { 22 void expire() {
22 } 23 }
@@ -4,25 +4,29 @@ import com.sy.bwAnalysis.AnalysisRoute; @@ -4,25 +4,29 @@ import com.sy.bwAnalysis.AnalysisRoute;
4 import com.sy.bwAnalysis.GatherInfoAnalysis; 4 import com.sy.bwAnalysis.GatherInfoAnalysis;
5 import com.sy.bwAnalysis.MessageAnalysis; 5 import com.sy.bwAnalysis.MessageAnalysis;
6 import com.sy.bwAssist.Message; 6 import com.sy.bwAssist.Message;
  7 +import com.sy.mapper.LandListDao;
7 import com.sy.model.GatherInfo; 8 import com.sy.model.GatherInfo;
8 import com.sy.service.RedisService; 9 import com.sy.service.RedisService;
9 import com.sy.service.router.MessageRouter; 10 import com.sy.service.router.MessageRouter;
10 import com.sy.service.router.RouterContext; 11 import com.sy.service.router.RouterContext;
  12 +import lombok.extern.slf4j.Slf4j;
11 import org.apache.log4j.PropertyConfigurator; 13 import org.apache.log4j.PropertyConfigurator;
12 import org.junit.Test; 14 import org.junit.Test;
13 import org.junit.runner.RunWith; 15 import org.junit.runner.RunWith;
14 -import org.slf4j.Logger;  
15 -import org.slf4j.LoggerFactory; 16 +
16 import org.springframework.beans.factory.annotation.Autowired; 17 import org.springframework.beans.factory.annotation.Autowired;
17 import org.springframework.beans.factory.annotation.Qualifier; 18 import org.springframework.beans.factory.annotation.Qualifier;
18 import org.springframework.boot.test.context.SpringBootTest; 19 import org.springframework.boot.test.context.SpringBootTest;
19 import org.springframework.test.context.junit4.SpringRunner; 20 import org.springframework.test.context.junit4.SpringRunner;
20 21
  22 +import javax.annotation.Resource;
  23 +
21 @RunWith(SpringRunner.class) 24 @RunWith(SpringRunner.class)
22 @SpringBootTest 25 @SpringBootTest
  26 +@Slf4j
23 public class GatherInfoHandleImplTest { 27 public class GatherInfoHandleImplTest {
24 28
25 - private static final Logger logger = LoggerFactory.getLogger(GatherInfoHandleImplTest.class); 29 +
26 30
27 private AnalysisRoute analysisRoute=new AnalysisRoute(); 31 private AnalysisRoute analysisRoute=new AnalysisRoute();
28 32
@@ -30,6 +34,8 @@ public class GatherInfoHandleImplTest { @@ -30,6 +34,8 @@ public class GatherInfoHandleImplTest {
30 private static String CHANEL_BEIHUO_I1 = "4604601010"; 34 private static String CHANEL_BEIHUO_I1 = "4604601010";
31 private static String CHANEL_BEIHUO_E1 = "4604600010"; 35 private static String CHANEL_BEIHUO_E1 = "4604600010";
32 private static String CHANEL_BEIHUO_E2 = "4604600011"; 36 private static String CHANEL_BEIHUO_E2 = "4604600011";
  37 + //二维码
  38 + private static String BARCODE = "845-4493-8cbd-963e6ce478cc";
33 39
34 @Autowired 40 @Autowired
35 RedisService redisService; 41 RedisService redisService;
@@ -42,6 +48,9 @@ public class GatherInfoHandleImplTest { @@ -42,6 +48,9 @@ public class GatherInfoHandleImplTest {
42 @Autowired 48 @Autowired
43 MessageRouter messageRouterX22; 49 MessageRouter messageRouterX22;
44 50
  51 + @Resource
  52 + private LandListDao landListDao;
  53 +
45 //车牌号 54 //车牌号
46 private String voNo = "豫A61CR7"; 55 private String voNo = "豫A61CR7";
47 //备案重量 56 //备案重量
@@ -54,10 +63,10 @@ public class GatherInfoHandleImplTest { @@ -54,10 +63,10 @@ public class GatherInfoHandleImplTest {
54 private String chnlNo = "4604601010"; 63 private String chnlNo = "4604601010";
55 //进出场类型I/E 64 //进出场类型I/E
56 private String ie = "I"; 65 private String ie = "I";
57 - //二维码  
58 - private String barcode = "613f5c";  
59 66
60 - //进通道报文 67 +
  68 +
  69 + //进通道报文X21
61 private static String IMPORT_XML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 70 private static String IMPORT_XML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
62 "<MSG>\n" + 71 "<MSG>\n" +
63 "\t<META>\n" + 72 "\t<META>\n" +
@@ -111,6 +120,51 @@ public class GatherInfoHandleImplTest { @@ -111,6 +120,51 @@ public class GatherInfoHandleImplTest {
111 "\t</GATHER_INFO>\n" + 120 "\t</GATHER_INFO>\n" +
112 "</MSG>"; 121 "</MSG>";
113 122
  123 + /**
  124 + * 入区不放行代码
  125 + */
  126 + private static String CHCEK_RESULT_CODE_I_ERR= "11000000200000000000";
  127 + /**
  128 + * 入区放行代码
  129 + */
  130 + private static String CHCEK_RESULT_CODE_I_SUC= "00000000200000000000";
  131 + /**
  132 + * 出区不放行代码
  133 + */
  134 + private static String CHCEK_RESULT_CODE_E_ERR= "11000000100000000000";
  135 + /**
  136 + * 出区放行代码
  137 + */
  138 + private static String CHCEK_RESULT_CODE_E_SUC= "00000000100000000000";
  139 +
  140 + private static String RESULT_CODE_DES_SUC = "直接放行";
  141 +
  142 + private static String RESULT_CODE_DES_ERR = "不放行";
  143 +
  144 + //X22指令报文
  145 + private static String X22_COMMANDINFO_XML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
  146 + "<MSG>\n" +
  147 + "\t<META>\n" +
  148 + "\t\t<SNDR>KAO</SNDR>\n" +
  149 + "\t\t<RCVR/>\n" +
  150 + "\t\t<SEQN>20220829110020</SEQN>\n" +
  151 + "\t\t<DDTM>20220829110020</DDTM>\n" +
  152 + "\t\t<TYPE>KAKO</TYPE>\n" +
  153 + "\t\t<STYP>CARM</STYP>\n" +
  154 + "\t</META>\n" +
  155 + "\t<COMMAND_INFO AREA_ID=\"${AREA_ID}\" CHNL_NO=\"${CHNL_NO}\" I_E_TYPE=\"${I_E_TYPE}\" SEQ_NO=\"${SEQ_NO}\">\n" +
  156 + "\t\t<CHECK_RESULT>${CHECK_RESULT}</CHECK_RESULT>\n" +
  157 + "\t\t<OP_HINT>${OP_HINT}</OP_HINT>\n" +
  158 + "\t\t<SEAL>\n" +
  159 + "\t\t\t<ESEAL_ID/>\n" +
  160 + "\t\t\t<SEAL_KEY/>\n" +
  161 + "\t\t\t<OPEN_TIMES/>\n" +
  162 + "\t\t\t<ESEAL_IC_NO/>\n" +
  163 + "\t\t</SEAL>\n" +
  164 + "\t\t<SZ_MSG/>\n" +
  165 + "\t</COMMAND_INFO>\n" +
  166 + "</MSG>";
  167 +
114 168
115 169
116 /** 170 /**
@@ -129,9 +183,9 @@ public class GatherInfoHandleImplTest { @@ -129,9 +183,9 @@ public class GatherInfoHandleImplTest {
129 //进出场类型I/E 183 //进出场类型I/E
130 String ie = "I"; 184 String ie = "I";
131 //二维码 185 //二维码
132 - String barcode = "74b-4bef-b248-80a95358683f"; 186 + String barcode = BARCODE;
133 187
134 - logger.error("开始进场测试"); 188 + log.error("开始进场测试");
135 IMPORT_XML= IMPORT_XML.replace("${car}",voNo) 189 IMPORT_XML= IMPORT_XML.replace("${car}",voNo)
136 .replace("${cross_weight}",cross_weight) 190 .replace("${cross_weight}",cross_weight)
137 .replace("${areaID}",areaID) 191 .replace("${areaID}",areaID)
@@ -143,10 +197,8 @@ public class GatherInfoHandleImplTest { @@ -143,10 +197,8 @@ public class GatherInfoHandleImplTest {
143 String string = IMPORT_XML.replace("Msg","MSG"); 197 String string = IMPORT_XML.replace("Msg","MSG");
144 MessageAnalysis analysis = new MessageAnalysis(); 198 MessageAnalysis analysis = new MessageAnalysis();
145 Message message = analysis.readTicketsXml(string); 199 Message message = analysis.readTicketsXml(string);
146 - GatherInfoAnalysis gatherInfoAnalysis = new GatherInfoAnalysis();  
147 - GatherInfo info = gatherInfoAnalysis.toJavaBean(message);  
148 -  
149 200
  201 + mesageHandle(message);
150 202
151 } 203 }
152 204
@@ -164,13 +216,13 @@ public class GatherInfoHandleImplTest { @@ -164,13 +216,13 @@ public class GatherInfoHandleImplTest {
164 //场站编号 216 //场站编号
165 String areaID = AREA_BEIHUO; 217 String areaID = AREA_BEIHUO;
166 //通道编号 218 //通道编号
167 - String chnlNo = CHANEL_BEIHUO_E2; 219 + String chnlNo = CHANEL_BEIHUO_E1;
168 //进出场类型I/E 220 //进出场类型I/E
169 String ie = "E"; 221 String ie = "E";
170 //二维码 222 //二维码
171 - String barcode = "22a-47a0-a296-1fe53e37a217"; 223 + String barcode = BARCODE;
172 224
173 - logger.error("开始出口送货离场测试"); 225 + log.error("开始出口送货离场测试");
174 IMPORT_XML= IMPORT_XML.replace("${car}",voNo) 226 IMPORT_XML= IMPORT_XML.replace("${car}",voNo)
175 .replace("${cross_weight}",cross_weight) 227 .replace("${cross_weight}",cross_weight)
176 .replace("${areaID}",areaID) 228 .replace("${areaID}",areaID)
@@ -183,6 +235,34 @@ public class GatherInfoHandleImplTest { @@ -183,6 +235,34 @@ public class GatherInfoHandleImplTest {
183 Message message = analysis.readTicketsXml(string); 235 Message message = analysis.readTicketsXml(string);
184 236
185 237
  238 + mesageHandle(message);
  239 +
  240 + }
  241 +
  242 + /**
  243 + * 接收到金二X22指令测试
  244 + */
  245 + @Test
  246 + public void X22Test(){
  247 +
  248 + landListDao.releaseBarcode("20220624063118000004");
  249 + X22_COMMANDINFO_XML= X22_COMMANDINFO_XML.replace("${AREA_ID}",AREA_BEIHUO)
  250 + .replace("${CHNL_NO}",CHANEL_BEIHUO_E1)
  251 + .replace("${I_E_TYPE}","E")
  252 + .replace("${SEQ_NO}","20220624063118000004")
  253 + .replace("${CHECK_RESULT}",CHCEK_RESULT_CODE_E_SUC)
  254 + .replace("${OP_HINT}",RESULT_CODE_DES_SUC);
  255 +
  256 + String string = X22_COMMANDINFO_XML.replace("Msg","MSG");
  257 + MessageAnalysis analysis = new MessageAnalysis();
  258 + Message message = analysis.readTicketsXml(string);
  259 +
  260 +
  261 + mesageHandle(message);
  262 +
  263 + }
  264 +
  265 + public void mesageHandle(Message message){
186 if ("CARM".equals(message.getMeta().getSmType())) { 266 if ("CARM".equals(message.getMeta().getSmType())) {
187 //策略判断 267 //策略判断
188 if(message.getComInfo() !=null){ 268 if(message.getComInfo() !=null){
@@ -193,7 +273,6 @@ public class GatherInfoHandleImplTest { @@ -193,7 +273,6 @@ public class GatherInfoHandleImplTest {
193 routerContext.executeStrategy(message); 273 routerContext.executeStrategy(message);
194 } 274 }
195 } 275 }
196 -  
197 } 276 }
198 277
199 278