zhangFan / analysis_imf · 提交

转到一个项目

作者 朱兆平
提交 e9d807c38591412815e3e494cfb2862e73e2dde3 1 个父辈 a2cb36d3

BuildBarCode命名规范+核销记录日志

内嵌 并排对比
正在显示 4 个修改的文件 包含 50 行增加 和 32 行删除
@@ -16,7 +16,7 @@ import java.util.Map; @@ -16,7 +16,7 @@ import java.util.Map;
16 16
17 17
18 @Component 18 @Component
19 -public class buildBarCode { 19 +public class BuildBarCode {
20 20
21 private static String CREATEBARCODE = "http://10.50.7.11:8088/publiclogistics/createVehicleBarCode"; 21 private static String CREATEBARCODE = "http://10.50.7.11:8088/publiclogistics/createVehicleBarCode";
22 private static String CANCLEBARCODE = "http://10.50.7.11:8088/publiclogistics/cancelVehicleBarCode"; 22 private static String CANCLEBARCODE = "http://10.50.7.11:8088/publiclogistics/cancelVehicleBarCode";
@@ -78,15 +78,15 @@ public class buildBarCode { @@ -78,15 +78,15 @@ public class buildBarCode {
78 public static String CreateBarCode(String carCode,String carColor,String mainifist) { 78 public static String CreateBarCode(String carCode,String carColor,String mainifist) {
79 String json = "{\"token\":\"samples\",\"data\":{\"vehicle_no\":\""+carCode+"\"," + 79 String json = "{\"token\":\"samples\",\"data\":{\"vehicle_no\":\""+carCode+"\"," +
80 "\"vehicle_no_color\":\"黄\",\"vehicle_rela_id\":\""+mainifist+"\"}}"; 80 "\"vehicle_no_color\":\"黄\",\"vehicle_rela_id\":\""+mainifist+"\"}}";
81 - String content = buildBarCode.sendData(CREATEBARCODE, json);  
82 - Map map = buildBarCode.jsonFormat(content); 81 + String content = BuildBarCode.sendData(CREATEBARCODE, json);
  82 + Map map = BuildBarCode.jsonFormat(content);
83 return map.get("vehicle_bar_code").toString(); 83 return map.get("vehicle_bar_code").toString();
84 } 84 }
85 85
86 // 取消二维码 86 // 取消二维码
87 public static void cancleBarCode(String frameNo) { 87 public static void cancleBarCode(String frameNo) {
88 String json = "{\"token\":\"samples\",\"data\":{\"vehicle_no\":\""+frameNo+"\",\"vehicle_no_color\":\"黄\"}}"; 88 String json = "{\"token\":\"samples\",\"data\":{\"vehicle_no\":\""+frameNo+"\",\"vehicle_no_color\":\"黄\"}}";
89 - buildBarCode.sendData(CANCLEBARCODE, json); 89 + BuildBarCode.sendData(CANCLEBARCODE, json);
90 } 90 }
91 91
92 } 92 }
@@ -3,7 +3,7 @@ package com.sy.logic; @@ -3,7 +3,7 @@ package com.sy.logic;
3 import com.alibaba.fastjson.JSON; 3 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.model.*; 7 import com.sy.model.*;
8 import com.sy.relation.VeManifestRelation; 8 import com.sy.relation.VeManifestRelation;
9 import com.sy.service.*; 9 import com.sy.service.*;
@@ -394,7 +394,7 @@ public class LiftBar { @@ -394,7 +394,7 @@ public class LiftBar {
394 if(count==0){ 394 if(count==0){
395 //todo:测试注释掉,二维码释放 395 //todo:测试注释掉,二维码释放
396 logger.info("[进出场申请]-二维码释放:"+vaName); 396 logger.info("[进出场申请]-二维码释放:"+vaName);
397 - buildBarCode.cancleBarCode(vaName); 397 + BuildBarCode.cancleBarCode(vaName);
398 } 398 }
399 399
400 /** 400 /**
@@ -3,7 +3,7 @@ package com.sy.logic; @@ -3,7 +3,7 @@ package com.sy.logic;
3 3
4 import com.alibaba.fastjson.JSON; 4 import com.alibaba.fastjson.JSON;
5 import com.alibaba.fastjson.JSONArray; 5 import com.alibaba.fastjson.JSONArray;
6 -import com.sy.crossDomain.buildBarCode; 6 +import com.sy.crossDomain.BuildBarCode;
7 import com.sy.model.*; 7 import com.sy.model.*;
8 import com.sy.relation.VeManifestRelation; 8 import com.sy.relation.VeManifestRelation;
9 import com.sy.service.EnterCancelServer; 9 import com.sy.service.EnterCancelServer;
@@ -257,21 +257,21 @@ public class LogicOperation { @@ -257,21 +257,21 @@ public class LogicOperation {
257 if (list.getBusinesstype().indexOf("业务") > 0) { 257 if (list.getBusinesstype().indexOf("业务") > 0) {
258 logic.inOrUpEnterCancel(list); 258 logic.inOrUpEnterCancel(list);
259 if (count == 4) { 259 if (count == 4) {
260 - buildBarCode.cancleBarCode(vaName); 260 + BuildBarCode.cancleBarCode(vaName);
261 logic.listService.updateByBarcode(info.getBarcode()); 261 logic.listService.updateByBarcode(info.getBarcode());
262 }else if(count==6){ 262 }else if(count==6){
263 - buildBarCode.cancleBarCode(vaName); 263 + BuildBarCode.cancleBarCode(vaName);
264 logic.listService.updateByBarcode(info.getBarcode()); 264 logic.listService.updateByBarcode(info.getBarcode());
265 } 265 }
266 } else if(list.getBusinesstype().equals("出口送货") && list.getEndport().equals("4620")){ 266 } else if(list.getBusinesstype().equals("出口送货") && list.getEndport().equals("4620")){
267 if(list.getIsthree().equals("0")){ 267 if(list.getIsthree().equals("0")){
268 if(count==4){ 268 if(count==4){
269 - buildBarCode.cancleBarCode(vaName); 269 + BuildBarCode.cancleBarCode(vaName);
270 logic.listService.updateByBarcode(info.getBarcode()); 270 logic.listService.updateByBarcode(info.getBarcode());
271 } 271 }
272 }else{ 272 }else{
273 if(count==2){ 273 if(count==2){
274 - buildBarCode.cancleBarCode(vaName); 274 + BuildBarCode.cancleBarCode(vaName);
275 logic.listService.updateByBarcode(info.getBarcode()); 275 logic.listService.updateByBarcode(info.getBarcode());
276 } 276 }
277 } 277 }
@@ -279,7 +279,7 @@ public class LogicOperation { @@ -279,7 +279,7 @@ public class LogicOperation {
279 279
280 }else{ 280 }else{
281 if (count == 2 && !list.getEndport().equals("4620")) { 281 if (count == 2 && !list.getEndport().equals("4620")) {
282 - buildBarCode.cancleBarCode(vaName); 282 + BuildBarCode.cancleBarCode(vaName);
283 logic.listService.updateByBarcode(info.getBarcode()); 283 logic.listService.updateByBarcode(info.getBarcode());
284 } 284 }
285 } 285 }
@@ -3,7 +3,7 @@ package com.sy.service.impl; @@ -3,7 +3,7 @@ package com.sy.service.impl;
3 import com.alibaba.fastjson.JSON; 3 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.mapper.LandListDao;
8 import com.sy.model.*; 8 import com.sy.model.*;
9 import com.sy.service.*; 9 import com.sy.service.*;
@@ -182,24 +182,33 @@ public class GatherInfoHandle implements GatherInfoService { @@ -182,24 +182,33 @@ public class GatherInfoHandle implements GatherInfoService {
182 182
183 /** 183 /**
184 * 华东区内流转-进口分拨核销部分. 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 - } 185 + * 核销已转为从华东申报回执那里确定
  186 + */
  187 +// if ("区内分拨".equals(landBusinessTypeList.getBusinesstype())) {
  188 +// //入区后 核销
  189 +// //todo:测试注释掉,二维码释放
  190 +// if (!gatherInfoHandle.debug){
  191 +// buildBarCode.cancleBarCode(vaName);
  192 +// log.info("[流转申请]-二维码已释放:"+vaName);
  193 +// }
  194 +//
  195 +// //分拨申请验放
  196 +//// boolean allocatCheck = checkNmmsAllocate(landBusinessTypeList.getMasterList());
  197 +//// if(!allocatCheck){
  198 +//// log.error("[分拨业务]-分拨申请舱单未通过校验:"+FENBO);
  199 +//// sendBw(info,false,FENBO,landBusinessTypeList,listinfos);
  200 +//// return;
  201 +//// }
  202 +//
  203 +// int rc = gatherInfoHandle.landListDao.releaseBarcode(info.getBarcode());
  204 +// if (rc>0) {
  205 +// log.info("[进出场核销]-{}[区内分拨]-流转已核销:{}",vaName,info.getBarcode());
  206 +// }else{
  207 +// log.error("[进出场核销-ERROR]-{}[区内分拨]-流转未核销成功:{}",vaName,info.getBarcode());
  208 +// }
  209 +// //车辆流转申请缓存删除
  210 +// releaseCache();
  211 +// }
203 return; 212 return;
204 }else{ 213 }else{
205 inStationInfo(); //入场信息获取 214 inStationInfo(); //入场信息获取
@@ -581,6 +590,13 @@ public class GatherInfoHandle implements GatherInfoService { @@ -581,6 +590,13 @@ public class GatherInfoHandle implements GatherInfoService {
581 } 590 }
582 591
583 /** 592 /**
  593 + * 核销记录
  594 + */
  595 + private void releaseRecord(){
  596 + commandlog(info,true,"流转核销",landBusinessTypeList,null);
  597 + }
  598 +
  599 + /**
584 * 流转申请是否进行核销判定 600 * 流转申请是否进行核销判定
585 */ 601 */
586 private void releaseFormCheck(){ 602 private void releaseFormCheck(){
@@ -627,7 +643,7 @@ public class GatherInfoHandle implements GatherInfoService { @@ -627,7 +643,7 @@ public class GatherInfoHandle implements GatherInfoService {
627 if(count==0){ 643 if(count==0){
628 //todo:测试注释掉,二维码释放 644 //todo:测试注释掉,二维码释放
629 if (!gatherInfoHandle.debug){ 645 if (!gatherInfoHandle.debug){
630 - buildBarCode.cancleBarCode(vaName); 646 + BuildBarCode.cancleBarCode(vaName);
631 log.info("[流转申请]-二维码已释放:"+vaName); 647 log.info("[流转申请]-二维码已释放:"+vaName);
632 } 648 }
633 649
@@ -652,6 +668,8 @@ public class GatherInfoHandle implements GatherInfoService { @@ -652,6 +668,8 @@ public class GatherInfoHandle implements GatherInfoService {
652 //车辆过卡信息缓存删除-X22金二判定时候生成的这个缓存 668 //车辆过卡信息缓存删除-X22金二判定时候生成的这个缓存
653 gatherInfoHandle.redisService.del(info.getSeqno()); 669 gatherInfoHandle.redisService.del(info.getSeqno());
654 log.info("[流转缓存]-{}缓存已核销",vaName); 670 log.info("[流转缓存]-{}缓存已核销",vaName);
  671 + //核销记录
  672 + releaseRecord();
655 } 673 }
656 674
657 /** 675 /**