wlxxpt / customAnalysis · 提交

转到一个项目

作者 朱兆平
提交 142e369c06adad7c3774b8176140860ed8de2454 1 个父辈 c510b88d

合并前

内嵌 并排对比
正在显示 27 个修改的文件 包含 66 行增加 和 68 行删除
@@ -51,7 +51,7 @@ spring: @@ -51,7 +51,7 @@ spring:
51 # username: root 51 # username: root
52 # password: 52 # password:
53 # driver-class-name: com.mysql.jdbc.Driver 53 # driver-class-name: com.mysql.jdbc.Driver
54 - max-idle: 10 54 + max-idle: 20
55 max-wait: 10000 55 max-wait: 10000
56 min-idle: 5 56 min-idle: 5
57 initial-size: 5 57 initial-size: 5
@@ -59,7 +59,8 @@ spring: @@ -59,7 +59,8 @@ spring:
59 druid: 59 druid:
60 initial-size: 1 60 initial-size: 1
61 min-idle: 1 61 min-idle: 1
62 - max-active: 20 62 + #最大并发连接数
  63 + max-active: 40
63 #获取连接等待超时时间 64 #获取连接等待超时时间
64 max-wait: 60000 65 max-wait: 60000
65 #一个连接在池中最小生存的时间 66 #一个连接在池中最小生存的时间
@@ -174,7 +174,7 @@ @@ -174,7 +174,7 @@
174 <springProfile name="dev"> 174 <springProfile name="dev">
175 <logger name="org.springframework.boot" level="trace"/> 175 <logger name="org.springframework.boot" level="trace"/>
176 <logger name="org.apache.tomcat" level="info" /> 176 <logger name="org.apache.tomcat" level="info" />
177 - <logger name="com.tianbo.imfClient.dao" level="DEBUG" /> 177 + <logger name="com.tianbo.analysis.dao" level="DEBUG" />
178 <root level="INFO"> 178 <root level="INFO">
179 <appender-ref ref="CONSOLE" /> 179 <appender-ref ref="CONSOLE" />
180 <!--<appender-ref ref="DEBUG_FILE" />--> 180 <!--<appender-ref ref="DEBUG_FILE" />-->
@@ -187,7 +187,7 @@ @@ -187,7 +187,7 @@
187 <!--生产环境:输出到文件--> 187 <!--生产环境:输出到文件-->
188 <springProfile name="pro"> 188 <springProfile name="pro">
189 <logger name="org.springframework.boot" level="trace"/> 189 <logger name="org.springframework.boot" level="trace"/>
190 - <logger name="com.tianbo.imfClient.dao" level="DEBUG" /> 190 + <logger name="com.tianbo.analysis.dao" level="DEBUG" />
191 <root level="info"> 191 <root level="info">
192 <appender-ref ref="CONSOLE" /> 192 <appender-ref ref="CONSOLE" />
193 <appender-ref ref="DEBUG_FILE" /> 193 <appender-ref ref="DEBUG_FILE" />
@@ -11,10 +11,10 @@ @@ -11,10 +11,10 @@
11 <relativePath/> <!-- lookup parent from repository --> 11 <relativePath/> <!-- lookup parent from repository -->
12 </parent> 12 </parent>
13 <groupId>com.tianbo</groupId> 13 <groupId>com.tianbo</groupId>
14 - <artifactId>imfClient</artifactId> 14 + <artifactId>analysis</artifactId>
15 <version>1.0-SNAPSHOT</version> 15 <version>1.0-SNAPSHOT</version>
16 - <name>imfClient</name>  
17 - <description>warehouse for Spring Boot</description> 16 + <name>customAnalysis</name>
  17 + <description>Analysis waybill recept</description>
