增加金二验放规则及金二放行指令

朱兆平
src/main/java/com/sy/IMF/IMF_Tesk.java
src/main/java/com/sy/handle/G2FeedBackHandel.java
src/main/java/com/sy/service/impl/CommandLogImpl.java
src/main/java/com/sy/service/impl/EnginCheckServiceImpl.java
src/test/java/com/sy/Base64Test.java
update.md
--- a/src/main/java/com/sy/IMF/IMF_Tesk.java
查看文件 @05eae03
+++ b/src/main/java/com/sy/IMF/IMF_Tesk.java
查看文件 @05eae03
@@ -18,7 +18,7 @@ public class IMF_Tesk {
     public static IMFClient client = null;
     //todo:测试关,生产开
-//    @Scheduled(fixedRate = 5000)
+    @Scheduled(fixedRate = 5000)
     private static void start() {
         //尝试catch SDK异常
         try{
--- a/src/main/java/com/sy/handle/G2FeedBackHandel.java
查看文件 @05eae03
+++ b/src/main/java/com/sy/handle/G2FeedBackHandel.java
查看文件 @05eae03
@@ -68,6 +68,7 @@ public class G2FeedBackHandel extends Thread {
                         messageRouterG2.faild(gatherInfo,x82Feedback.getOpHint());
                     }
                 }else {
+                    //没从缓存中取到过卡采集报文,就直接转,然后记录,同时给LED指示内容
                     GatherInfo gatherInfo1 = x82Service.X82FeedBackToX21GatherInfo(x82Feedback);
                     messageRouterG2.faild(gatherInfo1,x82Feedback.getOpHint());
                 }
--- a/src/main/java/com/sy/service/impl/CommandLogImpl.java
查看文件 @05eae03
+++ b/src/main/java/com/sy/service/impl/CommandLogImpl.java
查看文件 @05eae03
@@ -56,7 +56,12 @@ public class CommandLogImpl implements CommandLogService {
         command.setVeName(info.getVename());
         command.setVeWeight(selfWt);
         command.setIeType(info.getIetype());
+        if(info.getGrosswt()!=null){
             command.setExitGrossWeight(info.getGrosswt().doubleValue());
+        }else {
+            command.setExitGrossWeight(0.0);
+        }
+
         command.setInGrossWeight(inWt);
         command.setGoodsWeight(goodsWt);
         command.setActualGoodsWeight(diffVal);
--- a/src/main/java/com/sy/service/impl/EnginCheckServiceImpl.java
查看文件 @05eae03
+++ b/src/main/java/com/sy/service/impl/EnginCheckServiceImpl.java
查看文件 @05eae03
@@ -146,8 +146,14 @@ public class EnginCheckServiceImpl implements EnginCheckService {
         }
         //获取申请单表体
+        String landBusinessJson = "";
+        if (StringUtils.isNotEmpty(gatherInfo.getVename())) {
             log.info("[FORM-CACHE-GET]:车辆-{}核碰缓存",gatherInfo.getVename());
-        String landBusinessJson = redisService.get(gatherInfo.getVename());
+            landBusinessJson = redisService.get(gatherInfo.getVename());
+        }else {
+            log.info("[FORM-CACHE-GET]:车辆未获取到车牌号,seqno:{}",gatherInfo.getSeqno());
+        }
+
         if (StringUtils.isNotEmpty(landBusinessJson)) {
             //这个是申请单表体
             List<LandBusinessTypeList> list = JSONArray.parseArray(landBusinessJson, LandBusinessTypeList.class);
@@ -311,7 +317,11 @@ public class EnginCheckServiceImpl implements EnginCheckService {
         command.setVeName(info.getVename());
         command.setVeWeight(selfWt);
         command.setIeType(info.getIetype());
+        if(info.getGrosswt()!=null){
             command.setExitGrossWeight(info.getGrosswt().doubleValue());
+        }else {
+            command.setExitGrossWeight(0.0);
+        }
         command.setInGrossWeight(inWt);
         command.setGoodsWeight(goodsWt);
         command.setActualGoodsWeight(diffVal);
--- a/src/test/java/com/sy/Base64Test.java
查看文件 @05eae03
+++ b/src/test/java/com/sy/Base64Test.java
查看文件 @05eae03
@@ -25,7 +25,7 @@ public class Base64Test {
     @Test
     public void base64Decode(){
-        String testcode = "PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz48R0FUSEVSX0ZFRURCQUNLIHhtbG5zPSJodHRwOi8vcnBiLmN1c3RvbXMuZ292LmNuL2NvbW1vbi9Gcm9udEVuZFNjaGVtYXMvIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIj48QVJFQV9JRD40NjA0MDAwMDA2PC9BUkVBX0lEPjxDSE5MX05PPjQ2MDQwMDEyMjMyPC9DSE5MX05PPjxTRVNTSU9OX0lEPjIwMjIwNjMwMTg0NDQxMDAwMDI4PC9TRVNTSU9OX0lEPjxGRUVEQkFDS19USU1FPjIwMjMtMDgtMjAgMTU6MDc6MTY8L0ZFRURCQUNLX1RJTUU+PENIRUNLX1JFU1VMVD4wPC9DSEVDS19SRVNVTFQ+PE9QX0hJTlQ+55S15a2Q6L2m54mMOjrkuI3mlL7ooYzvvJrmib7kuI3liLDlr7nlupTnmoTmoLjmlL7ljZXvvIzkuI3kuojmlL7ooYw8L09QX0hJTlQ+PC9HQVRIRVJfRkVFREJBQ0s+";
+        String testcode = "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPEdBVEhFUl9JTkZPIHhtbG5zPSJodHRwOi8vcnBiLmN1c3RvbXMuZ292LmNuL2NvbW1vbi9Gcm9udEVuZFNjaGVtYXMvIgogICAgeG1sbnM6eHNpPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSIKICAgIHhzaTpzY2hlbWFMb2NhdGlvbj0iaHR0cDovL3JwYi5jdXN0b21zLmdvdi5jbi9jb21tb24vRnJvbnRFbmRTY2hlbWFzLyI+CiAgICA8SV9FX0ZMQUc+RTwvSV9FX0ZMQUc+CiAgICA8QVJFQV9JRD40NjA0NjAwMDAwPC9BUkVBX0lEPgogICAgPENITkxfTk8+NDYwNDYwMDAyMDwvQ0hOTF9OTz4KICAgIDxHRVRIRVJfTU9ERT5BPC9HRVRIRVJfTU9ERT4KICAgIDxTRVNTSU9OX0lEPjIwMjMwODIzMTIxMzE3Mjg3MDAzPC9TRVNTSU9OX0lEPgogICAgPElDX0lORk8+CiAgICAgICA8SUNfSUQ+PC9JQ19JRD4KICAgICAgICA8SUNfTk8+PC9JQ19OTz4KICAgICAgICA8SUNfVFlQRT48L0lDX1RZUEU+CiAgICAgICAgPElDX0VYVEVOREVEX0NPTlRFTlQ+PC9JQ19FWFRFTkRFRF9DT05URU5UPgogICAgPC9JQ19JTkZPPgogICAgPEZPUk1fSU5GTz4KICAgICAgICA8Rk9STV9UWVBFPjwvRk9STV9UWVBFPgogICAgICAgIDxGT1JNX0lEPjwvRk9STV9JRD4KICAgIDwvRk9STV9JTkZPPgogICAgPFZFX0xJQ0VOU0VfTk8+6LGrQTI5NThHPC9WRV9MSUNFTlNFX05PPgogICAgPEdST1NTX1dUPjg3MDA8L0dST1NTX1dUPgogICAgPFZFX1JGSUQ+CiAgICAgICAgPFJGSURfSUQ+RTAwNDAwMDBEQzVDMzIwODwvUkZJRF9JRD4KICAgICAgICA8VkVfTElDRU5TRV9OTz7osatBMjk1OEc8L1ZFX0xJQ0VOU0VfTk8+CiAgICAgICAgPFZFX0NVU1RPTVNfTk8+PC9WRV9DVVNUT01TX05PPgogICAgICAgIDxWRV9XVD43NzAwPC9WRV9XVD4KICAgICAgICA8VkVfQ09NUEFOWT48L1ZFX0NPTVBBTlk+CiAgICAgICAgPFZFX1BFUkZPUk1BTkNFPjE8L1ZFX1BFUkZPUk1BTkNFPgogICAgPC9WRV9SRklEPgogICAgPE9QRVJBVEVfVElNRT4yMDIzLTA4LTIzIDEyOjEzOjI1PC9PUEVSQVRFX1RJTUU+CjwvR0FUSEVSX0lORk8+Cg==";
         byte[] base64decodedBytes = Base64.getDecoder().decode(testcode);
         try {
             System.out.println("解密后的信息为:"+new String(base64decodedBytes, "utf-8"));
--- a/update.md
查看文件 @05eae03
+++ b/update.md
查看文件 @05eae03
@@ -76,13 +76,41 @@
 # VER 6.1 Date:2023-08-21 周三
     - 功能
-        ## 新增金二验放规则
-        ## 新增金二回执处理接口
-        ## 针对双验放规则进行升级改造
-        ## 做一线进出口业务的需要备案电子车牌信息
+        1. 新增金二验放规则
+        2. 新增金二回执处理接口
+        3. 针对双验放规则进行升级改造
+        4. 做一线进出口业务的需要备案电子车牌信息
+        5. 车辆备案管理新增电子车牌字段
+        6. 场站管理新增金二场站代码字段
+        7. 卡口管理新增金二通道代码等字段
     - 数据库
         1. 车辆备案表新增电子车牌字段
+            增加电子车牌号 数据表“land_road_ve_record”新增字段“VE_CUSTOMS_NO”
+        2. 场站表增加了金二场站代码字段
+            数据库yard新增stationIdG2（金二场站编码）字段
+        3. 通道表增加了金二通道字段
+            数据库bayonet新增channel_g2（金二通道编号）、type_io（通道内部通道、主通道类型 I 内 O 主）字段
+        4. 新增货物类型管理 数据表”land_config_goods_type“
     - 验放服务
         1. 增加熔断器配置项 
             # 设置 Hystrix 的超时时间为 5000 毫秒
         hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=5000
+        2. 新增金二通道验放规则
+        3. 新增金二验放指令接收及判定接口
+    - 申报管理服务
+        1. 车辆备案管理增加车辆电子车牌信息管理
+        2. 取消特殊业务绑定通道号，改为生成场站所有通道信息
+    - 场站管理服务
+        1. 场站管理增加金二场站代码管理
+        2. 通道管理增加金二通道代码管理
+    - 前端
+        1. 场站管理增加金二场站代码管理
+        2. 通道管理增加金二通道代码管理
+        3. 车辆备案增加电子车牌信息管理
+    - 新增机场端IBMMQ金二报文交互服务 (部署在机场卡口服务器)
+        1. 发送X81报文
+        2. 接收X82报文
+        3. 与验放服务交互
+    - 新增海关端IBMMQ金二报文交互服务
+        1. 接收并申报X81报文到金二特殊区域接口
+        2. 接收X82放行回执并回写到回执队列