wlxxpt / customAnalysis · 提交

转到一个项目

作者 朱兆平
提交 7e50bb353bc23ed81d6a107b068bb962a7323cd1 1 个父辈 c239d025

更改配置信息

内嵌 并排对比
正在显示 4 个修改的文件 包含 45 行增加 和 333 行删除
... ... @@ -22,7 +22,7 @@ spring:
static-locations: classpath:/META-INF/resources/,classpath:/static,classpath:/resources/,classpath:/public/,file:${web.upload-path}
application:
name: customAnalysisReception
name: WLTP-NMMS-CUSTOM-RECIPTION-RESOLVER
jackson:
serialization:
... ... @@ -49,7 +49,7 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource
#oracle
driver-class-name: oracle.jdbc.OracleDriver
url: jdbc:oracle:thin:@10.50.3.69:1521:CGODB
url: jdbc:oracle:thin:@218.28.199.134:8004banner.txt:CGODB
username: CGONMS
password: 1q2w3e4r
#spring datasource mysql，注意编码配置，缺少数据库编码配置容易引起中文入库乱码
... ... @@ -135,6 +135,7 @@ custom:
receptDirectory: /Users/mrz/Downloads/rdp_temp
#回执解析成功后的备份目录
receptBakDir: ./success
#解析错误报文的备份目录
errBakDir: ./error
devops:
dir:
... ...
${AnsiColor.YELLOW}
##################*CETC-TIANBO*#########################
.::::.
.::::::::.
:::::::::::
..:::::::::::'
'::::::::::::'
.::::::::::
'::::::::::::::..
..::::::::::::.
``::::::::::::::::
::::``:::::::::' .:::.
::::' ':::::' .::::::::.
.::::' :::: .:::::::'::::.
.:::' ::::: .:::::::::' ':::::.
.::' :::::.:::::::::' ':::::.
.::' ::::::::::::::' ``::::.
...::: ::::::::::::' ``::.
```` ':. ':::::::::' ::::..
'.:::::' ':'````..
#########################################################
==================================================
Application Info：${application.title}
ver:${application.version}
Powered by：Spring Boot ${spring-boot.version}
\ No newline at end of file
... ...
... ... @@ -4,8 +4,8 @@
"http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
<generatorConfiguration>
<!-- 数据库驱动:选择你的本地硬盘上面的数据库驱动包-->
<!--<classPathEntry location="/Users/mrz/Downloads/mybatis-generator-core-1.3.2/lib/mysql-connector-java-5.1.25-bin.jar"/>-->
<classPathEntry location="/Users/mrz/Documents/maven/ojdbc6.jar"/>
<classPathEntry location="/Users/mrz/Downloads/mybatis-generator-core-1.3.2/lib/mysql-connector-java-5.1.25-bin.jar"/>
<!--<classPathEntry location="/Users/mrz/Documents/maven/ojdbc6.jar"/>-->
<context id="DB2Tables" targetRuntime="MyBatis3">
<commentGenerator>
<property name="suppressDate" value="true"/>
... ... @@ -13,16 +13,16 @@
<property name="suppressAllComments" value="true"/>
</commentGenerator>
<!--数据库链接URL，用户名、密码 -->
<!--<jdbcConnection driverClass="com.mysql.jdbc.Driver"-->
<!--connectionURL="jdbc:mysql://127.0.0.1:3307/statistics"-->
<!--userId="root"-->
<!--password="">-->
<!--</jdbcConnection>-->
<jdbcConnection driverClass="oracle.jdbc.driver.OracleDriver"
connectionURL="jdbc:oracle:thin:@218.28.199.134:8004:CGODB"
userId="CGONMS"
password="1q2w3e4r">
<jdbcConnection driverClass="com.mysql.jdbc.Driver"
connectionURL="jdbc:mysql://118.31.66.166:3306/WLPT_NMMS"
userId="110"
password="QAHqCJf2kFYCLirM">
</jdbcConnection>
<!--<jdbcConnection driverClass="oracle.jdbc.driver.OracleDriver"-->
<!--connectionURL="jdbc:oracle:thin:@218.28.199.134:8004:CGODB"-->
<!--userId="CGONMS"-->
<!--password="1q2w3e4r">-->
<!--</jdbcConnection>-->
<!-- 默认false，把JDBC DECIMAL 和 NUMERIC 类型解析为 Integer，为 true时把JDBC DECIMAL 和
NUMERIC 类型解析为java.math.BigDecimal -->
<!--<javaTypeResolver>-->
... ... @@ -45,6 +45,6 @@
<property name="enableSubPackages" value="true"/>
</javaClientGenerator>
<!-- 要生成的表 tableName是数据库中的表名或视图名 domainObjectName是实体类名-->
<table tableName="originmanifestsecondary" domainObjectName="originmanifestsecondary" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>
<table tableName="CUSTOM_RESPONSE" domainObjectName="CUSTOM_RESPONSE" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>
</context>
</generatorConfiguration>
\ No newline at end of file
... ...
... ... @@ -964,325 +964,6 @@
UNLODINGCODE = #{unlodingcode,jdbcType=VARCHAR}
where ID = #{id,jdbcType=DECIMAL}
</update>
<!--<resultMap id="BaseResultMap" type="com.tianbo.analysis.model.PREPARESECONDARY">-->
<!--<result column="AUTOID" jdbcType="VARCHAR" property="autoid" />-->
<!--<result column="WAYBILLNOMASTER" jdbcType="VARCHAR" property="waybillnomaster" />-->
<!--<result column="WAYBILLNOSECONDARY" jdbcType="VARCHAR" property="waybillnosecondary" />-->
<!--<result column="TOTALWEIGHT" jdbcType="VARCHAR" property="totalweight" />-->
<!--<result column="TOTALPIECE" jdbcType="VARCHAR" property="totalpiece" />-->
<!--<result column="PREPAREPIECE" jdbcType="VARCHAR" property="preparepiece" />-->
<!--<result column="PREPAREWEIGHT" jdbcType="VARCHAR" property="prepareweight" />-->
<!--<result column="CREATEDATE" jdbcType="TIMESTAMP" property="createdate" />-->
<!--<result column="PREPAREMASTERID" jdbcType="VARCHAR" property="preparemasterid" />-->
<!--<result column="CARRIER" jdbcType="VARCHAR" property="carrier" />-->
<!--<result column="FLIGHTNO" jdbcType="VARCHAR" property="flightno" />-->
<!--<result column="FLIGHTDATE" jdbcType="TIMESTAMP" property="flightdate" />-->
<!--<result column="ORIGINATINGSTATION" jdbcType="VARCHAR" property="originatingstation" />-->
<!--<result column="DESTINATIONSTATION" jdbcType="VARCHAR" property="destinationstation" />-->
<!--<result column="CUSTOMSSTATUS" jdbcType="VARCHAR" property="customsstatus" />-->
<!--<result column="PAYMODE" jdbcType="VARCHAR" property="paymode" />-->
<!--<result column="PRODUCTNAME" jdbcType="VARCHAR" property="productname" />-->
<!--<result column="STOWAGEDATE" jdbcType="TIMESTAMP" property="stowagedate" />-->
<!--<result column="CUSTOMSCODE" jdbcType="VARCHAR" property="customscode" />-->
<!--<result column="SHIPPERNAME" jdbcType="VARCHAR" property="shippername" />-->
<!--<result column="SHIPPERCITY" jdbcType="VARCHAR" property="shippercity" />-->
<!--<result column="SHIPPERADDRESS" jdbcType="VARCHAR" property="shipperaddress" />-->
<!--<result column="CONSIGNEENAME" jdbcType="VARCHAR" property="consigneename" />-->
<!--<result column="CONSIGNEECITY" jdbcType="VARCHAR" property="consigneecity" />-->
<!--<result column="CONSIGNEEADDRESS" jdbcType="VARCHAR" property="consigneeaddress" />-->
<!--<result column="RECEIPTINFORMATION" jdbcType="VARCHAR" property="receiptinformation" />-->
<!--<result column="AGENTCODE" jdbcType="VARCHAR" property="agentcode" />-->
<!--<result column="AGENTNAME" jdbcType="VARCHAR" property="agentname" />-->
<!--<result column="STATUS" jdbcType="VARCHAR" property="status" />-->
<!--<result column="SHIPPER_CODE" jdbcType="VARCHAR" property="shipperCode" />-->
<!--<result column="SHIPPER_COUNTRYCODE" jdbcType="VARCHAR" property="shipperCountrycode" />-->
<!--<result column="SHIPPER_PHONE" jdbcType="VARCHAR" property="shipperPhone" />-->
<!--<result column="SHIPPER_FAX" jdbcType="VARCHAR" property="shipperFax" />-->
<!--<result column="CONSIGNEE_CODE" jdbcType="VARCHAR" property="consigneeCode" />-->
<!--<result column="CONSIGNEE_COUNTRYCODE" jdbcType="VARCHAR" property="consigneeCountrycode" />-->
<!--<result column="CONSIGNEE_PHONE" jdbcType="VARCHAR" property="consigneePhone" />-->
<!--<result column="CONSIGNEE_FAX" jdbcType="VARCHAR" property="consigneeFax" />-->
<!--<result column="SHIPPER_AEO" jdbcType="VARCHAR" property="shipperAeo" />-->
<!--<result column="CONSIGNEE_AEO" jdbcType="VARCHAR" property="consigneeAeo" />-->
<!--<result column="UNLOADINGSTATION" jdbcType="VARCHAR" property="unloadingstation" />-->
<!--</resultMap>-->
<!--<insert id="insert" parameterType="com.tianbo.analysis.model.PREPARESECONDARY">-->
<!--insert into PREPARESECONDARY (AUTOID, WAYBILLNOMASTER, WAYBILLNOSECONDARY, -->
<!--TOTALWEIGHT, TOTALPIECE, PREPAREPIECE, -->
<!--PREPAREWEIGHT, CREATEDATE, PREPAREMASTERID, -->
<!--CARRIER, FLIGHTNO, FLIGHTDATE, -->
<!--ORIGINATINGSTATION, DESTINATIONSTATION, -->
<!--CUSTOMSSTATUS, PAYMODE, PRODUCTNAME, -->
<!--STOWAGEDATE, CUSTOMSCODE, SHIPPERNAME, -->
<!--SHIPPERCITY, SHIPPERADDRESS, CONSIGNEENAME, -->
<!--CONSIGNEECITY, CONSIGNEEADDRESS, RECEIPTINFORMATION, -->
<!--AGENTCODE, AGENTNAME, STATUS, -->
<!--SHIPPER_CODE, SHIPPER_COUNTRYCODE, SHIPPER_PHONE, -->
<!--SHIPPER_FAX, CONSIGNEE_CODE, CONSIGNEE_COUNTRYCODE, -->
<!--CONSIGNEE_PHONE, CONSIGNEE_FAX, SHIPPER_AEO, -->
<!--CONSIGNEE_AEO, UNLOADINGSTATION)-->
<!--values (#{autoid,jdbcType=VARCHAR}, #{waybillnomaster,jdbcType=VARCHAR}, #{waybillnosecondary,jdbcType=VARCHAR}, -->
<!--#{totalweight,jdbcType=VARCHAR}, #{totalpiece,jdbcType=VARCHAR}, #{preparepiece,jdbcType=VARCHAR}, -->
<!--#{prepareweight,jdbcType=VARCHAR}, #{createdate,jdbcType=TIMESTAMP}, #{preparemasterid,jdbcType=VARCHAR}, -->
<!--#{carrier,jdbcType=VARCHAR}, #{flightno,jdbcType=VARCHAR}, #{flightdate,jdbcType=TIMESTAMP}, -->
<!--#{originatingstation,jdbcType=VARCHAR}, #{destinationstation,jdbcType=VARCHAR}, -->
<!--#{customsstatus,jdbcType=VARCHAR}, #{paymode,jdbcType=VARCHAR}, #{productname,jdbcType=VARCHAR}, -->
<!--#{stowagedate,jdbcType=TIMESTAMP}, #{customscode,jdbcType=VARCHAR}, #{shippername,jdbcType=VARCHAR}, -->
<!--#{shippercity,jdbcType=VARCHAR}, #{shipperaddress,jdbcType=VARCHAR}, #{consigneename,jdbcType=VARCHAR}, -->
<!--#{consigneecity,jdbcType=VARCHAR}, #{consigneeaddress,jdbcType=VARCHAR}, #{receiptinformation,jdbcType=VARCHAR}, -->
<!--#{agentcode,jdbcType=VARCHAR}, #{agentname,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, -->
<!--#{shipperCode,jdbcType=VARCHAR}, #{shipperCountrycode,jdbcType=VARCHAR}, #{shipperPhone,jdbcType=VARCHAR}, -->
<!--#{shipperFax,jdbcType=VARCHAR}, #{consigneeCode,jdbcType=VARCHAR}, #{consigneeCountrycode,jdbcType=VARCHAR}, -->
<!--#{consigneePhone,jdbcType=VARCHAR}, #{consigneeFax,jdbcType=VARCHAR}, #{shipperAeo,jdbcType=VARCHAR}, -->
<!--#{consigneeAeo,jdbcType=VARCHAR}, #{unloadingstation,jdbcType=VARCHAR})-->
<!--</insert>-->
<!--<insert id="insertSelective" parameterType="com.tianbo.analysis.model.PREPARESECONDARY">-->
<!--insert into PREPARESECONDARY-->
<!--<trim prefix="(" suffix=")" suffixOverrides=",">-->
<!--<if test="autoid != null">-->
<!--AUTOID,-->
<!--</if>-->
<!--<if test="waybillnomaster != null">-->
<!--WAYBILLNOMASTER,-->
<!--</if>-->
<!--<if test="waybillnosecondary != null">-->
<!--WAYBILLNOSECONDARY,-->
<!--</if>-->
<!--<if test="totalweight != null">-->
<!--TOTALWEIGHT,-->
<!--</if>-->
<!--<if test="totalpiece != null">-->
<!--TOTALPIECE,-->
<!--</if>-->
<!--<if test="preparepiece != null">-->
<!--PREPAREPIECE,-->
<!--</if>-->
<!--<if test="prepareweight != null">-->
<!--PREPAREWEIGHT,-->
<!--</if>-->
<!--<if test="createdate != null">-->
<!--CREATEDATE,-->
<!--</if>-->
<!--<if test="preparemasterid != null">-->
<!--PREPAREMASTERID,-->
<!--</if>-->
<!--<if test="carrier != null">-->
<!--CARRIER,-->
<!--</if>-->
<!--<if test="flightno != null">-->
<!--FLIGHTNO,-->
<!--</if>-->
<!--<if test="flightdate != null">-->
<!--FLIGHTDATE,-->
<!--</if>-->
<!--<if test="originatingstation != null">-->
<!--ORIGINATINGSTATION,-->
<!--</if>-->
<!--<if test="destinationstation != null">-->
<!--DESTINATIONSTATION,-->
<!--</if>-->
<!--<if test="customsstatus != null">-->
<!--CUSTOMSSTATUS,-->
<!--</if>-->
<!--<if test="paymode != null">-->
<!--PAYMODE,-->
<!--</if>-->
<!--<if test="productname != null">-->
<!--PRODUCTNAME,-->
<!--</if>-->
<!--<if test="stowagedate != null">-->
<!--STOWAGEDATE,-->
<!--</if>-->
<!--<if test="customscode != null">-->
<!--CUSTOMSCODE,-->
<!--</if>-->
<!--<if test="shippername != null">-->
<!--SHIPPERNAME,-->
<!--</if>-->
<!--<if test="shippercity != null">-->
<!--SHIPPERCITY,-->
<!--</if>-->
<!--<if test="shipperaddress != null">-->
<!--SHIPPERADDRESS,-->
<!--</if>-->
<!--<if test="consigneename != null">-->
<!--CONSIGNEENAME,-->
<!--</if>-->
<!--<if test="consigneecity != null">-->
<!--CONSIGNEECITY,-->
<!--</if>-->
<!--<if test="consigneeaddress != null">-->
<!--CONSIGNEEADDRESS,-->
<!--</if>-->
<!--<if test="receiptinformation != null">-->
<!--RECEIPTINFORMATION,-->
<!--</if>-->
<!--<if test="agentcode != null">-->
<!--AGENTCODE,-->
<!--</if>-->
<!--<if test="agentname != null">-->
<!--AGENTNAME,-->
<!--</if>-->
<!--<if test="status != null">-->
<!--STATUS,-->
<!--</if>-->
<!--<if test="shipperCode != null">-->
<!--SHIPPER_CODE,-->
<!--</if>-->
<!--<if test="shipperCountrycode != null">-->
<!--SHIPPER_COUNTRYCODE,-->
<!--</if>-->
<!--<if test="shipperPhone != null">-->
<!--SHIPPER_PHONE,-->
<!--</if>-->
<!--<if test="shipperFax != null">-->
<!--SHIPPER_FAX,-->
<!--</if>-->
<!--<if test="consigneeCode != null">-->
<!--CONSIGNEE_CODE,-->
<!--</if>-->
<!--<if test="consigneeCountrycode != null">-->
<!--CONSIGNEE_COUNTRYCODE,-->
<!--</if>-->
<!--<if test="consigneePhone != null">-->
<!--CONSIGNEE_PHONE,-->
<!--</if>-->
<!--<if test="consigneeFax != null">-->
<!--CONSIGNEE_FAX,-->
<!--</if>-->
<!--<if test="shipperAeo != null">-->
<!--SHIPPER_AEO,-->
<!--</if>-->
<!--<if test="consigneeAeo != null">-->
<!--CONSIGNEE_AEO,-->
<!--</if>-->
<!--<if test="unloadingstation != null">-->
<!--UNLOADINGSTATION,-->
<!--</if>-->
<!--</trim>-->
<!--<trim prefix="values (" suffix=")" suffixOverrides=",">-->
<!--<if test="autoid != null">-->
<!--#{autoid,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="waybillnomaster != null">-->
<!--#{waybillnomaster,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="waybillnosecondary != null">-->
<!--#{waybillnosecondary,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="totalweight != null">-->
<!--#{totalweight,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="totalpiece != null">-->
<!--#{totalpiece,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="preparepiece != null">-->
<!--#{preparepiece,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="prepareweight != null">-->
<!--#{prepareweight,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="createdate != null">-->
<!--#{createdate,jdbcType=TIMESTAMP},-->
<!--</if>-->
<!--<if test="preparemasterid != null">-->
<!--#{preparemasterid,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="carrier != null">-->
<!--#{carrier,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="flightno != null">-->
<!--#{flightno,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="flightdate != null">-->
<!--#{flightdate,jdbcType=TIMESTAMP},-->
<!--</if>-->
<!--<if test="originatingstation != null">-->
<!--#{originatingstation,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="destinationstation != null">-->
<!--#{destinationstation,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="customsstatus != null">-->
<!--#{customsstatus,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="paymode != null">-->
<!--#{paymode,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="productname != null">-->
<!--#{productname,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="stowagedate != null">-->
<!--#{stowagedate,jdbcType=TIMESTAMP},-->
<!--</if>-->
<!--<if test="customscode != null">-->
<!--#{customscode,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="shippername != null">-->
<!--#{shippername,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="shippercity != null">-->
<!--#{shippercity,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="shipperaddress != null">-->
<!--#{shipperaddress,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="consigneename != null">-->
<!--#{consigneename,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="consigneecity != null">-->
<!--#{consigneecity,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="consigneeaddress != null">-->
<!--#{consigneeaddress,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="receiptinformation != null">-->
<!--#{receiptinformation,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="agentcode != null">-->
<!--#{agentcode,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="agentname != null">-->
<!--#{agentname,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="status != null">-->
<!--#{status,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="shipperCode != null">-->
<!--#{shipperCode,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="shipperCountrycode != null">-->
<!--#{shipperCountrycode,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="shipperPhone != null">-->
<!--#{shipperPhone,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="shipperFax != null">-->
<!--#{shipperFax,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="consigneeCode != null">-->
<!--#{consigneeCode,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="consigneeCountrycode != null">-->
<!--#{consigneeCountrycode,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="consigneePhone != null">-->
<!--#{consigneePhone,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="consigneeFax != null">-->
<!--#{consigneeFax,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="shipperAeo != null">-->
<!--#{shipperAeo,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="consigneeAeo != null">-->
<!--#{consigneeAeo,jdbcType=VARCHAR},-->
<!--</if>-->
<!--<if test="unloadingstation != null">-->
<!--#{unloadingstation,jdbcType=VARCHAR},-->
<!--</if>-->
<!--</trim>-->
<!--</insert>-->
<update id="updateRECEIPTION" parameterType="com.tianbo.analysis.model.PREPARESECONDARY" >
... ...