18 <properties> 18 <properties>
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>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 * @author mrz 2 * @author mrz
3 * @email 17966059@qq.com 3 * @email 17966059@qq.com
4 */ 4 */
5 -package com.tianbo.imfClient; 5 +package com.tianbo.analysis;
6 6
7 import org.mybatis.spring.annotation.MapperScan; 7 import org.mybatis.spring.annotation.MapperScan;
8 import org.springframework.boot.SpringApplication; 8 import org.springframework.boot.SpringApplication;
@@ -12,7 +12,6 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @@ -12,7 +12,6 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
12 import org.springframework.cloud.client.loadbalancer.LoadBalanced; 12 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
13 import org.springframework.context.annotation.Bean; 13 import org.springframework.context.annotation.Bean;
14 import org.springframework.context.annotation.ComponentScan; 14 import org.springframework.context.annotation.ComponentScan;
15 -import org.springframework.scheduling.annotation.EnableScheduling;  
16 import org.springframework.transaction.annotation.EnableTransactionManagement; 15 import org.springframework.transaction.annotation.EnableTransactionManagement;
17 import org.springframework.web.client.RestTemplate; 16 import org.springframework.web.client.RestTemplate;
18 17
@@ -20,8 +19,8 @@ import org.springframework.web.client.RestTemplate; @@ -20,8 +19,8 @@ import org.springframework.web.client.RestTemplate;
20 //@EnableScheduling 19 //@EnableScheduling
21 @EnableDiscoveryClient 20 @EnableDiscoveryClient
22 @EnableTransactionManagement 21 @EnableTransactionManagement
23 -@MapperScan("com.tianbo.imfClient.dao")  
24 -@ComponentScan({"com.tianbo.imfClient"}) 22 +@MapperScan("com.tianbo.analysis.dao")
  23 +@ComponentScan({"com.tianbo.analysis"})
