Browse Source

81报文修改

linbl 4 weeks ago
parent
commit
6519e2ab85

+ 10 - 5
src/main/java/com/gzlh/bus/thread/Sub81Thread.java

@@ -22,6 +22,7 @@ import org.w3c.dom.Document;
 import javax.xml.xpath.XPathConstants;
 import java.io.*;
 import java.net.Socket;
+import java.util.Date;
 
 @Slf4j
 public class Sub81Thread implements Runnable {
@@ -50,10 +51,14 @@ public class Sub81Thread implements Runnable {
         }
         LedOptions ledOptions = new LedOptions();
         ledOptions.setLine("02");
-        xml81Data.setCHANNEL_CODE(channelSetting.getChannelCode()).setI_E_FLAG(channelSetting.getIeFlag())
-                .setAREA_ID(channelSetting.getPlaceCode()).setPLATE_D(reqBO.getCarNo())
-                .setVEHICLE_WEIGHT_DATA(reqBO.getWeight() + "")
-                .setVEHICLE_RFID_DATA(reqBO.getEri()).setPLATE_PATH(img);
+        xml81Data.setOPERATE_TIME(new Date())
+                .setCHNL_NO(channelSetting.getChannelCode())
+                .setI_E_FLAG(channelSetting.getIeFlag())
+                .setAREA_ID(channelSetting.getPlaceCode())
+                .setVE_LICENSE_NO(reqBO.getCarNo())
+                .setGROSS_WT(reqBO.getWeight() + "")
+                .setRFID_ID(reqBO.getEri())
+                .setPHOTO_PERSPECTIVE(img);
         try (Socket socket = new Socket(SysConfig.socketSetting.getHost(), SysConfig.socketSetting.getPort());
              OutputStream os = socket.getOutputStream();
              OutputStreamWriter osw = new OutputStreamWriter(os, ENCODING);
@@ -85,7 +90,7 @@ public class Sub81Thread implements Runnable {
             }
             String response = responseBuffer.toString(ENCODING);
             Document document = XmlUtil.parseXml(response);
-            String SESSION_ID_DATA = xml81Data.getSESSION_ID_DATA();
+            String SESSION_ID_DATA = xml81Data.getSESSION_ID();
             String sessionId = StrUtil.toString(XmlUtil.getByXPath("//GATHER_FEEDBACK//SESSION_ID", document, XPathConstants.STRING));
             if (!StrUtil.equals(sessionId, SESSION_ID_DATA)) {
                 log.error("-----异常会话-----");

+ 46 - 17
src/main/java/com/gzlh/config/parser81/Xml81Data.java

@@ -15,39 +15,68 @@ public class Xml81Data {
      */
     private String I_E_FLAG = "";
     /**
-     * 通道
+     * 场站编
      */
-    private String CHANNEL_CODE = "";
     private String AREA_ID = "";
     /**
-     *<!--通道业务类型,通常为A,已经读取-->
+     * 通道号
      */
-    private String PASS_METHOD = "A";
+    private String CHNL_NO = "";
+    /**
+     * 采集方式:A 自动,M 人工补采。B 由后台人工录入验放
+     */
+    private String GETHER_MODE = "";
     /**
      * <!--会话编号,自动生成-->
      */
-    private String SESSION_ID_DATA = DateUtil.format(new Date(), "yyyyMMddHHmmss")+ RandomUtil.randomNumbers(6) ;
+    private String SESSION_ID = DateUtil.format(new Date(), "yyyyMMddHHmmss")+ RandomUtil.randomNumbers(6) ;
+    /**
+     * 地磅称重
+     */
+    private String GROSS_WT = "";
+    /**
+     * 电子车牌 ID
+     */
+    private String RFID_ID = "";
+    /**
+     * 图片url,多图用分号分隔
+     */
+    private String PHOTO_PERSPECTIVE = "";
+    /**
+     * 操作时间
+     */
+    private Date OPERATE_TIME;
+    /**
+     * 国内车牌号
+     */
+    private String DOMESTIC_LICENSE_NO = "";
+    /**
+     * 境外车牌号
+     */
+    private String FOREIGN_LICENSE_NO = "";
+    /**
+     * 车牌号
+     */
+    private String VE_LICENSE_NO = "";
     /**
-     * <!--读取到的IC卡号-->
+     * 箱号,双箱分号;分隔
      */
-    private String VEHICLE_IC_DATA = "";
-    private String IC_GOODS_NAME = "";
-    private String IC_BILL_NO = "";
+    private String CONTA_ID = "";
     /**
-     * <!--读取到的车牌号信息-->
+     * 前箱号
      */
-    private String PLATE_D = "";
+    private String CONTA_ID_F = "";
     /**
-     * <!--读取到的地磅重量-->
+     * 后箱号
      */
-    private String VEHICLE_WEIGHT_DATA = "";
+    private String CONTA_ID_B = "";
     /**
-     * <!--RFID卡号信息-->
+     * 前箱型
      */
-    private String VEHICLE_RFID_DATA = "";
+    private String CONTA_TYPE_F = "";
     /**
-     * <!--车牌图片保存路径,如有箱号,有箱号图片路径-->
+     * 后箱型
      */
-    private String PLATE_PATH = "";
+    private String CONTA_TYPE_B = "";
 
 }

+ 26 - 56
src/main/resources/81.xml

@@ -1,58 +1,28 @@
 <?xml version="1.0" encoding="GB2312"?>
 <GATHER_INFO>
-<!--进出标识,I进E出-->
-<I_E_FLAG>{I_E_FLAG}</I_E_FLAG>
-<!--场站号,固定写为场所分配的场站号-->
-<AREA_ID>{AREA_ID}</AREA_ID>
-<!--通道号,已经从通道号配置文件中读取-->
-<CHNL_NO>{CHANNEL_CODE}</CHNL_NO>
-<!--通道业务类型,通常为A,已经读取-->
-<GETHER_MODE>{PASS_METHOD}</GETHER_MODE>
-<!--会话编号,自动生成-->
-<SESSION_ID>{SESSION_ID_DATA}</SESSION_ID>
-<!--IC卡配置信息-->
-<IC_INFO>
-<!--读取到的IC卡号-->
-<IC_ID>{VEHICLE_IC_DATA}</IC_ID>
-<IC_GOODS_NAME>{IC_GOODS_NAME}</IC_GOODS_NAME>
-<IC_BILL_NO>{IC_BILL_NO}</IC_BILL_NO>
-<IC_NO></IC_NO>
-<IC_Type></IC_Type>
-<IC_EXTENDED_CONTENT></IC_EXTENDED_CONTENT>
-</IC_INFO>	
-<DR_CUSTOMS_NO></DR_CUSTOMS_NO>
-<VE_CUSTOMS_NO></VE_CUSTOMS_NO>
-<!--读取到的车牌号信息-->
-<VE_LICENSE_NO>{PLATE_D}</VE_LICENSE_NO>
-<ESEAL_ID></ESEAL_ID>
-<!--读取到的地磅重量-->
-<GROSS_WT>{VEHICLE_WEIGHT_DATA}</GROSS_WT>
-<!--RFID信息-->
-<VE_RFID>
-<!--RFID卡号信息-->
-<RFID_ID>{VEHICLE_RFID_DATA}</RFID_ID>
-<!--RFID绑定的光学车牌信息-->
-<VE_LICENSE_NO>{PLATE_D}</VE_LICENSE_NO>
-<VE_CUSTOMS_NO></VE_CUSTOMS_NO>
-<VE_WT></VE_WT>
-<VE_COMPANY></VE_COMPANY>
-<VE_PERFORMANCE></VE_PERFORMANCE>
-</VE_RFID>	
-<DR_RFID>
-<RFID_ID>{VEHICLE_RFID_DATA}</RFID_ID>
-<DR_NAME></DR_NAME>
-<DR_CUSTOMS_NO></DR_CUSTOMS_NO>
-<DR_COMPANY></DR_COMPANY>
-<DR_PERFORMANCE></DR_PERFORMANCE>
-</DR_RFID>	
-<OPERATOR_ID></OPERATOR_ID>
-<OPERATE_TIME></OPERATE_TIME>	
-<VE_LICENSE_RECOGNITION>
-<DOMESTIC_LICENSE_NO>{PLATE_D}</DOMESTIC_LICENSE_NO>
-<!--车牌图片保存路径,如有箱号,有箱号图片路径-->
-<DOMESTIC_LICENSE_COLOR>{PLATE_PATH}</DOMESTIC_LICENSE_COLOR>
-<FOREIGN_LICENSE_NO>{PLATE_D}</FOREIGN_LICENSE_NO>
-<FOREIGN_LICENSE_COLOR>{PLATE_PATH}</FOREIGN_LICENSE_COLOR>
-<CONFIDENCE_RATIO> </CONFIDENCE_RATIO>
-</VE_LICENSE_RECOGNITION>
-</GATHER_INFO>
+    <I_E_FLAG>{I_E_FLAG}</I_E_FLAG>
+    <AREA_ID>{AREA_ID}</AREA_ID>
+    <CHNL_NO>{CHNL_NO}</CHNL_NO>
+    <GETHER_MODE>{GETHER_MODE}</GETHER_MODE>
+    <SESSION_ID>{SESSION_ID}</SESSION_ID>
+    <GROSS_WT>{GROSS_WT}</GROSS_WT>
+    <VE_RFID>
+        <RFID_ID>{RFID_ID}</ RFID_ID>
+    </VE_RFID>
+    <PHOTO>
+        <PHOTO_PERSPECTIVE>{PHOTO_PERSPECTIVE}</PHOTO_PERSPECTIVE>
+    </PHOTO>
+    <OPERATE_TIME>{OPERATE_TIME}</OPERATE_TIME>
+    <VE_LICENSE_RECOGNITION>
+        <DOMESTIC_LICENSE_NO></DOMESTIC_LICENSE_NO>
+        <FOREIGN_LICENSE_NO></FOREIGN_LICENSE_NO>
+    </VE_LICENSE_RECOGNITION>
+    <VE_LICENSE_NO>{VE_LICENSE_NO}</VE_LICENSE_NO>
+    <CONTA_ID></CONTA_ID>
+    <CONTA_RECOGNITION>
+        <CONTA_ID_F></CONTA_ID_F>
+        <CONTA_ID_B></CONTA_ID_B>
+        <CONTA_TYPE_F></CONTA_TYPE_F>
+        <CONTA_TYPE_B></CONTA_TYPE_B>
+    </CONTA_RECOGNITION>
+</GATHER_INFO>