zhangFan / analysis_imf · 提交

转到一个项目

作者 朱兆平
提交 a2cb36d332f4bac5af8f888b65e48746c4bba38d 1 个父辈 180ef28f

区内分拨与区内调拨业务判定与核销

内嵌 并排对比
正在显示 4 个修改的文件 包含 53 行增加 和 17 行删除
@@ -179,6 +179,27 @@ public class GatherInfoHandle implements GatherInfoService { @@ -179,6 +179,27 @@ public class GatherInfoHandle implements GatherInfoService {
179 if(chanelInCheck()){ 179 if(chanelInCheck()){
180 pass(); 180 pass();
181 log.info("[X21-SUCCESS]:[IN]-车辆入区直接放行"); 181 log.info("[X21-SUCCESS]:[IN]-车辆入区直接放行");
  182 +
  183 + /**
  184 + * 华东区内流转-进口分拨核销部分.
  185 + */
  186 + if ("区内分拨".equals(landBusinessTypeList.getBusinesstype())) {
  187 + //入区后 核销
  188 + //todo:测试注释掉,二维码释放
  189 + if (!gatherInfoHandle.debug){
  190 + buildBarCode.cancleBarCode(vaName);
  191 + log.info("[流转申请]-二维码已释放:"+vaName);
  192 + }
  193 +
  194 + int rc = gatherInfoHandle.landListDao.releaseBarcode(info.getBarcode());
  195 + if (rc>0) {
  196 + log.info("[进出场核销]-{}[区内分拨]-流转已核销:{}",vaName,info.getBarcode());
  197 + }else{
  198 + log.error("[进出场核销-ERROR]-{}[区内分拨]-流转未核销成功:{}",vaName,info.getBarcode());
  199 + }
  200 + //车辆流转申请缓存删除
  201 + releaseCache();
  202 + }
182 return; 203 return;
183 }else{ 204 }else{
184 inStationInfo(); //入场信息获取 205 inStationInfo(); //入场信息获取
@@ -497,6 +518,7 @@ public class GatherInfoHandle implements GatherInfoService { @@ -497,6 +518,7 @@ public class GatherInfoHandle implements GatherInfoService {
497 sendBw(info,false,GROWSSEXCETION,landBusinessTypeList,listinfos); 518 sendBw(info,false,GROWSSEXCETION,landBusinessTypeList,listinfos);
498 return false; 519 return false;
499 } 520 }
  521 + case "区内调拨":
500 case "调拨业务": 522 case "调拨业务":
501 if (gatherInfoHandle.weightCheckHandleService.checkAllocateOrDispatch(growssWt, selfWt, goodsWt,inWt)){ 523 if (gatherInfoHandle.weightCheckHandleService.checkAllocateOrDispatch(growssWt, selfWt, goodsWt,inWt)){
502 /** 524 /**
@@ -599,19 +621,26 @@ public class GatherInfoHandle implements GatherInfoService { @@ -599,19 +621,26 @@ public class GatherInfoHandle implements GatherInfoService {
599 * 二维码失效核销->判定及失效通知. 621 * 二维码失效核销->判定及失效通知.
600 */ 622 */
601 private void releaseBarCode(){ 623 private void releaseBarCode(){
602 - //二维码判定 624 + //是否有未驶离的流转记录二维码判定
603 int count=gatherInfoHandle.listService.selectlaststation(info.getVename(),info.getBarcode()); 625 int count=gatherInfoHandle.listService.selectlaststation(info.getVename(),info.getBarcode());
604 //二维码失效通知,已进入场站的与缓存比较. 626 //二维码失效通知,已进入场站的与缓存比较.
605 if(count==0){ 627 if(count==0){
606 //todo:测试注释掉,二维码释放 628 //todo:测试注释掉,二维码释放
607 if (!gatherInfoHandle.debug){ 629 if (!gatherInfoHandle.debug){
608 buildBarCode.cancleBarCode(vaName); 630 buildBarCode.cancleBarCode(vaName);
  631 + log.info("[流转申请]-二维码已释放:"+vaName);
609 } 632 }
610 - log.info("[进出场申请]-二维码已释放:"+vaName); 633 +
611 int rc = gatherInfoHandle.landListDao.releaseBarcode(info.getBarcode()); 634 int rc = gatherInfoHandle.landListDao.releaseBarcode(info.getBarcode());
  635 + if (rc>0) {
  636 + log.info("[进出场核销]-{}流转已核销:{}",vaName,info.getBarcode());
  637 + }else{
  638 + log.error("[进出场核销-ERROR]-{}流转未核销成功:{}",vaName,info.getBarcode());
  639 + }
612 //车辆流转申请缓存删除 640 //车辆流转申请缓存删除
613 - releaseCache();  
614 - log.info("[流转申请]-车辆{}二维码已核销:{}",vaName,info.getBarcode()); 641 + releaseCache();
  642 + }else{
  643 + log.error("[进出场核销-ERROR]-{}二维码应该核销,但是不符合核销条件:{}",vaName,info.getBarcode());
615 } 644 }
616 } 645 }
617 646
@@ -622,6 +651,7 @@ public class GatherInfoHandle implements GatherInfoService { @@ -622,6 +651,7 @@ public class GatherInfoHandle implements GatherInfoService {
622 gatherInfoHandle.redisService.del(info.getVename()+"_endstationList"); 651 gatherInfoHandle.redisService.del(info.getVename()+"_endstationList");
623 //车辆过卡信息缓存删除-X22金二判定时候生成的这个缓存 652 //车辆过卡信息缓存删除-X22金二判定时候生成的这个缓存
624 gatherInfoHandle.redisService.del(info.getSeqno()); 653 gatherInfoHandle.redisService.del(info.getSeqno());
  654 + log.info("[流转缓存]-{}缓存已核销",vaName);
625 } 655 }
626 656
627 /** 657 /**
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
85 AND AISLEWT IS NOT NULL AND REMARK IS NOT NULL 85 AND AISLEWT IS NOT NULL AND REMARK IS NOT NULL
86 </select> 86 </select>
87 <update id="updateisvalid" parameterType="java.lang.String"> 87 <update id="updateisvalid" parameterType="java.lang.String">
88 - update land_businesstype_list set ISVALID = "1" where 88 + update land_businesstype_list set ISVALID = '1' where
89 TRAILER_FRAME_NO = #{trailerFrameNo,jdbcType=VARCHAR} 89 TRAILER_FRAME_NO = #{trailerFrameNo,jdbcType=VARCHAR}
90 and BARCODE = #{barcode,jdbcType=VARCHAR} 90 and BARCODE = #{barcode,jdbcType=VARCHAR}
91 and ENDSTATION = #{endstation,jdbcType=VARCHAR} 91 and ENDSTATION = #{endstation,jdbcType=VARCHAR}
@@ -95,21 +95,21 @@ @@ -95,21 +95,21 @@
95 select count(*) from land_businesstype_list where 95 select count(*) from land_businesstype_list where
96 TRAILER_FRAME_NO = #{trailerFrameNo,jdbcType=VARCHAR} 96 TRAILER_FRAME_NO = #{trailerFrameNo,jdbcType=VARCHAR}
97 and BARCODE = #{barcode,jdbcType=VARCHAR} 97 and BARCODE = #{barcode,jdbcType=VARCHAR}
98 - and TURNOVERFLAG = "E"  
99 - and ISVALID = "0" 98 + and TURNOVERFLAG = 'E'
  99 + and ISVALID = '0'
100 </select> 100 </select>
101 <select id="selectByBarcode" parameterType="java.lang.String" resultMap="BaseResultMap"> 101 <select id="selectByBarcode" parameterType="java.lang.String" resultMap="BaseResultMap">
102 select 102 select
103 <include refid="Base_Column_List" /> 103 <include refid="Base_Column_List" />
104 from land_businesstype_list 104 from land_businesstype_list
105 - where BARCODE = #{barcode,jdbcType=VARCHAR} AND ISVALID = "0" 105 + where BARCODE = #{barcode,jdbcType=VARCHAR} AND ISVALID = '0'
106 </select> 106 </select>
107 107
108 <select id="selectByBarcodeWithE" parameterType="java.lang.String" resultMap="BaseResultMap"> 108 <select id="selectByBarcodeWithE" parameterType="java.lang.String" resultMap="BaseResultMap">
109 select 109 select
110 <include refid="Base_Column_List" /> 110 <include refid="Base_Column_List" />
111 from land_businesstype_list 111 from land_businesstype_list
112 - where BARCODE = #{barcode,jdbcType=VARCHAR} AND ISVALID = "1" and TURNOVERFLAG = "E" 112 + where BARCODE = #{barcode,jdbcType=VARCHAR} AND ISVALID = '1' and TURNOVERFLAG = 'E'
113 </select> 113 </select>
114 114
115 <select id="selectMessageId" parameterType="java.lang.String" resultMap="BaseResultMap"> 115 <select id="selectMessageId" parameterType="java.lang.String" resultMap="BaseResultMap">
@@ -120,7 +120,7 @@ @@ -120,7 +120,7 @@
120 </select> 120 </select>
121 121
122 <update id="updateByBarCode" parameterType="java.lang.String"> 122 <update id="updateByBarCode" parameterType="java.lang.String">
123 - update land_businesstype_list set ISVALID = "1" where BARCODE=#{barcode,jdbcType=VARCHAR}; 123 + update land_businesstype_list set ISVALID = '1' where BARCODE=#{barcode,jdbcType=VARCHAR};
124 </update> 124 </update>
125 <delete id="deleteByPrimaryKey" parameterType="java.lang.String"> 125 <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
126 delete from land_businesstype_list 126 delete from land_businesstype_list
@@ -58,6 +58,12 @@ class RedisServiceTest { @@ -58,6 +58,12 @@ class RedisServiceTest {
58 58
59 @Test 59 @Test
60 void testSet() { 60 void testSet() {
61 - redisService.set("豫A61CR7","[{\"agentname\":\"ceshi\",\"agentno\":\"ceshi\",\"aisle\":\"4604601010\",\"barcode\":\"74b-4bef-b248-80a95358683f\",\"businesstype\":\"进口提货\",\"cocode\":\"普通货物\",\"createBy\":\"1\",\"createDate\":1661237499690,\"declarePersonnelNumbers\":\"8930000085548\",\"endport\":\"4604\",\"endstation\":\"4604600000\",\"endstationList\":[\"4604600000\"],\"enterpriseCreditCode\":\"9141010070678920XJ\",\"id\":\"402eff8d-ca6b-4192-99ff-ccc6c22b4749\",\"inAllocatingBusiness\":0,\"isDelete\":\"0\",\"isfull\":\"0\",\"isthree\":\"0\",\"isvalid\":\"0\",\"landBusineestypeListInfoList\":[{\"applicationformid\":\"74b-4bef-b248-80a95358683f\",\"arrivedaheadtime\":\"0\",\"awba\":\"999-11111111\",\"ext1\":\"123\",\"ext2\":\"123\",\"ext3\":\"进口提货\",\"ext4\":\"B\",\"flightno\":\"CV2212\",\"id\":\"0f9fd8a3-3485-43a3-bf5d-e53908999075\",\"intelligentLockOne\":\"123321\",\"intelligentLockTwo\":\"123321\",\"licenseplatenumber\":\"豫A61CR7\",\"partialidentity\":\"0\"}],\"massageId\":\"202208231451390761\",\"masterList\":\"999-11111111\",\"mediumtype\":\"2\",\"modeTransportation\":\"5\",\"organizationCode\":\"70678920X\",\"prodectTime\":1661237499690,\"remark\":\"123.00\",\"remark3\":\"\",\"trailerFrameNo\":\"豫A61CR7\",\"trailerLicenseNo\":\"超级管理员\",\"trainsconfirmationNumber\":\"\",\"turnoverflag\":\"I\",\"veProperty\":\"超级管理员\"},{\"agentname\":\"ceshi\",\"agentno\":\"ceshi\",\"aisle\":\"4604601011\",\"barcode\":\"74b-4bef-b248-80a95358683f\",\"businesstype\":\"进口提货\",\"cocode\":\"普通货物\",\"createBy\":\"1\",\"createDate\":1661237499690,\"declarePersonnelNumbers\":\"8930000085548\",\"endport\":\"4604\",\"endstation\":\"4604600000\",\"endstationList\":[\"4604600000\"],\"enterpriseCreditCode\":\"9141010070678920XJ\",\"id\":\"5fb6b71f-59f4-4fbc-aa18-a73758cac8e6\",\"inAllocatingBusiness\":0,\"isDelete\":\"0\",\"isfull\":\"0\",\"isthree\":\"0\",\"isvalid\":\"0\",\"landBusineestypeListInfoList\":[{\"applicationformid\":\"74b-4bef-b248-80a95358683f\",\"arrivedaheadtime\":\"0\",\"awba\":\"999-11111111\",\"ext1\":\"123\",\"ext2\":\"123\",\"ext3\":\"进口提货\",\"ext4\":\"B\",\"flightno\":\"CV2212\",\"id\":\"0f9fd8a3-3485-43a3-bf5d-e53908999075\",\"intelligentLockOne\":\"123321\",\"intelligentLockTwo\":\"123321\",\"licenseplatenumber\":\"豫A61CR7\",\"partialidentity\":\"0\"}],\"massageId\":\"202208231451390761\",\"masterList\":\"999-11111111\",\"mediumtype\":\"2\",\"modeTransportation\":\"5\",\"organizationCode\":\"70678920X\",\"prodectTime\":1661237499690,\"remark\":\"123.00\",\"remark3\":\"\",\"trailerFrameNo\":\"豫A61CR7\",\"trailerLicenseNo\":\"超级管理员\",\"trainsconfirmationNumber\":\"\",\"turnoverflag\":\"I\",\"veProperty\":\"超级管理员\"},{\"agentname\":\"ceshi\",\"agentno\":\"ceshi\",\"aisle\":\"4604601012\",\"barcode\":\"74b-4bef-b248-80a95358683f\",\"businesstype\":\"进口提货\",\"cocode\":\"普通货物\",\"createBy\":\"1\",\"createDate\":1661237499690,\"declarePersonnelNumbers\":\"8930000085548\",\"endport\":\"4604\",\"endstation\":\"4604600000\",\"endstationList\":[\"4604600000\"],\"enterpriseCreditCode\":\"9141010070678920XJ\",\"id\":\"a1bd7e91-4a7f-4e36-b525-93f6b21a933a\",\"inAllocatingBusiness\":0,\"isDelete\":\"0\",\"isfull\":\"0\",\"isthree\":\"0\",\"isvalid\":\"0\",\"landBusineestypeListInfoList\":[{\"applicationformid\":\"74b-4bef-b248-80a95358683f\",\"arrivedaheadtime\":\"0\",\"awba\":\"999-11111111\",\"ext1\":\"123\",\"ext2\":\"123\",\"ext3\":\"进口提货\",\"ext4\":\"B\",\"flightno\":\"CV2212\",\"id\":\"0f9fd8a3-3485-43a3-bf5d-e53908999075\",\"intelligentLockOne\":\"123321\",\"intelligentLockTwo\":\"123321\",\"licenseplatenumber\":\"豫A61CR7\",\"partialidentity\":\"0\"}],\"massageId\":\"202208231451390761\",\"masterList\":\"999-11111111\",\"mediumtype\":\"2\",\"modeTransportation\":\"5\",\"organizationCode\":\"70678920X\",\"prodectTime\":1661237499690,\"remark\":\"123.00\",\"remark3\":\"\",\"trailerFrameNo\":\"豫A61CR7\",\"trailerLicenseNo\":\"超级管理员\",\"trainsconfirmationNumber\":\"\",\"turnoverflag\":\"I\",\"veProperty\":\"超级管理员\"},{\"agentname\":\"ceshi\",\"agentno\":\"ceshi\",\"aisle\":\"4604600010\",\"barcode\":\"74b-4bef-b248-80a95358683f\",\"businesstype\":\"进口提货\",\"cocode\":\"普通货物\",\"createBy\":\"1\",\"createDate\":1661237499690,\"declarePersonnelNumbers\":\"8930000085548\",\"endport\":\"4604\",\"endstation\":\"4604600000\",\"endstationList\":[\"4604600000\"],\"enterpriseCreditCode\":\"9141010070678920XJ\",\"id\":\"0fd720f2-31d1-4304-a513-7e1c85713394\",\"inAllocatingBusiness\":0,\"isDelete\":\"0\",\"isfull\":\"0\",\"isthree\":\"0\",\"isvalid\":\"0\",\"landBusineestypeListInfoList\":[{\"applicationformid\":\"74b-4bef-b248-80a95358683f\",\"arrivedaheadtime\":\"0\",\"awba\":\"999-11111111\",\"ext1\":\"123\",\"ext2\":\"123\",\"ext3\":\"进口提货\",\"ext4\":\"B\",\"flightno\":\"CV2212\",\"id\":\"0f9fd8a3-3485-43a3-bf5d-e53908999075\",\"intelligentLockOne\":\"123321\",\"intelligentLockTwo\":\"123321\",\"licenseplatenumber\":\"豫A61CR7\",\"partialidentity\":\"0\"}],\"massageId\":\"202208231451390761\",\"masterList\":\"999-11111111\",\"mediumtype\":\"2\",\"modeTransportation\":\"5\",\"organizationCode\":\"70678920X\",\"prodectTime\":1661237499690,\"remark\":\"123.00\",\"remark3\":\"\",\"trailerFrameNo\":\"豫A61CR7\",\"trailerLicenseNo\":\"超级管理员\",\"trainsconfirmationNumber\":\"\",\"turnoverflag\":\"E\",\"veProperty\":\"超级管理员\"},{\"agentname\":\"ceshi\",\"agentno\":\"ceshi\",\"aisle\":\"4604600011\",\"barcode\":\"74b-4bef-b248-80a95358683f\",\"businesstype\":\"进口提货\",\"cocode\":\"普通货物\",\"createBy\":\"1\",\"createDate\":1661237499690,\"declarePersonnelNumbers\":\"8930000085548\",\"endport\":\"4604\",\"endstation\":\"4604600000\",\"endstationList\":[\"4604600000\"],\"enterpriseCreditCode\":\"9141010070678920XJ\",\"id\":\"5eee7cdd-4851-43bd-a5ff-914a3c618f9a\",\"inAllocatingBusiness\":0,\"isDelete\":\"0\",\"isfull\":\"0\",\"isthree\":\"0\",\"isvalid\":\"0\",\"landBusineestypeListInfoList\":[{\"applicationformid\":\"74b-4bef-b248-80a95358683f\",\"arrivedaheadtime\":\"0\",\"awba\":\"999-11111111\",\"ext1\":\"123\",\"ext2\":\"123\",\"ext3\":\"进口提货\",\"ext4\":\"B\",\"flightno\":\"CV2212\",\"id\":\"0f9fd8a3-3485-43a3-bf5d-e53908999075\",\"intelligentLockOne\":\"123321\",\"intelligentLockTwo\":\"123321\",\"licenseplatenumber\":\"豫A61CR7\",\"partialidentity\":\"0\"}],\"massageId\":\"202208231451390761\",\"masterList\":\"999-11111111\",\"mediumtype\":\"2\",\"modeTransportation\":\"5\",\"organizationCode\":\"70678920X\",\"prodectTime\":1661237499690,\"remark\":\"123.00\",\"remark3\":\"\",\"trailerFrameNo\":\"豫A61CR7\",\"trailerLicenseNo\":\"超级管理员\",\"trainsconfirmationNumber\":\"\",\"turnoverflag\":\"E\",\"veProperty\":\"超级管理员\"},{\"agentname\":\"ceshi\",\"agentno\":\"ceshi\",\"aisle\":\"4604600012\",\"barcode\":\"74b-4bef-b248-80a95358683f\",\"businesstype\":\"进口提货\",\"cocode\":\"普通货物\",\"createBy\":\"1\",\"createDate\":1661237499690,\"declarePersonnelNumbers\":\"8930000085548\",\"endport\":\"4604\",\"endstation\":\"4604600000\",\"endstationList\":[\"4604600000\"],\"enterpriseCreditCode\":\"9141010070678920XJ\",\"id\":\"44bcde85-20ae-4467-a44e-4406396dd0c0\",\"inAllocatingBusiness\":0,\"isDelete\":\"0\",\"isfull\":\"0\",\"isthree\":\"0\",\"isvalid\":\"0\",\"landBusineestypeListInfoList\":[{\"applicationformid\":\"74b-4bef-b248-80a95358683f\",\"arrivedaheadtime\":\"0\",\"awba\":\"999-11111111\",\"ext1\":\"123\",\"ext2\":\"123\",\"ext3\":\"进口提货\",\"ext4\":\"B\",\"flightno\":\"CV2212\",\"id\":\"0f9fd8a3-3485-43a3-bf5d-e53908999075\",\"intelligentLockOne\":\"123321\",\"intelligentLockTwo\":\"123321\",\"licenseplatenumber\":\"豫A61CR7\",\"partialidentity\":\"0\"}],\"massageId\":\"202208231451390761\",\"masterList\":\"999-11111111\",\"mediumtype\":\"2\",\"modeTransportation\":\"5\",\"organizationCode\":\"70678920X\",\"prodectTime\":1661237499690,\"remark\":\"123.00\",\"remark3\":\"\",\"trailerFrameNo\":\"豫A61CR7\",\"trailerLicenseNo\":\"超级管理员\",\"trainsconfirmationNumber\":\"\",\"turnoverflag\":\"E\",\"veProperty\":\"超级管理员\"}]"); 61 + redisService.set("豫A61CR99","[{\"agentname\":\"ceshi\",\"agentno\":\"ceshi\",\"aisle\":\"4604601010\",\"barcode\":\"74b-4bef-b248-80a95358683f\",\"businesstype\":\"进口提货\",\"cocode\":\"普通货物\",\"createBy\":\"1\",\"createDate\":1661237499690,\"declarePersonnelNumbers\":\"8930000085548\",\"endport\":\"4604\",\"endstation\":\"4604600000\",\"endstationList\":[\"4604600000\"],\"enterpriseCreditCode\":\"9141010070678920XJ\",\"id\":\"402eff8d-ca6b-4192-99ff-ccc6c22b4749\",\"inAllocatingBusiness\":0,\"isDelete\":\"0\",\"isfull\":\"0\",\"isthree\":\"0\",\"isvalid\":\"0\",\"landBusineestypeListInfoList\":[{\"applicationformid\":\"74b-4bef-b248-80a95358683f\",\"arrivedaheadtime\":\"0\",\"awba\":\"999-11111111\",\"ext1\":\"123\",\"ext2\":\"123\",\"ext3\":\"进口提货\",\"ext4\":\"B\",\"flightno\":\"CV2212\",\"id\":\"0f9fd8a3-3485-43a3-bf5d-e53908999075\",\"intelligentLockOne\":\"123321\",\"intelligentLockTwo\":\"123321\",\"licenseplatenumber\":\"豫A61CR7\",\"partialidentity\":\"0\"}],\"massageId\":\"202208231451390761\",\"masterList\":\"999-11111111\",\"mediumtype\":\"2\",\"modeTransportation\":\"5\",\"organizationCode\":\"70678920X\",\"prodectTime\":1661237499690,\"remark\":\"123.00\",\"remark3\":\"\",\"trailerFrameNo\":\"豫A61CR7\",\"trailerLicenseNo\":\"超级管理员\",\"trainsconfirmationNumber\":\"\",\"turnoverflag\":\"I\",\"veProperty\":\"超级管理员\"},{\"agentname\":\"ceshi\",\"agentno\":\"ceshi\",\"aisle\":\"4604601011\",\"barcode\":\"74b-4bef-b248-80a95358683f\",\"businesstype\":\"进口提货\",\"cocode\":\"普通货物\",\"createBy\":\"1\",\"createDate\":1661237499690,\"declarePersonnelNumbers\":\"8930000085548\",\"endport\":\"4604\",\"endstation\":\"4604600000\",\"endstationList\":[\"4604600000\"],\"enterpriseCreditCode\":\"9141010070678920XJ\",\"id\":\"5fb6b71f-59f4-4fbc-aa18-a73758cac8e6\",\"inAllocatingBusiness\":0,\"isDelete\":\"0\",\"isfull\":\"0\",\"isthree\":\"0\",\"isvalid\":\"0\",\"landBusineestypeListInfoList\":[{\"applicationformid\":\"74b-4bef-b248-80a95358683f\",\"arrivedaheadtime\":\"0\",\"awba\":\"999-11111111\",\"ext1\":\"123\",\"ext2\":\"123\",\"ext3\":\"进口提货\",\"ext4\":\"B\",\"flightno\":\"CV2212\",\"id\":\"0f9fd8a3-3485-43a3-bf5d-e53908999075\",\"intelligentLockOne\":\"123321\",\"intelligentLockTwo\":\"123321\",\"licenseplatenumber\":\"豫A61CR7\",\"partialidentity\":\"0\"}],\"massageId\":\"202208231451390761\",\"masterList\":\"999-11111111\",\"mediumtype\":\"2\",\"modeTransportation\":\"5\",\"organizationCode\":\"70678920X\",\"prodectTime\":1661237499690,\"remark\":\"123.00\",\"remark3\":\"\",\"trailerFrameNo\":\"豫A61CR7\",\"trailerLicenseNo\":\"超级管理员\",\"trainsconfirmationNumber\":\"\",\"turnoverflag\":\"I\",\"veProperty\":\"超级管理员\"},{\"agentname\":\"ceshi\",\"agentno\":\"ceshi\",\"aisle\":\"4604601012\",\"barcode\":\"74b-4bef-b248-80a95358683f\",\"businesstype\":\"进口提货\",\"cocode\":\"普通货物\",\"createBy\":\"1\",\"createDate\":1661237499690,\"declarePersonnelNumbers\":\"8930000085548\",\"endport\":\"4604\",\"endstation\":\"4604600000\",\"endstationList\":[\"4604600000\"],\"enterpriseCreditCode\":\"9141010070678920XJ\",\"id\":\"a1bd7e91-4a7f-4e36-b525-93f6b21a933a\",\"inAllocatingBusiness\":0,\"isDelete\":\"0\",\"isfull\":\"0\",\"isthree\":\"0\",\"isvalid\":\"0\",\"landBusineestypeListInfoList\":[{\"applicationformid\":\"74b-4bef-b248-80a95358683f\",\"arrivedaheadtime\":\"0\",\"awba\":\"999-11111111\",\"ext1\":\"123\",\"ext2\":\"123\",\"ext3\":\"进口提货\",\"ext4\":\"B\",\"flightno\":\"CV2212\",\"id\":\"0f9fd8a3-3485-43a3-bf5d-e53908999075\",\"intelligentLockOne\":\"123321\",\"intelligentLockTwo\":\"123321\",\"licenseplatenumber\":\"豫A61CR7\",\"partialidentity\":\"0\"}],\"massageId\":\"202208231451390761\",\"masterList\":\"999-11111111\",\"mediumtype\":\"2\",\"modeTransportation\":\"5\",\"organizationCode\":\"70678920X\",\"prodectTime\":1661237499690,\"remark\":\"123.00\",\"remark3\":\"\",\"trailerFrameNo\":\"豫A61CR7\",\"trailerLicenseNo\":\"超级管理员\",\"trainsconfirmationNumber\":\"\",\"turnoverflag\":\"I\",\"veProperty\":\"超级管理员\"},{\"agentname\":\"ceshi\",\"agentno\":\"ceshi\",\"aisle\":\"4604600010\",\"barcode\":\"74b-4bef-b248-80a95358683f\",\"businesstype\":\"进口提货\",\"cocode\":\"普通货物\",\"createBy\":\"1\",\"createDate\":1661237499690,\"declarePersonnelNumbers\":\"8930000085548\",\"endport\":\"4604\",\"endstation\":\"4604600000\",\"endstationList\":[\"4604600000\"],\"enterpriseCreditCode\":\"9141010070678920XJ\",\"id\":\"0fd720f2-31d1-4304-a513-7e1c85713394\",\"inAllocatingBusiness\":0,\"isDelete\":\"0\",\"isfull\":\"0\",\"isthree\":\"0\",\"isvalid\":\"0\",\"landBusineestypeListInfoList\":[{\"applicationformid\":\"74b-4bef-b248-80a95358683f\",\"arrivedaheadtime\":\"0\",\"awba\":\"999-11111111\",\"ext1\":\"123\",\"ext2\":\"123\",\"ext3\":\"进口提货\",\"ext4\":\"B\",\"flightno\":\"CV2212\",\"id\":\"0f9fd8a3-3485-43a3-bf5d-e53908999075\",\"intelligentLockOne\":\"123321\",\"intelligentLockTwo\":\"123321\",\"licenseplatenumber\":\"豫A61CR7\",\"partialidentity\":\"0\"}],\"massageId\":\"202208231451390761\",\"masterList\":\"999-11111111\",\"mediumtype\":\"2\",\"modeTransportation\":\"5\",\"organizationCode\":\"70678920X\",\"prodectTime\":1661237499690,\"remark\":\"123.00\",\"remark3\":\"\",\"trailerFrameNo\":\"豫A61CR7\",\"trailerLicenseNo\":\"超级管理员\",\"trainsconfirmationNumber\":\"\",\"turnoverflag\":\"E\",\"veProperty\":\"超级管理员\"},{\"agentname\":\"ceshi\",\"agentno\":\"ceshi\",\"aisle\":\"4604600011\",\"barcode\":\"74b-4bef-b248-80a95358683f\",\"businesstype\":\"进口提货\",\"cocode\":\"普通货物\",\"createBy\":\"1\",\"createDate\":1661237499690,\"declarePersonnelNumbers\":\"8930000085548\",\"endport\":\"4604\",\"endstation\":\"4604600000\",\"endstationList\":[\"4604600000\"],\"enterpriseCreditCode\":\"9141010070678920XJ\",\"id\":\"5eee7cdd-4851-43bd-a5ff-914a3c618f9a\",\"inAllocatingBusiness\":0,\"isDelete\":\"0\",\"isfull\":\"0\",\"isthree\":\"0\",\"isvalid\":\"0\",\"landBusineestypeListInfoList\":[{\"applicationformid\":\"74b-4bef-b248-80a95358683f\",\"arrivedaheadtime\":\"0\",\"awba\":\"999-11111111\",\"ext1\":\"123\",\"ext2\":\"123\",\"ext3\":\"进口提货\",\"ext4\":\"B\",\"flightno\":\"CV2212\",\"id\":\"0f9fd8a3-3485-43a3-bf5d-e53908999075\",\"intelligentLockOne\":\"123321\",\"intelligentLockTwo\":\"123321\",\"licenseplatenumber\":\"豫A61CR7\",\"partialidentity\":\"0\"}],\"massageId\":\"202208231451390761\",\"masterList\":\"999-11111111\",\"mediumtype\":\"2\",\"modeTransportation\":\"5\",\"organizationCode\":\"70678920X\",\"prodectTime\":1661237499690,\"remark\":\"123.00\",\"remark3\":\"\",\"trailerFrameNo\":\"豫A61CR7\",\"trailerLicenseNo\":\"超级管理员\",\"trainsconfirmationNumber\":\"\",\"turnoverflag\":\"E\",\"veProperty\":\"超级管理员\"},{\"agentname\":\"ceshi\",\"agentno\":\"ceshi\",\"aisle\":\"4604600012\",\"barcode\":\"74b-4bef-b248-80a95358683f\",\"businesstype\":\"进口提货\",\"cocode\":\"普通货物\",\"createBy\":\"1\",\"createDate\":1661237499690,\"declarePersonnelNumbers\":\"8930000085548\",\"endport\":\"4604\",\"endstation\":\"4604600000\",\"endstationList\":[\"4604600000\"],\"enterpriseCreditCode\":\"9141010070678920XJ\",\"id\":\"44bcde85-20ae-4467-a44e-4406396dd0c0\",\"inAllocatingBusiness\":0,\"isDelete\":\"0\",\"isfull\":\"0\",\"isthree\":\"0\",\"isvalid\":\"0\",\"landBusineestypeListInfoList\":[{\"applicationformid\":\"74b-4bef-b248-80a95358683f\",\"arrivedaheadtime\":\"0\",\"awba\":\"999-11111111\",\"ext1\":\"123\",\"ext2\":\"123\",\"ext3\":\"进口提货\",\"ext4\":\"B\",\"flightno\":\"CV2212\",\"id\":\"0f9fd8a3-3485-43a3-bf5d-e53908999075\",\"intelligentLockOne\":\"123321\",\"intelligentLockTwo\":\"123321\",\"licenseplatenumber\":\"豫A61CR7\",\"partialidentity\":\"0\"}],\"massageId\":\"202208231451390761\",\"masterList\":\"999-11111111\",\"mediumtype\":\"2\",\"modeTransportation\":\"5\",\"organizationCode\":\"70678920X\",\"prodectTime\":1661237499690,\"remark\":\"123.00\",\"remark3\":\"\",\"trailerFrameNo\":\"豫A61CR7\",\"trailerLicenseNo\":\"超级管理员\",\"trainsconfirmationNumber\":\"\",\"turnoverflag\":\"E\",\"veProperty\":\"超级管理员\"}]");
  62 + }
  63 +
  64 + @Test
  65 + public void getvalue(){
  66 + String values = redisService.get("ULD-PMC6094AT");
  67 + System.out.println("values = " + values);
62 } 68 }
63 } 69 }
@@ -43,9 +43,9 @@ public class GatherInfoHandleImplTest { @@ -43,9 +43,9 @@ public class GatherInfoHandleImplTest {
43 private LandListDao landListDao; 43 private LandListDao landListDao;
44 44
45 //车牌号 45 //车牌号
46 - private String voNo = "豫NT0267"; 46 + private String voNo = "豫LL0125";
47 //二维码 47 //二维码
48 - private static String BARCODE = "2e1-43ce-bf14-bc0d4fb8b877"; 48 + private static String BARCODE = "4ae-4031-ace5-517528b51d60";
49 //场站编号 49 //场站编号
50 private String areaID = "4604600000"; 50 private String areaID = "4604600000";
51 51
@@ -162,11 +162,11 @@ public class GatherInfoHandleImplTest { @@ -162,11 +162,11 @@ public class GatherInfoHandleImplTest {
162 public void exportDownload_I() { 162 public void exportDownload_I() {
163 //车牌号 163 //车牌号
164 //过卡重量 164 //过卡重量
165 - String cross_weight= String.valueOf(5724); 165 + String cross_weight= String.valueOf(20120);
166 //场站编号 166 //场站编号
167 - String areaID = ChannelEnum.NORTH_K1_IN_2.getArea(); 167 + String areaID = ChannelEnum.NORTH_K1_IN_1.getArea();
168 //通道编号 168 //通道编号
169 - String chnlNo = ChannelEnum.NORTH_K1_IN_2.getChannel(); 169 + String chnlNo = ChannelEnum.NORTH_K1_IN_1.getChannel();
170 //进出场类型I/E 170 //进出场类型I/E
171 String ie = "I"; 171 String ie = "I";
172 //二维码 172 //二维码
@@ -197,7 +197,7 @@ public class GatherInfoHandleImplTest { @@ -197,7 +197,7 @@ public class GatherInfoHandleImplTest {
197 PropertyConfigurator.configure("config/log4j.properties"); 197 PropertyConfigurator.configure("config/log4j.properties");
198 198
199 //过卡重量 199 //过卡重量
200 - String cross_weight= String.valueOf(11000); 200 + String cross_weight= String.valueOf(20120+728);
201 //场站编号 201 //场站编号
202 String areaID = ChannelEnum.NORTH_K1_EX_2.getArea(); 202 String areaID = ChannelEnum.NORTH_K1_EX_2.getArea();
203 //通道编号 203 //通道编号