25 public class ImfClientApplication { 24 public class ImfClientApplication {
26 25
27 public static void main(String[] args) { 26 public static void main(String[] args) {
1 -package com.tianbo.imfClient.config; 1 +package com.tianbo.analysis.config;
2 2
3 import org.springframework.boot.web.server.ErrorPage; 3 import org.springframework.boot.web.server.ErrorPage;
4 import org.springframework.boot.web.server.ErrorPageRegistrar; 4 import org.springframework.boot.web.server.ErrorPageRegistrar;
1 -package com.tianbo.imfClient.config; 1 +package com.tianbo.analysis.config;
2 2
3 import org.springframework.context.annotation.Bean; 3 import org.springframework.context.annotation.Bean;
4 import org.springframework.context.annotation.Configuration; 4 import org.springframework.context.annotation.Configuration;
1 -package com.tianbo.imfClient.controller; 1 +package com.tianbo.analysis.controller;
2 2
3 import org.springframework.stereotype.Controller; 3 import org.springframework.stereotype.Controller;
4 import org.springframework.web.bind.annotation.RequestMapping; 4 import org.springframework.web.bind.annotation.RequestMapping;
1 -package com.tianbo.imfClient.controller; 1 +package com.tianbo.analysis.controller;
2 2
3 -import com.tianbo.imfClient.dao.CUSTOMSMESSAGEMapper;  
4 -import com.tianbo.imfClient.dao.ORIGINMANIFESTMASTERMapper;  
5 -import com.tianbo.imfClient.model.CUSTOMSMESSAGE;  
6 -import com.tianbo.imfClient.model.ResultJson; 3 +import com.tianbo.analysis.dao.CUSTOMSMESSAGEMapper;
  4 +import com.tianbo.analysis.dao.ORIGINMANIFESTMASTERMapper;
  5 +import com.tianbo.analysis.model.CUSTOMSMESSAGE;
  6 +import com.tianbo.analysis.model.ResultJson;
7 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.web.bind.annotation.PostMapping; 8 import org.springframework.web.bind.annotation.PostMapping;
9 import org.springframework.web.bind.annotation.RequestMapping; 9 import org.springframework.web.bind.annotation.RequestMapping;
1 -package com.tianbo.imfClient.controller; 1 +package com.tianbo.analysis.controller;
2 2
3 import org.springframework.stereotype.Controller; 3 import org.springframework.stereotype.Controller;
4 import org.springframework.web.bind.annotation.RequestMapping; 4 import org.springframework.web.bind.annotation.RequestMapping;
5 -import org.springframework.web.bind.annotation.ResponseBody;  
6 5
7 @Controller 6 @Controller
8 public class ImfLogController { 7 public class ImfLogController {
1 -package com.tianbo.imfClient.controller; 1 +package com.tianbo.analysis.controller;
2 2
3 import org.springframework.stereotype.Controller; 3 import org.springframework.stereotype.Controller;
4 -import org.springframework.web.bind.annotation.GetMapping;  
5 import org.springframework.web.bind.annotation.RequestMapping; 4 import org.springframework.web.bind.annotation.RequestMapping;
6 5
7 @Controller 6 @Controller
1 -package com.tianbo.imfClient.controller; 1 +package com.tianbo.analysis.controller;
2 2
3 -import com.tianbo.imfClient.handle.IO_Log_Handle; 3 +import com.tianbo.analysis.handle.IO_Log_Handle;
4 import org.springframework.stereotype.Component; 4 import org.springframework.stereotype.Component;
5 5
6 import javax.websocket.OnClose; 6 import javax.websocket.OnClose;
1 -package com.tianbo.imfClient.dao; 1 +package com.tianbo.analysis.dao;
2 2
3 -import com.tianbo.imfClient.model.CUSTOMSMESSAGE;  
4 -import com.tianbo.imfClient.model.CUSTOMSMESSAGEWithBLOBs; 3 +import com.tianbo.analysis.model.CUSTOMSMESSAGE;
  4 +import com.tianbo.analysis.model.CUSTOMSMESSAGEWithBLOBs;
5 5
6 import java.util.List; 6 import java.util.List;
7 7
1 -package com.tianbo.imfClient.dao; 1 +package com.tianbo.analysis.dao;
2 2
3 -import com.tianbo.imfClient.model.ORIGINMANIFESTMASTER; 3 +import com.tianbo.analysis.model.ORIGINMANIFESTMASTER;
4 4
5 import java.util.HashMap; 5 import java.util.HashMap;
6 6
1 -package com.tianbo.imfClient.dao; 1 +package com.tianbo.analysis.dao;
2 2
3 -import com.tianbo.imfClient.model.T_ETL_MESSAGE; 3 +import com.tianbo.analysis.model.T_ETL_MESSAGE;
4 4
5 import java.math.BigDecimal; 5 import java.math.BigDecimal;
6 6
1 -package com.tianbo.imfClient.handle; 1 +package com.tianbo.analysis.handle;
2 2
3 -import com.tianbo.imfClient.model.T_ETL_MESSAGE;  
4 -import com.tianbo.imfClient.service.T_ETL_MESSAGEService; 3 +import com.tianbo.analysis.model.T_ETL_MESSAGE;
  4 +import com.tianbo.analysis.service.T_ETL_MESSAGEService;
5 import com.tianbo.util.Date.DateUtil; 5 import com.tianbo.util.Date.DateUtil;
6 import com.tianbo.util.IO.FileTool; 6 import com.tianbo.util.IO.FileTool;
7 import com.tianbo.util.XML.XML2ENTITY; 7 import com.tianbo.util.XML.XML2ENTITY;
1 -package com.tianbo.imfClient.handle; 1 +package com.tianbo.analysis.handle;
2 2
3 import javax.websocket.Session; 3 import javax.websocket.Session;
4 import java.io.BufferedReader; 4 import java.io.BufferedReader;
1 -package com.tianbo.imfClient.model; 1 +package com.tianbo.analysis.model;
2 2
3 import java.math.BigDecimal; 3 import java.math.BigDecimal;
4 import java.util.Date; 4 import java.util.Date;
1 -package com.tianbo.imfClient.model; 1 +package com.tianbo.analysis.model;
2 2
3 public class CUSTOMSMESSAGEWithBLOBs extends CUSTOMSMESSAGE { 3 public class CUSTOMSMESSAGEWithBLOBs extends CUSTOMSMESSAGE {
4 private String messagecontent; 4 private String messagecontent;
1 -package com.tianbo.imfClient.model; 1 +package com.tianbo.analysis.model;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 4
1 -package com.tianbo.imfClient.model; 1 +package com.tianbo.analysis.model;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
1 -package com.tianbo.imfClient.model; 1 +package com.tianbo.analysis.model;
2 2
3 import java.math.BigDecimal; 3 import java.math.BigDecimal;
4 import java.util.Date; 4 import java.util.Date;
1 -package com.tianbo.imfClient.service; 1 +package com.tianbo.analysis.service;
2 2
3 -import com.tianbo.imfClient.model.T_ETL_MESSAGE; 3 +import com.tianbo.analysis.model.T_ETL_MESSAGE;
4 4
5 public interface T_ETL_MESSAGEService { 5 public interface T_ETL_MESSAGEService {
6 int insert(T_ETL_MESSAGE record); 6 int insert(T_ETL_MESSAGE record);
1 -package com.tianbo.imfClient.service.imp; 1 +package com.tianbo.analysis.service.imp;
2 2
3 -import com.tianbo.imfClient.dao.T_ETL_MESSAGEMapper;  
4 -import com.tianbo.imfClient.model.T_ETL_MESSAGE;  
5 -import com.tianbo.imfClient.service.T_ETL_MESSAGEService; 3 +import com.tianbo.analysis.dao.T_ETL_MESSAGEMapper;
  4 +import com.tianbo.analysis.model.T_ETL_MESSAGE;
  5 +import com.tianbo.analysis.service.T_ETL_MESSAGEService;
6 import org.springframework.beans.factory.annotation.Autowired; 6 import org.springframework.beans.factory.annotation.Autowired;
7 import org.springframework.stereotype.Service; 7 import org.springframework.stereotype.Service;
8 8
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 <property name="forceBigDecimals" value="false"/> 32 <property name="forceBigDecimals" value="false"/>
33 </javaTypeResolver> 33 </javaTypeResolver>
34 <!-- 生成模型的包名和位置--> 34 <!-- 生成模型的包名和位置-->
35 - <javaModelGenerator targetPackage="com.tianbo.imfClient.model" targetProject="src/main/java"> 35 + <javaModelGenerator targetPackage="com.tianbo.analysis.model" targetProject="src/main/java">
36 <property name="enableSubPackages" value="true"/> 36 <property name="enableSubPackages" value="true"/>
37 <property name="trimStrings" value="true"/> 37 <property name="trimStrings" value="true"/>
38 </javaModelGenerator> 38 </javaModelGenerator>
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 <property name="enableSubPackages" value="true"/> 41 <property name="enableSubPackages" value="true"/>
42 </sqlMapGenerator> 42 </sqlMapGenerator>
43 <!-- 生成DAO的包名和位置--> 43 <!-- 生成DAO的包名和位置-->
44 - <javaClientGenerator type="XMLMAPPER" targetPackage="com.tianbo.imfClient.dao" targetProject="src/main/java"> 44 + <javaClientGenerator type="XMLMAPPER" targetPackage="com.tianbo.analysis.dao" targetProject="src/main/java">
45 <property name="enableSubPackages" value="true"/> 45 <property name="enableSubPackages" value="true"/>
46 </javaClientGenerator> 46 </javaClientGenerator>
47 <!-- 要生成的表 tableName是数据库中的表名或视图名 domainObjectName是实体类名--> 47 <!-- 要生成的表 tableName是数据库中的表名或视图名 domainObjectName是实体类名-->
1 <?xml version="1.0" encoding="UTF-8" ?> 1 <?xml version="1.0" encoding="UTF-8" ?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3 -<mapper namespace="com.tianbo.imfClient.dao.CUSTOMSMESSAGEMapper" >  
4 - <resultMap id="BaseResultMap" type="com.tianbo.imfClient.model.CUSTOMSMESSAGE" > 3 +<mapper namespace="com.tianbo.analysis.dao.CUSTOMSMESSAGEMapper" >
  4 + <resultMap id="BaseResultMap" type="com.tianbo.analysis.model.CUSTOMSMESSAGE" >
5 <result column="AUTOID" property="autoid" jdbcType="VARCHAR" /> 5 <result column="AUTOID" property="autoid" jdbcType="VARCHAR" />
6 <result column="MESSAGEID" property="messageid" jdbcType="VARCHAR" /> 6 <result column="MESSAGEID" property="messageid" jdbcType="VARCHAR" />
7 <result column="MESSAGETYPE" property="messagetype" jdbcType="VARCHAR" /> 7 <result column="MESSAGETYPE" property="messagetype" jdbcType="VARCHAR" />
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 <result column="RESPONSETEXT" property="responsetext" jdbcType="VARCHAR" /> 21 <result column="RESPONSETEXT" property="responsetext" jdbcType="VARCHAR" />
22 <result column="CREATETIME" property="createtime" jdbcType="TIMESTAMP" /> 22 <result column="CREATETIME" property="createtime" jdbcType="TIMESTAMP" />
23 </resultMap> 23 </resultMap>
24 - <resultMap id="ResultMapWithBLOBs" type="com.tianbo.imfClient.model.CUSTOMSMESSAGEWithBLOBs" extends="BaseResultMap" > 24 + <resultMap id="ResultMapWithBLOBs" type="com.tianbo.analysis.model.CUSTOMSMESSAGEWithBLOBs" extends="BaseResultMap" >
25 <result column="MESSAGECONTENT" property="messagecontent" jdbcType="CLOB" /> 25 <result column="MESSAGECONTENT" property="messagecontent" jdbcType="CLOB" />
26 <result column="RECEIVECONTENT" property="receivecontent" jdbcType="CLOB" /> 26 <result column="RECEIVECONTENT" property="receivecontent" jdbcType="CLOB" />
27 </resultMap> 27 </resultMap>
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 <sql id="Response_Base"> 31 <sql id="Response_Base">
32 MESSAGETYPE, WAYBILLNOMASTER, WAYBILLNOSECONDARY, RESPONSETEXT 32 MESSAGETYPE, WAYBILLNOMASTER, WAYBILLNOSECONDARY, RESPONSETEXT
33 </sql> 33 </sql>
34 - <select id="selectCustomResponse" parameterType="java.lang.String" resultType="com.tianbo.imfClient.model.CUSTOMSMESSAGE"> 34 + <select id="selectCustomResponse" parameterType="java.lang.String" resultType="com.tianbo.analysis.model.CUSTOMSMESSAGE">
35 SELECT 35 SELECT
36 <include refid="Response_Base" /> 36 <include refid="Response_Base" />
37 FROM 37 FROM
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR} 40 WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR}
41 ORDER BY MESSAGETYPE 41 ORDER BY MESSAGETYPE
42 </select> 42 </select>
43 - <select id="selectCustomId" parameterType="java.lang.String" resultType="com.tianbo.imfClient.model.CUSTOMSMESSAGE"> 43 + <select id="selectCustomId" parameterType="java.lang.String" resultType="com.tianbo.analysis.model.CUSTOMSMESSAGE">
44 SELECT 44 SELECT
45 MESSAGEID, 45 MESSAGEID,
46 <include refid="Response_Base" /> 46 <include refid="Response_Base" />
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR} 50 WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR}
51 ORDER BY MESSAGETYPE 51 ORDER BY MESSAGETYPE
52 </select> 52 </select>
53 - <insert id="insert" parameterType="com.tianbo.imfClient.model.CUSTOMSMESSAGEWithBLOBs" > 53 + <insert id="insert" parameterType="com.tianbo.analysis.model.CUSTOMSMESSAGEWithBLOBs" >
54 insert into CUSTOMSMESSAGE (AUTOID, MESSAGEID, MESSAGETYPE, 54 insert into CUSTOMSMESSAGE (AUTOID, MESSAGEID, MESSAGETYPE,
55 MESSAGESTATUS, SENDTIME, RECEIVETIME, 55 MESSAGESTATUS, SENDTIME, RECEIVETIME,
56 OBJECTID, FLIGHTNO, FLIGHTDATE, 56 OBJECTID, FLIGHTNO, FLIGHTDATE,
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 #{responsecode,jdbcType=VARCHAR}, #{responsetext,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, 66 #{responsecode,jdbcType=VARCHAR}, #{responsetext,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP},
67 #{messagecontent,jdbcType=CLOB}, #{receivecontent,jdbcType=CLOB}) 67 #{messagecontent,jdbcType=CLOB}, #{receivecontent,jdbcType=CLOB})
68 </insert> 68 </insert>
69 - <insert id="insertSelective" parameterType="com.tianbo.imfClient.model.CUSTOMSMESSAGEWithBLOBs" > 69 + <insert id="insertSelective" parameterType="com.tianbo.analysis.model.CUSTOMSMESSAGEWithBLOBs" >
70 insert into CUSTOMSMESSAGE 70 insert into CUSTOMSMESSAGE
71 <trim prefix="(" suffix=")" suffixOverrides="," > 71 <trim prefix="(" suffix=")" suffixOverrides="," >
72 <if test="autoid != null" > 72 <if test="autoid != null" >
1 <?xml version="1.0" encoding="UTF-8" ?> 1 <?xml version="1.0" encoding="UTF-8" ?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3 -<mapper namespace="com.tianbo.imfClient.dao.ORIGINMANIFESTMASTERMapper" >  
4 - <resultMap id="BaseResultMap" type="com.tianbo.imfClient.model.ORIGINMANIFESTMASTER" > 3 +<mapper namespace="com.tianbo.analysis.dao.ORIGINMANIFESTMASTERMapper" >
  4 + <resultMap id="BaseResultMap" type="com.tianbo.analysis.model.ORIGINMANIFESTMASTER" >
5 <result column="AUTOID" property="autoid" jdbcType="VARCHAR" /> 5 <result column="AUTOID" property="autoid" jdbcType="VARCHAR" />
6 <result column="WAYBILLNOMASTER" property="waybillnomaster" jdbcType="VARCHAR" /> 6 <result column="WAYBILLNOMASTER" property="waybillnomaster" jdbcType="VARCHAR" />
7 <result column="SEGMENT" property="segment" jdbcType="VARCHAR" /> 7 <result column="SEGMENT" property="segment" jdbcType="VARCHAR" />
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
47 <result column="SPECIFIC_CONSIGNEE_PHONE" property="specificConsigneePhone" jdbcType="VARCHAR" /> 47 <result column="SPECIFIC_CONSIGNEE_PHONE" property="specificConsigneePhone" jdbcType="VARCHAR" />
48 <result column="CONSIGNEE_PHONE" property="consigneePhone" jdbcType="VARCHAR" /> 48 <result column="CONSIGNEE_PHONE" property="consigneePhone" jdbcType="VARCHAR" />
49 </resultMap> 49 </resultMap>
50 - <insert id="insert" parameterType="com.tianbo.imfClient.model.ORIGINMANIFESTMASTER" > 50 + <insert id="insert" parameterType="com.tianbo.analysis.model.ORIGINMANIFESTMASTER" >
51 insert into ORIGINMANIFESTMASTER (AUTOID, WAYBILLNOMASTER, SEGMENT, 51 insert into ORIGINMANIFESTMASTER (AUTOID, WAYBILLNOMASTER, SEGMENT,
52 ORIGINATINGSTATION, DESTINATIONSTATION, 52 ORIGINATINGSTATION, DESTINATIONSTATION,
53 TOTALWEIGHT, TOTALPIECE, MANIFESTTOTALPIECE, 53 TOTALWEIGHT, TOTALPIECE, MANIFESTTOTALPIECE,
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 #{specificConsigneename,jdbcType=VARCHAR}, #{specificConsigneePhone,jdbcType=VARCHAR}, 81 #{specificConsigneename,jdbcType=VARCHAR}, #{specificConsigneePhone,jdbcType=VARCHAR},
82 #{consigneePhone,jdbcType=VARCHAR}) 82 #{consigneePhone,jdbcType=VARCHAR})
83 </insert> 83 </insert>
84 - <insert id="insertSelective" parameterType="com.tianbo.imfClient.model.ORIGINMANIFESTMASTER" > 84 + <insert id="insertSelective" parameterType="com.tianbo.analysis.model.ORIGINMANIFESTMASTER" >
85 insert into ORIGINMANIFESTMASTER 85 insert into ORIGINMANIFESTMASTER
86 <trim prefix="(" suffix=")" suffixOverrides="," > 86 <trim prefix="(" suffix=")" suffixOverrides="," >
87 <if test="autoid != null" > 87 <if test="autoid != null" >
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 -<mapper namespace="com.tianbo.imfClient.dao.T_ETL_MESSAGEMapper">  
4 - <resultMap id="BaseResultMap" type="com.tianbo.imfClient.model.T_ETL_MESSAGE"> 3 +<mapper namespace="com.tianbo.analysis.dao.T_ETL_MESSAGEMapper">
  4 + <resultMap id="BaseResultMap" type="com.tianbo.analysis.model.T_ETL_MESSAGE">
5 <id column="FID" jdbcType="DECIMAL" property="fid" /> 5 <id column="FID" jdbcType="DECIMAL" property="fid" />
6 <result column="OPER" jdbcType="VARCHAR" property="oper" /> 6 <result column="OPER" jdbcType="VARCHAR" property="oper" />
7 <result column="SNTM" jdbcType="TIMESTAMP" property="sntm" /> 7 <result column="SNTM" jdbcType="TIMESTAMP" property="sntm" />
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 <result column="ERRLOG" jdbcType="NVARCHAR" property="errlog" /> 22 <result column="ERRLOG" jdbcType="NVARCHAR" property="errlog" />
23 <result column="APPID" jdbcType="VARCHAR" property="appid" /> 23 <result column="APPID" jdbcType="VARCHAR" property="appid" />
24 </resultMap> 24 </resultMap>
25 - <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.tianbo.imfClient.model.T_ETL_MESSAGE"> 25 + <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.tianbo.analysis.model.T_ETL_MESSAGE">
26 <result column="CONTENT" jdbcType="CLOB" property="content" /> 26 <result column="CONTENT" jdbcType="CLOB" property="content" />
27 </resultMap> 27 </resultMap>
28 <sql id="Base_Column_List"> 28 <sql id="Base_Column_List">
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 delete from T_ETL_MESSAGE 44 delete from T_ETL_MESSAGE
45 where FID = #{fid,jdbcType=DECIMAL} 45 where FID = #{fid,jdbcType=DECIMAL}
46 </delete> 46 </delete>
47 - <insert id="insert" parameterType="com.tianbo.imfClient.model.T_ETL_MESSAGE"> 47 + <insert id="insert" parameterType="com.tianbo.analysis.model.T_ETL_MESSAGE">
48 insert into T_ETL_MESSAGE (FID, OPER, SNTM, 48 insert into T_ETL_MESSAGE (FID, OPER, SNTM,
49 SNDR, RCVR, SEQN, DDTM, 49 SNDR, RCVR, SEQN, DDTM,
50 TYPE, STYP, TRANSID, 50 TYPE, STYP, TRANSID,
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
60 #{errflag,jdbcType=DECIMAL}, #{errlog,jdbcType=NVARCHAR}, #{appid,jdbcType=VARCHAR}, 60 #{errflag,jdbcType=DECIMAL}, #{errlog,jdbcType=NVARCHAR}, #{appid,jdbcType=VARCHAR},
61 #{content,jdbcType=CLOB}) 61 #{content,jdbcType=CLOB})
62 </insert> 62 </insert>
63 - <insert id="insertSelective" parameterType="com.tianbo.imfClient.model.T_ETL_MESSAGE"> 63 + <insert id="insertSelective" parameterType="com.tianbo.analysis.model.T_ETL_MESSAGE">
64 insert into T_ETL_MESSAGE 64 insert into T_ETL_MESSAGE
65 <trim prefix="(" suffix=")" suffixOverrides=","> 65 <trim prefix="(" suffix=")" suffixOverrides=",">
66 <if test="fid != null"> 66 <if test="fid != null">
@@ -187,7 +187,7 @@ @@ -187,7 +187,7 @@
187 </if> 187 </if>
188 </trim> 188 </trim>
189 </insert> 189 </insert>
190 - <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.imfClient.model.T_ETL_MESSAGE"> 190 + <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.analysis.model.T_ETL_MESSAGE">
191 update T_ETL_MESSAGE 191 update T_ETL_MESSAGE
192 <set> 192 <set>
193 <if test="oper != null"> 193 <if test="oper != null">
@@ -250,7 +250,7 @@ @@ -250,7 +250,7 @@
250 </set> 250 </set>
251 where FID = #{fid,jdbcType=DECIMAL} 251 where FID = #{fid,jdbcType=DECIMAL}
252 </update> 252 </update>
253 - <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.tianbo.imfClient.model.T_ETL_MESSAGE"> 253 + <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.tianbo.analysis.model.T_ETL_MESSAGE">
254 update T_ETL_MESSAGE 254 update T_ETL_MESSAGE
255 set OPER = #{oper,jdbcType=VARCHAR}, 255 set OPER = #{oper,jdbcType=VARCHAR},
256 SNTM = #{sntm,jdbcType=TIMESTAMP}, 256 SNTM = #{sntm,jdbcType=TIMESTAMP},
@@ -273,7 +273,7 @@ @@ -273,7 +273,7 @@
273 CONTENT = #{content,jdbcType=CLOB} 273 CONTENT = #{content,jdbcType=CLOB}
274 where FID = #{fid,jdbcType=DECIMAL} 274 where FID = #{fid,jdbcType=DECIMAL}
275 </update> 275 </update>
276 - <update id="updateByPrimaryKey" parameterType="com.tianbo.imfClient.model.T_ETL_MESSAGE"> 276 + <update id="updateByPrimaryKey" parameterType="com.tianbo.analysis.model.T_ETL_MESSAGE">
277 update T_ETL_MESSAGE 277 update T_ETL_MESSAGE
278 set OPER = #{oper,jdbcType=VARCHAR}, 278 set OPER = #{oper,jdbcType=VARCHAR},
279 SNTM = #{sntm,jdbcType=TIMESTAMP}, 279 SNTM = #{sntm,jdbcType=TIMESTAMP},