wlxxpt / customAnalysis · 提交

转到一个项目

作者 朱兆平
提交 5cfdd1709511f07a26e36b4ed2f10477eb9ac6fb 1 个父辈 d69213f7

模板bug修复

内嵌 并排对比
正在显示 4 个修改的文件 包含 81 行增加 和 17 行删除
@@ -152,9 +152,11 @@ customs: @@ -152,9 +152,11 @@ customs:
152 #生成报文文件夹路径,尾部要带斜杠/ 152 #生成报文文件夹路径,尾部要带斜杠/
153 xml-save: transarriveSend/ 153 xml-save: transarriveSend/
154 # 客户端统一编号 154 # 客户端统一编号
155 - clientSeqno: "000000000000002050" 155 +# clientSeqno: "000000000000002050"
  156 + clientSeqno: "000000000000057246"
  157 +# clientSeqno: 460470678920X_DXPENT0000460002
156 # 邮箱客户端id 158 # 邮箱客户端id
157 - hostId: 111 159 + hostId: DXPENT0000460002
158 # 当前操作员ic卡证书号 160 # 当前操作员ic卡证书号
159 certNo: 111 161 certNo: 111
160 162
@@ -19,7 +19,11 @@ @@ -19,7 +19,11 @@
19 <druid.version>1.1.9</druid.version> 19 <druid.version>1.1.9</druid.version>
20 <spring-cloud.version>Greenwich.BUILD-SNAPSHOT</spring-cloud.version> 20 <spring-cloud.version>Greenwich.BUILD-SNAPSHOT</spring-cloud.version>
21 <lombok_sersion>1.18.6</lombok_sersion> 21 <lombok_sersion>1.18.6</lombok_sersion>
  22 + <fastJson_version>1.2.75</fastJson_version>
22 <swagger2_version>2.9.2</swagger2_version> 23 <swagger2_version>2.9.2</swagger2_version>
  24 + <spring_tomcat_version>9.0.35</spring_tomcat_version>
  25 + <logback.verion>1.2.9</logback.verion>
  26 + <jackson.verion>2.10.5</jackson.verion>
23 </properties> 27 </properties>
24 <dependencies> 28 <dependencies>
25 <!--spring boot--> 29 <!--spring boot-->
@@ -38,14 +42,69 @@ @@ -38,14 +42,69 @@
38 </dependency> 42 </dependency>
39 <dependency> 43 <dependency>
40 <groupId>org.springframework.boot</groupId> 44 <groupId>org.springframework.boot</groupId>
41 - <artifactId>spring-boot-starter-websocket</artifactId>  
42 - <exclusions>  
43 - <exclusion>  
44 - <groupId>org.springframework.boot</groupId>  
45 - <artifactId>spring-boot-starter</artifactId>  
46 - </exclusion>  
47 - </exclusions> 45 + <artifactId>spring-boot-starter-web</artifactId>
  46 + </dependency>
  47 + <!--安防升级部分-->
  48 + <!--<spring_tomcat_version>9.0.35</spring_tomcat_version>-->
  49 + <dependency>
  50 + <groupId>org.apache.tomcat.embed</groupId>
  51 + <artifactId>tomcat-embed-core</artifactId>
  52 + <version>${spring_tomcat_version}</version>
  53 + </dependency>
  54 + <dependency>
  55 + <groupId>org.apache.tomcat.embed</groupId>
  56 + <artifactId>tomcat-embed-el</artifactId>
  57 + <version>${spring_tomcat_version}</version>
  58 + </dependency>
  59 + <dependency>
  60 + <groupId>org.apache.tomcat.embed</groupId>
  61 + <artifactId>tomcat-embed-websocket</artifactId>
  62 + <version>${spring_tomcat_version}</version>
  63 + </dependency>
  64 + <dependency>
  65 + <groupId>org.apache.tomcat</groupId>
  66 + <artifactId>tomcat-annotations-api</artifactId>
  67 + <version>${spring_tomcat_version}</version>
  68 + </dependency>
  69 + <!--<logback.verion>1.2.9</logback.verion>-->
  70 + <dependency>
  71 + <groupId>ch.qos.logback</groupId>
  72 + <artifactId>logback-core</artifactId>
  73 + <version>${logback.verion}</version>
  74 + </dependency>
  75 + <dependency>
  76 + <groupId>ch.qos.logback</groupId>
  77 + <artifactId>logback-classic</artifactId>
  78 + <version>${logback.verion}</version>
  79 + </dependency>
  80 + <dependency>
  81 + <groupId>com.thoughtworks.xstream</groupId>
  82 + <artifactId>xstream</artifactId>
  83 + <version>1.4.17</version>
48 </dependency> 84 </dependency>
  85 + <!--<fastJson_version>1.2.75</fastJson_version>-->
  86 + <dependency>
  87 + <groupId>com.alibaba</groupId>
  88 + <artifactId>fastjson</artifactId>
  89 + <version>${fastJson_version}</version>
  90 + </dependency>
  91 + <dependency>
  92 + <groupId>com.fasterxml.jackson.core</groupId>
  93 + <artifactId>jackson-databind</artifactId>
  94 + <version>${jackson.verion}</version>
  95 + </dependency>
  96 + <!--<jackson.verion>2.10.5</jackson.verion>-->
  97 + <dependency>
  98 + <groupId>com.fasterxml.jackson.core</groupId>
  99 + <artifactId>jackson-core</artifactId>
  100 + <version>${jackson.verion}</version>
  101 + </dependency>
  102 + <dependency>
  103 + <groupId>com.fasterxml.jackson.core</groupId>
  104 + <artifactId>jackson-annotations</artifactId>
  105 + <version>${jackson.verion}</version>
  106 + </dependency>
  107 + <!--安防升级部分结束-->
49 <dependency> 108 <dependency>
50 <groupId>org.springframework.boot</groupId> 109 <groupId>org.springframework.boot</groupId>
51 <artifactId>spring-boot-starter-test</artifactId> 110 <artifactId>spring-boot-starter-test</artifactId>
@@ -79,11 +138,6 @@ @@ -79,11 +138,6 @@
79 <artifactId>pagehelper-spring-boot-starter</artifactId> 138 <artifactId>pagehelper-spring-boot-starter</artifactId>
80 <version>1.2.5</version> 139 <version>1.2.5</version>
81 </dependency> 140 </dependency>
82 - <dependency>  
83 - <groupId>com.alibaba</groupId>  
84 - <artifactId>fastjson</artifactId>  
85 - <version>1.2.51</version>  
86 - </dependency>  
87 <!--&lt;!&ndash; mysql&ndash;&gt;--> 141 <!--&lt;!&ndash; mysql&ndash;&gt;-->
88 <!--<dependency>--> 142 <!--<dependency>-->
89 <!--<groupId>mysql</groupId>--> 143 <!--<groupId>mysql</groupId>-->
  1 +package com.tianbo.analysis.tools;
  2 +
  3 +/**
  4 + * @author mrz
  5 + * @date 20220208
  6 + */
  7 +public class TransArriveTools {
  8 +}
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 水运中转模式选填 20 水运中转模式选填
21 运抵编号规则:4位申报地海关代码+2位卸货地代码+6位编号生成日期〔顺序为年（2位）、月（2位）、日（2位）〕+6位流水号';）--> 21 运抵编号规则:4位申报地海关代码+2位卸货地代码+6位编号生成日期〔顺序为年（2位）、月（2位）、日（2位）〕+6位流水号';）-->
22 <ArriveNo th:text="*{arriveno}">${运抵编号}</ArriveNo> 22 <ArriveNo th:text="*{arriveno}">${运抵编号}</ArriveNo>
23 - <!-- 集装箱货物必填；非集装箱货物填H2000 --> 23 + <!-- 集装箱货物必填；非集装箱货物填H2000或者不填写-->
24 <ContaId th:text="*{contaid}">${集装箱编号}</ContaId> 24 <ContaId th:text="*{contaid}">${集装箱编号}</ContaId>
25 <!-- 北方模式选填 25 <!-- 北方模式选填
26 南方模式汽车运输的填报车牌号 26 南方模式汽车运输的填报车牌号
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 <PackNo th:text="*{packno}">${托运件数}</PackNo> 42 <PackNo th:text="*{packno}">${托运件数}</PackNo>
43 <GrossWt th:text="*{grosswt}">${托运重量}</GrossWt> 43 <GrossWt th:text="*{grosswt}">${托运重量}</GrossWt>
44 <UnloadCode th:text="*{unloadcode}">${卸货地代码}</UnloadCode> 44 <UnloadCode th:text="*{unloadcode}">${卸货地代码}</UnloadCode>
45 - <ArriveTime th:text="*{#dates.format(arrivetime,'yyyyMMddhhmmss')}">${到达卸货地时间}</ArriveTime> 45 + <ArriveTime th:text="*{#dates.format(arrivetime,'yyyyMMddHHmmss')}">${到达卸货地时间}</ArriveTime>
46 <!-- 集装箱（器）尺寸和类FFF/*0型:集装箱货物必填 46 <!-- 集装箱（器）尺寸和类FFF/*0型:集装箱货物必填
47 非集装箱货物免填 --> 47 非集装箱货物免填 -->
48 <ContaType th:text="*{contatype}">${集装器尺寸}</ContaType> 48 <ContaType th:text="*{contatype}">${集装器尺寸}</ContaType>
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 <!-- A：暂存，C:申报 --> 54 <!-- A：暂存，C:申报 -->
55 <OperType th:text="*{opertype}">${申报类型}</OperType> 55 <OperType th:text="*{opertype}">${申报类型}</OperType>
56 <Sign th:text="*{sign}">${签名信息}</Sign> 56 <Sign th:text="*{sign}">${签名信息}</Sign>
57 - <SignDate th:text="*{#dates.format(signdate,'yyyyMMddhhmmss')}">${签名日期}</SignDate> 57 + <SignDate th:text="*{#dates.format(signdate,'yyyyMMddHHmmss')}">${签名日期}</SignDate>
58 <ClientSeqNo th:text="*{clientseqno}">${客户端统一编号}</ClientSeqNo> 58 <ClientSeqNo th:text="*{clientseqno}">${客户端统一编号}</ClientSeqNo>
59 <HostId th:text="*{hostid}">${邮箱客户端ID}</HostId> 59 <HostId th:text="*{hostid}">${邮箱客户端ID}</HostId>
60 <CertNo th:text="*{certno}">${当前操作员IC卡证书号}</CertNo> 60 <CertNo th:text="*{certno}">${当前操作员IC卡证书号}</CertNo>