zhangFan / analysis_imf · 提交

转到一个项目

作者 zhangFan
提交 82320f12f4bb22e3ccf07da4944f3b190b07a137 1 个父辈 b67bef5c

kakoIMF check some message

内嵌 并排对比
正在显示 29 个修改的文件 包含 763 行增加 和 579 行删除
此 diff 太大无法显示。
@@ -34,10 +34,10 @@ @@ -34,10 +34,10 @@
34 <groupId>org.springframework.boot</groupId> 34 <groupId>org.springframework.boot</groupId>
35 <artifactId>spring-boot-starter-web</artifactId> 35 <artifactId>spring-boot-starter-web</artifactId>
36 </dependency> 36 </dependency>
37 - <dependency> 37 +<!-- <dependency>
38 <groupId>org.springframework.cloud</groupId> 38 <groupId>org.springframework.cloud</groupId>
39 <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId> 39 <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
40 - </dependency> 40 + </dependency>-->
41 <dependency> 41 <dependency>
42 <groupId>org.mybatis.spring.boot</groupId> 42 <groupId>org.mybatis.spring.boot</groupId>
43 <artifactId>mybatis-spring-boot-starter</artifactId> 43 <artifactId>mybatis-spring-boot-starter</artifactId>
@@ -89,6 +89,13 @@ @@ -89,6 +89,13 @@
89 <artifactId>log4j</artifactId> 89 <artifactId>log4j</artifactId>
90 <version>1.2.17</version> 90 <version>1.2.17</version>
91 </dependency> 91 </dependency>
  92 +
  93 + <dependency>
  94 + <groupId>com.thoughtworks.xstream</groupId>
  95 + <artifactId>xstream</artifactId>
  96 + <version>1.4.10</version>
  97 + </dependency>
  98 +
92 </dependencies> 99 </dependencies>
93 <dependencyManagement> 100 <dependencyManagement>
94 <dependencies> 101 <dependencies>
@@ -3,12 +3,11 @@ package com.sy; @@ -3,12 +3,11 @@ package com.sy;
3 import org.mybatis.spring.annotation.MapperScan; 3 import org.mybatis.spring.annotation.MapperScan;
4 import org.springframework.boot.SpringApplication; 4 import org.springframework.boot.SpringApplication;
5 import org.springframework.boot.autoconfigure.SpringBootApplication; 5 import org.springframework.boot.autoconfigure.SpringBootApplication;
6 -import org.springframework.cloud.netflix.eureka.EnableEurekaClient;  
7 import org.springframework.scheduling.annotation.EnableScheduling; 6 import org.springframework.scheduling.annotation.EnableScheduling;
8 7
9 @SpringBootApplication 8 @SpringBootApplication
10 @EnableScheduling 9 @EnableScheduling
11 -@EnableEurekaClient 10 +//@EnableEurekaClient
12 @MapperScan(value = "com.sy.mapper") 11 @MapperScan(value = "com.sy.mapper")
13 public class AnalysisImfApplication { 12 public class AnalysisImfApplication {
14 13
@@ -7,12 +7,6 @@ import org.apache.log4j.PropertyConfigurator; @@ -7,12 +7,6 @@ import org.apache.log4j.PropertyConfigurator;
7 import org.springframework.scheduling.annotation.Scheduled; 7 import org.springframework.scheduling.annotation.Scheduled;
8 import org.springframework.stereotype.Component; 8 import org.springframework.stereotype.Component;
9 9
10 -/**  
11 - * @author zhangfan  
12 - * @web www.sy.com  
13 - * @company 郑州商友科技有限公司  
14 - * @time 2018-11-27 16:05  
15 - */  
16 @Component 10 @Component
17 public class IMF_Tesk { 11 public class IMF_Tesk {
18 12
@@ -47,7 +41,7 @@ public class IMF_Tesk { @@ -47,7 +41,7 @@ public class IMF_Tesk {
47 41
48 } 42 }
49 if (!LOGIN_OK){ 43 if (!LOGIN_OK){
50 - loginIMF(client, "KAOR", "KAOR", "config/imf_config.properties"); 44 + loginIMF(client, "KKW1", "KKW1", "config/imf_config.properties");
51 } 45 }
52 46
53 47
@@ -31,7 +31,7 @@ public class KAKO_Reader extends Thread{ @@ -31,7 +31,7 @@ public class KAKO_Reader extends Thread{
31 } 31 }
32 32
33 try { 33 try {
34 - Thread.sleep(5000L); 34 + Thread.sleep(1000L);
35 } catch (InterruptedException var3) { 35 } catch (InterruptedException var3) {
36 var3.printStackTrace(); 36 var3.printStackTrace();
37 37
@@ -12,33 +12,24 @@ public class CommandInfoAnalysis { @@ -12,33 +12,24 @@ public class CommandInfoAnalysis {
12 commandInfo bean = new commandInfo(); 12 commandInfo bean = new commandInfo();
13 CommandInfo info = msg.getComInfo(); 13 CommandInfo info = msg.getComInfo();
14 Meta meta = msg.getMeta(); 14 Meta meta = msg.getMeta();
15 -/* bean.setSender(meta.getSender()); 15 + bean.setSender(meta.getSender());
16 bean.setReceiver(meta.getReceiver()); 16 bean.setReceiver(meta.getReceiver());
17 bean.setSeqn(meta.getSeqn()); 17 bean.setSeqn(meta.getSeqn());
18 bean.setSendtime(meta.getSendTime()); 18 bean.setSendtime(meta.getSendTime());
19 - bean.setType(meta.getType());  
20 - bean.setSmtype(meta.getSmType());*/ 19 + bean.setBtype(meta.getType());
  20 + bean.setStype(meta.getSmType());
21 bean.setAreaId(info.getAREA_ID()); 21 bean.setAreaId(info.getAREA_ID());
22 bean.setChnlNo(info.getCHNL_NO()); 22 bean.setChnlNo(info.getCHNL_NO());
23 bean.setiEType(info.getI_E_TYPE()); 23 bean.setiEType(info.getI_E_TYPE());
24 bean.setSeqNo(info.getSEQ_NO()); 24 bean.setSeqNo(info.getSEQ_NO());
25 - bean.setExecuteResult(info.getExecuteResult());  
26 - bean.setEsealIcNo(info.getSeal().getEsealIcNo());  
27 bean.setEsealId(info.getSeal().getEsealId()); 25 bean.setEsealId(info.getSeal().getEsealId());
28 - bean.setEsealStatecode(info.getSeal().getEsealStateCode());  
29 - bean.setEsealStatehint(info.getSeal().getEsealStateHint());  
30 - bean.setAction(info.getMessageInfo().getAction());  
31 - bean.setSource(info.getMessageInfo().getSource());  
32 - bean.setEsealKey(info.getCtrlChanging().getEsealKey());  
33 - bean.setActionModel(info.getCtrlChanging().getActionModel());  
34 - bean.setActionModel(info.getCtrlChanging().getActionModel());  
35 - bean.setOpenTimes(info.getSeal().getOperTimes()); 26 + bean.setSealKey(info.getSeal().getSealKey());
  27 + bean.setVeName(info.getGps().getVeName());
  28 + bean.setGpsId(info.getGps().getGpsId());
  29 + bean.setDestCustoms(info.getGps().getDestCostoms());
  30 + bean.setOriginCustoms(info.getGps().getOpiginCostoms());
  31 + bean.setFormId(info.getFormId());
36 bean.setOpHint(info.getOpHint()); 32 bean.setOpHint(info.getOpHint());
37 - bean.setChangeCause(info.getCtrlChanging().getChanceCause());  
38 - bean.setChangeTime(info.getCtrlChanging().getChanceTime());  
39 - bean.setOperName(info.getCtrlChanging().getOperName());  
40 - bean.setOldesealId(info.getCtrlChanging().getOldesealId());  
41 - bean.setNewesealId(info.getCtrlChanging().getNewesealId());  
42 33
43 return bean; 34 return bean;
44 } 35 }
1 package com.sy.bwAnalysis; 1 package com.sy.bwAnalysis;
2 2
3 -import com.sy.bwAssist.GatherInfo; 3 +import com.sy.bwAssist.GatherInfoAssist;
4 import com.sy.bwAssist.Message; 4 import com.sy.bwAssist.Message;
5 import com.sy.bwAssist.Meta; 5 import com.sy.bwAssist.Meta;
6 -import com.sy.model.gatherinfo;  
7 - 6 +import com.sy.model.GatherInfo;
8 7
9 8
10 public class GatherInfoAnalysis { 9 public class GatherInfoAnalysis {
11 10
12 - public gatherinfo toJavaBean(Message msg) {  
13 - gatherinfo bean = new gatherinfo();  
14 - GatherInfo info = msg.getInfo(); 11 + public GatherInfo toJavaBean(Message msg) {
  12 + GatherInfo bean = new GatherInfo();
  13 + GatherInfoAssist info = msg.getInfo();
15 Meta meta = msg.getMeta(); 14 Meta meta = msg.getMeta();
16 bean.setSender(meta.getSender()); 15 bean.setSender(meta.getSender());
17 bean.setReceiver(meta.getReceiver()); 16 bean.setReceiver(meta.getReceiver());
@@ -47,11 +46,12 @@ public class GatherInfoAnalysis { @@ -47,11 +46,12 @@ public class GatherInfoAnalysis {
47 bean.setIcbusstype(info.getIc().getIcBussType()); 46 bean.setIcbusstype(info.getIc().getIcBussType());
48 bean.setIcexdata(info.getIc().getIcExData()); 47 bean.setIcexdata(info.getIc().getIcExData());
49 bean.setGrosswt((info.getWeight().getGrossWt())); 48 bean.setGrosswt((info.getWeight().getGrossWt()));
50 - bean.setTrecno(info.getTrailer().getTrEcNo());  
51 - bean.setTrname(info.getTrailer().getTrName());  
52 - bean.setTrwt((info.getTrailer().getTrWt()));  
53 - bean.setEsealicno(info.getSeal().getEsealIcNo()); 49 + bean.setSealkey(info.getSeal().getSealKey());
54 bean.setEsealid(info.getSeal().getEsealId()); 50 bean.setEsealid(info.getSeal().getEsealId());
  51 + bean.setOrdernum(info.getOderNum());
  52 + bean.setIcpegdatetime(info.getIc().getIcRegDatetime());
  53 + bean.setIcperdaydue(info.getIc().getIcPerDayDue());
  54 + bean.setIcfromtype(info.getIc().getIcFormType());
55 return bean; 55 return bean;
56 } 56 }
57 57
@@ -5,30 +5,89 @@ import com.thoughtworks.xstream.XStream; @@ -5,30 +5,89 @@ import com.thoughtworks.xstream.XStream;
5 import com.thoughtworks.xstream.io.xml.DomDriver; 5 import com.thoughtworks.xstream.io.xml.DomDriver;
6 import com.thoughtworks.xstream.io.xml.XmlFriendlyNameCoder; 6 import com.thoughtworks.xstream.io.xml.XmlFriendlyNameCoder;
7 7
8 -import java.io.File;  
9 -  
10 -/**  
11 - * @author zhangfan  
12 - * @web www.sy.com  
13 - * @company 郑州商友科技有限公司  
14 - * @time 2018-11-28 12:13  
15 - */ 8 +import java.io.UnsupportedEncodingException;
  9 +
16 public class MessageAnalysis { 10 public class MessageAnalysis {
17 11
18 public static Message msg = null; 12 public static Message msg = null;
19 13
20 - public Message readTicketsXml(String str){ 14 + public Message readTicketsXml(String str) {
  15 + // str = utf8Togb2312(str);
21 return getMessage(str); 16 return getMessage(str);
22 } 17 }
23 18
  19 + public static String getUTF8StringFromGBKString(String gbkStr) {
  20 + try {
  21 + return new String(getUTF8BytesFromGBKString(gbkStr), "UTF-8");
  22 + } catch (UnsupportedEncodingException e) {
  23 + throw new InternalError();
  24 + }
  25 + }
  26 +
  27 + public static byte[] getUTF8BytesFromGBKString(String gbkStr) {
  28 + int n = gbkStr.length();
  29 + byte[] utfBytes = new byte[3 * n];
  30 + int k = 0;
  31 + for (int i = 0; i < n; i++) {
  32 + int m = gbkStr.charAt(i);
  33 + if (m < 128 && m >= 0) {
  34 + utfBytes[k++] = (byte) m;
  35 + continue;
  36 + }
  37 + utfBytes[k++] = (byte) (0xe0 | (m >> 12));
  38 + utfBytes[k++] = (byte) (0x80 | ((m >> 6) & 0x3f));
  39 + utfBytes[k++] = (byte) (0x80 | (m & 0x3f));
  40 + }
  41 + if (k < utfBytes.length) {
  42 + byte[] tmp = new byte[k];
  43 + System.arraycopy(utfBytes, 0, tmp, 0, k);
  44 + return tmp;
  45 + }
  46 + return utfBytes;
  47 + }
  48 +
  49 + public static String utf8Togb2312(String str) {
  50 + StringBuffer sb = new StringBuffer();
  51 + for (int i = 0; i < str.length(); i++) {
  52 + char c = str.charAt(i);
  53 + switch (c) {
  54 + case '+':
  55 + sb.append(' ');
  56 + break;
  57 + case '%':
  58 + try {
  59 + sb.append((char) Integer.parseInt(
  60 + str.substring(i + 1, i + 3), 16));
  61 + } catch (NumberFormatException e) {
  62 + throw new IllegalArgumentException();
  63 + }
  64 + i += 2;
  65 + break;
  66 + default:
  67 + sb.append(c);
  68 + break;
  69 + }
  70 + }
  71 + String result = sb.toString();
  72 + String res = null;
  73 + try {
  74 + byte[] inputBytes = result.getBytes("8859_1");
  75 + res = new String(inputBytes, "UTF-8");
  76 + } catch (Exception e) {
  77 + }
  78 + return res;
  79 + }
  80 +
  81 +
24 static Message getMessage(String str) { 82 static Message getMessage(String str) {
25 XStream xstream = new XStream(new DomDriver("UTF-8", new XmlFriendlyNameCoder("_-", "_"))); 83 XStream xstream = new XStream(new DomDriver("UTF-8", new XmlFriendlyNameCoder("_-", "_")));
26 xstream.processAnnotations(Message.class); 84 xstream.processAnnotations(Message.class);
27 - msg =(Message)xstream.fromXML(str); 85 + msg = (Message) xstream.fromXML(str);
  86 + System.out.println("解析后的Message对象" + msg);
28 return msg; 87 return msg;
29 } 88 }
30 89
31 - public String getStype(){ 90 + public String getStype() {
32 return msg.getMeta().getSmType(); 91 return msg.getMeta().getSmType();
33 } 92 }
34 } 93 }
@@ -19,18 +19,18 @@ public class CommandInfo { @@ -19,18 +19,18 @@ public class CommandInfo {
19 @XStreamAsAttribute 19 @XStreamAsAttribute
20 private String SEQ_NO; 20 private String SEQ_NO;
21 21
22 - @XStreamAlias("EXECUTE_RESULT")  
23 - private String executeResult; 22 + @XStreamAlias("CHECK_RESULT")
  23 + private String checkResult;
24 24
25 - @XStreamAlias("MESSAGE_INFO ")  
26 - private MessageInfo messageInfo;  
27 -  
28 - @XStreamAlias("CTRL_CHANGING")  
29 - private CtrlChanging ctrlChanging; 25 + @XStreamAlias("GPS")
  26 + private GPS gps;
30 27
31 @XStreamAlias("OP_HINT") 28 @XStreamAlias("OP_HINT")
32 private String opHint; 29 private String opHint;
33 30
  31 + @XStreamAlias("FORM_ID")
  32 + private String formId;
  33 +
34 @XStreamAlias("SEAL") 34 @XStreamAlias("SEAL")
35 private Seal seal; 35 private Seal seal;
36 36
@@ -75,35 +75,35 @@ public class CommandInfo { @@ -75,35 +75,35 @@ public class CommandInfo {
75 this.seal = seal; 75 this.seal = seal;
76 } 76 }
77 77
78 - public String getExecuteResult() {  
79 - return executeResult; 78 + public String getOpHint() {
  79 + return opHint;
80 } 80 }
81 81
82 - public void setExecuteResult(String executeResult) {  
83 - this.executeResult = executeResult; 82 + public void setOpHint(String opHint) {
  83 + this.opHint = opHint;
84 } 84 }
85 85
86 - public MessageInfo getMessageInfo() {  
87 - return messageInfo; 86 + public String getCheckResult() {
  87 + return checkResult;
88 } 88 }
89 89
90 - public void setMessageInfo(MessageInfo messageInfo) {  
91 - this.messageInfo = messageInfo; 90 + public void setCheckResult(String checkResult) {
  91 + this.checkResult = checkResult;
92 } 92 }
93 93
94 - public CtrlChanging getCtrlChanging() {  
95 - return ctrlChanging; 94 + public GPS getGps() {
  95 + return gps;
96 } 96 }
97 97
98 - public void setCtrlChanging(CtrlChanging ctrlChanging) {  
99 - this.ctrlChanging = ctrlChanging; 98 + public void setGps(GPS gps) {
  99 + this.gps = gps;
100 } 100 }
101 101
102 - public String getOpHint() {  
103 - return opHint; 102 + public String getFormId() {
  103 + return formId;
104 } 104 }
105 105
106 - public void setOpHint(String opHint) {  
107 - this.opHint = opHint; 106 + public void setFormId(String formId) {
  107 + this.formId = formId;
108 } 108 }
109 } 109 }
  1 +package com.sy.bwAssist;
  2 +
  3 +import com.thoughtworks.xstream.annotations.XStreamAlias;
  4 +
  5 +/**
  6 + * @author zhangfan
  7 + * @web www.sy.com
  8 + * @company 郑州商友科技有限公司
  9 + * @time 2018-12-27 16:10
  10 + */
  11 +public class GPS {
  12 +
  13 + @XStreamAlias("VE_NAME")
  14 + private String veName;
  15 +
  16 + @XStreamAlias("GPS_ID")
  17 + private String gpsId;
  18 +
  19 + @XStreamAlias("ORIGIN_CUSTOMS")
  20 + private String opiginCostoms;
  21 +
  22 + @XStreamAlias("DEST_CUSTOMS")
  23 + private String destCostoms;
  24 +
  25 + public String getVeName() {
  26 + return veName;
  27 + }
  28 +
  29 + public void setVeName(String veName) {
  30 + this.veName = veName;
  31 + }
  32 +
  33 + public String getGpsId() {
  34 + return gpsId;
  35 + }
  36 +
  37 + public void setGpsId(String gpsId) {
  38 + this.gpsId = gpsId;
  39 + }
  40 +
  41 + public String getOpiginCostoms() {
  42 + return opiginCostoms;
  43 + }
  44 +
  45 + public void setOpiginCostoms(String opiginCostoms) {
  46 + this.opiginCostoms = opiginCostoms;
  47 + }
  48 +
  49 + public String getDestCostoms() {
  50 + return destCostoms;
  51 + }
  52 +
  53 + public void setDestCostoms(String destCostoms) {
  54 + this.destCostoms = destCostoms;
  55 + }
  56 +}
@@ -5,7 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; @@ -5,7 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
5 import org.springframework.stereotype.Component; 5 import org.springframework.stereotype.Component;
6 6
7 @Component 7 @Component
8 -public class GatherInfo { 8 +public class GatherInfoAssist {
9 9
10 @XStreamAsAttribute 10 @XStreamAsAttribute
11 private String AREA_ID; 11 private String AREA_ID;
@@ -27,16 +27,16 @@ public class GatherInfo { @@ -27,16 +27,16 @@ public class GatherInfo {
27 27
28 @XStreamAlias("CAR") 28 @XStreamAlias("CAR")
29 private Car car; 29 private Car car;
30 -  
31 - @XStreamAlias("TRAILER")  
32 - private Trailer trailer;  
33 - 30 +
34 @XStreamAlias("CONTA") 31 @XStreamAlias("CONTA")
35 private Conta conta; 32 private Conta conta;
36 33
37 @XStreamAlias("BAR_CODE") 34 @XStreamAlias("BAR_CODE")
38 private String BarCode; 35 private String BarCode;
39 - 36 +
  37 + @XStreamAlias("ORDER_NUM")
  38 + private String orderNum;
  39 +
40 @XStreamAlias("SEAL") 40 @XStreamAlias("SEAL")
41 private Seal seal; 41 private Seal seal;
42 42
@@ -98,14 +98,6 @@ public class GatherInfo { @@ -98,14 +98,6 @@ public class GatherInfo {
98 this.car = car; 98 this.car = car;
99 } 99 }
100 100
101 - public Trailer getTrailer() {  
102 - return trailer;  
103 - }  
104 -  
105 - public void setTrailer(Trailer trailer) {  
106 - this.trailer = trailer;  
107 - }  
108 -  
109 public Conta getConta() { 101 public Conta getConta() {
110 return conta; 102 return conta;
111 } 103 }
@@ -129,7 +121,15 @@ public class GatherInfo { @@ -129,7 +121,15 @@ public class GatherInfo {
129 public void setSeal(Seal seal) { 121 public void setSeal(Seal seal) {
130 this.seal = seal; 122 this.seal = seal;
131 } 123 }
132 - 124 +
  125 + public String getOderNum() {
  126 + return orderNum;
  127 + }
  128 +
  129 + public void setOrderNum(String orderNum) {
  130 + orderNum = orderNum;
  131 + }
  132 +
133 133
134 134
135 135
1 package com.sy.bwAssist; 1 package com.sy.bwAssist;
2 2
  3 +import com.sy.utils.DateTimeConverter;
  4 +import com.sy.utils.NumberConverter;
3 import com.thoughtworks.xstream.annotations.XStreamAlias; 5 import com.thoughtworks.xstream.annotations.XStreamAlias;
  6 +import com.thoughtworks.xstream.annotations.XStreamConverter;
  7 +
  8 +import java.math.BigDecimal;
  9 +import java.util.Date;
4 10
5 public class IC { 11 public class IC {
6 12
@@ -15,9 +21,13 @@ public class IC { @@ -15,9 +21,13 @@ public class IC {
15 21
16 @XStreamAlias("IC_BILL_NO") 22 @XStreamAlias("IC_BILL_NO")
17 private String IcBillNo; 23 private String IcBillNo;
18 - 24 +
  25 + @XStreamAlias("IC_FORM_TYPE")
  26 + private String IcFormType;
  27 +
19 @XStreamAlias("IC_GROSS_WT") 28 @XStreamAlias("IC_GROSS_WT")
20 - private String IcGrossWt; 29 + @XStreamConverter(NumberConverter.class)
  30 + private BigDecimal IcGrossWt;
21 31
22 @XStreamAlias("IC_VE_CUSTOMS_NO") 32 @XStreamAlias("IC_VE_CUSTOMS_NO")
23 private String IcVeCustomsNo; 33 private String IcVeCustomsNo;
@@ -37,6 +47,13 @@ public class IC { @@ -37,6 +47,13 @@ public class IC {
37 @XStreamAlias("IC_EX_DATA") 47 @XStreamAlias("IC_EX_DATA")
38 private String IcExData; 48 private String IcExData;
39 49
  50 + @XStreamAlias("IC_REG_DATETIME")
  51 + @XStreamConverter(DateTimeConverter.class)
  52 + private Date IcRegDatetime;
  53 +
  54 + @XStreamAlias("IC_PER_DAY_DUE")
  55 + private String IcPerDayDue;
  56 +
40 public String getDRICNO() { 57 public String getDRICNO() {
41 return DRICNO; 58 return DRICNO;
42 } 59 }
@@ -69,11 +86,11 @@ public class IC { @@ -69,11 +86,11 @@ public class IC {
69 IcBillNo = icBillNo; 86 IcBillNo = icBillNo;
70 } 87 }
71 88
72 - public String getIcGrossWt() { 89 + public BigDecimal getIcGrossWt() {
73 return IcGrossWt; 90 return IcGrossWt;
74 } 91 }
75 92
76 - public void setIcGrossWt(String icGrossWt) { 93 + public void setIcGrossWt(BigDecimal icGrossWt) {
77 IcGrossWt = icGrossWt; 94 IcGrossWt = icGrossWt;
78 } 95 }
79 96
@@ -124,7 +141,28 @@ public class IC { @@ -124,7 +141,28 @@ public class IC {
124 public void setIcExData(String icExData) { 141 public void setIcExData(String icExData) {
125 IcExData = icExData; 142 IcExData = icExData;
126 } 143 }
127 -  
128 -  
129 144
  145 + public String getIcFormType() {
  146 + return IcFormType;
  147 + }
  148 +
  149 + public void setIcFormType(String icFormType) {
  150 + IcFormType = icFormType;
  151 + }
  152 +
  153 + public Date getIcRegDatetime() {
  154 + return IcRegDatetime;
  155 + }
  156 +
  157 + public void setIcRegDatetime(Date icRegDatetime) {
  158 + IcRegDatetime = icRegDatetime;
  159 + }
  160 +
  161 + public String getIcPerDayDue() {
  162 + return IcPerDayDue;
  163 + }
  164 +
  165 + public void setIcPerDayDue(String icPerDayDue) {
  166 + IcPerDayDue = icPerDayDue;
  167 + }
130 } 168 }
@@ -11,7 +11,7 @@ public class Message { @@ -11,7 +11,7 @@ public class Message {
11 private Meta meta; 11 private Meta meta;
12 12
13 @XStreamAlias("GATHER_INFO") 13 @XStreamAlias("GATHER_INFO")
14 - private GatherInfo info; 14 + private GatherInfoAssist info;
15 15
16 @XStreamAlias("COMMAND_INFO") 16 @XStreamAlias("COMMAND_INFO")
17 private CommandInfo ComInfo; 17 private CommandInfo ComInfo;
@@ -35,11 +35,11 @@ public class Message { @@ -35,11 +35,11 @@ public class Message {
35 this.meta = meta; 35 this.meta = meta;
36 } 36 }
37 37
38 - public GatherInfo getInfo() { 38 + public GatherInfoAssist getInfo() {
39 return info; 39 return info;
40 } 40 }
41 41
42 - public void setInfo(GatherInfo info) { 42 + public void setInfo(GatherInfoAssist info) {
43 this.info = info; 43 this.info = info;
44 } 44 }
45 45
1 package com.sy.bwAssist; 1 package com.sy.bwAssist;
2 2
3 -import com.sy.utils.NumberConverter;  
4 import com.thoughtworks.xstream.annotations.XStreamAlias; 3 import com.thoughtworks.xstream.annotations.XStreamAlias;
5 -import com.thoughtworks.xstream.annotations.XStreamConverter;  
6 4
7 @XStreamAlias("SEAL") 5 @XStreamAlias("SEAL")
8 public class Seal { 6 public class Seal {
@@ -10,19 +8,11 @@ public class Seal { @@ -10,19 +8,11 @@ public class Seal {
10 @XStreamAlias("ESEAL_ID") 8 @XStreamAlias("ESEAL_ID")
11 private String EsealId; 9 private String EsealId;
12 10
13 - @XStreamAlias("ESEAL_IC_NO")  
14 - private String EsealIcNo;  
15 -  
16 - @XStreamAlias("OPEN_TIMES")  
17 - @XStreamConverter(NumberConverter.class)  
18 - private Integer operTimes;  
19 -  
20 - @XStreamAlias("ESEAL_STATEHINT")  
21 - private String EsealStateHint;  
22 -  
23 - @XStreamAlias("ESEAL_STATECODE")  
24 - private String EsealStateCode; 11 + @XStreamAlias("SEAL_KEY")
  12 + private String sealKey;
25 13
  14 + @XStreamAlias("CONTA_NUM")
  15 + private String countNum;
26 16
27 17
28 public String getEsealId() { 18 public String getEsealId() {
@@ -33,35 +23,21 @@ public class Seal { @@ -33,35 +23,21 @@ public class Seal {
33 EsealId = esealId; 23 EsealId = esealId;
34 } 24 }
35 25
36 - public String getEsealIcNo() {  
37 - return EsealIcNo; 26 + public String getSealKey() {
  27 + return sealKey;
38 } 28 }
39 29
40 - public void setEsealIcNo(String esealIcNo) {  
41 - EsealIcNo = esealIcNo; 30 + public void setSealKey(String sealKey) {
  31 + sealKey = sealKey;
42 } 32 }
43 33
44 - public Integer getOperTimes() {  
45 - return operTimes; 34 + public String getCountNum() {
  35 + return countNum;
46 } 36 }
47 37
48 - public void setOperTimes(Integer operTimes) {  
49 - this.operTimes = operTimes;  
50 - }  
51 -  
52 - public String getEsealStateHint() {  
53 - return EsealStateHint;  
54 - }  
55 -  
56 - public void setEsealStateHint(String esealStateHint) {  
57 - EsealStateHint = esealStateHint; 38 + public void setCountNum(String countNum) {
  39 + this.countNum = countNum;
58 } 40 }
  41 +}
59 42
60 - public String getEsealStateCode() {  
61 - return EsealStateCode;  
62 - }  
63 43
64 - public void setEsealStateCode(String esealStateCode) {  
65 - EsealStateCode = esealStateCode;  
66 - }  
67 -}  
1 -package com.sy.bwAssist;  
2 -  
3 -import com.sy.utils.NumberConverter;  
4 -import com.thoughtworks.xstream.annotations.XStreamAlias;  
5 -import com.thoughtworks.xstream.annotations.XStreamConverter;  
6 -  
7 -import java.math.BigDecimal;  
8 -  
9 -@XStreamAlias("TRAILER")  
10 -public class Trailer {  
11 -  
12 - @XStreamAlias("TR_EC_NO")  
13 - private String trEcNo;  
14 -  
15 - @XStreamAlias("TR_NAME")  
16 - private String TrName;  
17 -  
18 - @XStreamAlias("TR_WT")  
19 - @XStreamConverter(value=NumberConverter.class)  
20 - private BigDecimal TrWt;  
21 -  
22 - public String getTrEcNo() {  
23 - return trEcNo;  
24 - }  
25 -  
26 - public void setTrEcNo(String trEcNo) {  
27 - this.trEcNo = trEcNo;  
28 - }  
29 -  
30 - public String getTrName() {  
31 - return TrName;  
32 - }  
33 -  
34 - public void setTrName(String trName) {  
35 - TrName = trName;  
36 - }  
37 -  
38 - public BigDecimal getTrWt() {  
39 - return TrWt;  
40 - }  
41 -  
42 - public void setTrWt(BigDecimal trWt) {  
43 - TrWt = trWt;  
44 - }  
45 -  
46 -  
47 -}  
@@ -29,6 +29,9 @@ public class AnalysisRoute { @@ -29,6 +29,9 @@ public class AnalysisRoute {
29 @Autowired 29 @Autowired
30 private GatherInfoService infoService; 30 private GatherInfoService infoService;
31 31
  32 + @Autowired
  33 + private CommandInfoService commandService;
  34 +
32 private static AnalysisRoute route; 35 private static AnalysisRoute route;
33 36
34 private static MessageAnalysis analysis = new MessageAnalysis(); 37 private static MessageAnalysis analysis = new MessageAnalysis();
@@ -37,6 +40,7 @@ public class AnalysisRoute { @@ -37,6 +40,7 @@ public class AnalysisRoute {
37 private static ImStockAnalysis imStockAnalysis = new ImStockAnalysis(); 40 private static ImStockAnalysis imStockAnalysis = new ImStockAnalysis();
38 private static GATAnaluysis gatAnaluysis = new GATAnaluysis(); 41 private static GATAnaluysis gatAnaluysis = new GATAnaluysis();
39 private static GatherInfoAnalysis gatherInfoAnalysis = new GatherInfoAnalysis(); 42 private static GatherInfoAnalysis gatherInfoAnalysis = new GatherInfoAnalysis();
  43 + private static CommandInfoAnalysis commandInfoAnalysis = new CommandInfoAnalysis();
40 44
41 @PostConstruct 45 @PostConstruct
42 public void init(){ 46 public void init(){
@@ -46,14 +50,62 @@ public class AnalysisRoute { @@ -46,14 +50,62 @@ public class AnalysisRoute {
46 route.imStockService = this.imStockService; 50 route.imStockService = this.imStockService;
47 route.gatService = this.gatService; 51 route.gatService = this.gatService;
48 route.infoService = this.infoService; 52 route.infoService = this.infoService;
  53 + route.commandService = this.commandService;
49 } 54 }
50 - 55 + /* public static void main(String[] args) {
  56 + AnalysisRoute route = new AnalysisRoute();
  57 + route.analysis("<MSG><META><SNDR>KAKO</SNDR><RCVR></RCVR><SEQN>20181226160547</SEQN><DDTM>20181226160547</DDTM><TYPE>KAKO</TYPE><STYP>CARM</STYP></META><GATHER_INFO AREA_ID=\"4604000000\" CHNL_NO=\"4604333322\" I_E_TYPE=\"E\" SEQ_NO=\"20181128144318000004\">\n" +
  58 + "\t<IC>\n" +
  59 + "\t\t<DR_IC_NO/>\n" +
  60 + "\t\t<IC_DR_CUSTOMS_NO/>\n" +
  61 + "\t\t<IC_CO_CUSTOMS_NO/>\n" +
  62 + "\t\t<IC_BILL_NO/>\n" +
  63 + "\t\t<IC_FORM_TYPE/>\n" +
  64 + "\t\t<IC_GROSS_WT/>\n" +
  65 + "\t\t<IC_VE_CUSTOMS_NO/>\n" +
  66 + "\t\t<IC_VE_NAME/>\n" +
  67 + "\t\t<IC_CONTA_ID/>\n" +
  68 + "\t\t<IC_ESEAL_ID/>\n" +
  69 + "\t\t<IC_REG_DATETIME/>\n" +
  70 + "\t\t<IC_PER_DAY_DUE/>\n" +
  71 + "\t</IC>\n" +
  72 + "\t<WEIGHT>\n" +
  73 + "\t\t<GROSS_WT>9100</GROSS_WT>\n" +
  74 + "\t</WEIGHT>\n" +
  75 + "\t<CAR>\n" +
  76 + "\t\t<VE_NAME>豫AJ1205</VE_NAME>\n" +
  77 + "\t\t<CAR_EC_NO>E0040000BFB0C007</CAR_EC_NO>\n" +
  78 + "\t\t<CAR_EC_NO2/>\n" +
  79 + "\t\t<VE_CUSTOMS_NO/>\n" +
  80 + "\t\t<VE_WT/>\n" +
  81 + "\t</CAR>\n" +
  82 + "\t<CONTA>\n" +
  83 + "\t\t<CONTA_NUM/>\n" +
  84 + "\t\t<CONTA_RECO>1</CONTA_RECO>\n" +
  85 + "\t\t<CONTA_ID_F/>\n" +
  86 + "\t\t<CONTA_ID_B/>\n" +
  87 + "\t\t<CONTA_MODEL_F/>\n" +
  88 + "\t\t<CONTA_MODEL_B/>\n" +
  89 + "\t</CONTA>\n" +
  90 + "\t<ORDER_NUM/>\n" +
  91 + "\t<BAR_CODE/>\n" +
  92 + "\t<SEAL>\n" +
  93 + "\t\t<ESEAL_ID/>\n" +
  94 + "\t\t<SEAL_KEY/>\n" +
  95 + "\t</SEAL>\n" +
  96 + "</GATHER_INFO></MSG>");
  97 + }*/
51 public void analysis(String string) { 98 public void analysis(String string) {
52 Message message = analysis.readTicketsXml(string); 99 Message message = analysis.readTicketsXml(string);
53 - String stype = analysis.getStype(); 100 + String stype = message.getMeta().getSmType();
54 if (stype.equals("CARM")) { 101 if (stype.equals("CARM")) {
55 - gatherinfo info = gatherInfoAnalysis.toJavaBean(message);  
56 - route.infoService.save(info); 102 + if(message.getComInfo() !=null){
  103 + commandInfo info = commandInfoAnalysis.toJavaBean(message);
  104 + route.commandService.save(info);
  105 + }else{
  106 + GatherInfo info = gatherInfoAnalysis.toJavaBean(message);
  107 + route.infoService.save(info);
  108 + }
57 } else if (stype.equals("ES1")) { 109 } else if (stype.equals("ES1")) {
58 airone_ex_stock exStock = exStockAnalysis.toExStock(message); 110 airone_ex_stock exStock = exStockAnalysis.toExStock(message);
59 route.exStockService.save(exStock); 111 route.exStockService.save(exStock);
1 -package com.sy.controller;  
2 -  
3 -import org.springframework.stereotype.Controller;  
4 -import org.springframework.web.bind.annotation.RequestMapping;  
5 -  
6 -/**  
7 - * @author zhangfan  
8 - * @web www.sy.com  
9 - * @company 郑州商友科技有限公司  
10 - * @time 2018-11-20 11:12  
11 - */  
12 -@Controller  
13 -public class TestController {  
14 -  
15 - @RequestMapping("/index")  
16 - public String toindex() {  
17 - return "hello springBoot";  
18 - }  
19 -  
20 - @RequestMapping("/hello")  
21 - public String toHello() {  
22 - return "hello";  
23 - }  
24 -  
25 - @RequestMapping("/welcome")  
26 - public String toWelcome() {  
27 - return "Welcome";  
28 - }  
29 -  
30 -}  
  1 +package com.sy.mapper;
  2 +
  3 +import com.sy.model.GatherInfo;
  4 +
  5 +public interface GatherInfoMapper {
  6 + int deleteByPrimaryKey(String seqno);
  7 +
  8 + int insert(GatherInfo record);
  9 +
  10 + int insertSelective(GatherInfo record);
  11 +
  12 + GatherInfo selectByPrimaryKey(String seqno);
  13 +
  14 + int updateByPrimaryKeySelective(GatherInfo record);
  15 +
  16 + int updateByPrimaryKey(GatherInfo record);
  17 +}
@@ -3,7 +3,15 @@ package com.sy.mapper; @@ -3,7 +3,15 @@ package com.sy.mapper;
3 import com.sy.model.commandInfo; 3 import com.sy.model.commandInfo;
4 4
5 public interface commandInfoMapper { 5 public interface commandInfoMapper {
6 - int insert(commandInfo info); 6 + int deleteByPrimaryKey(String seqNo);
  7 +
  8 + int insert(commandInfo record);
7 9
8 int insertSelective(commandInfo record); 10 int insertSelective(commandInfo record);
  11 +
  12 + commandInfo selectByPrimaryKey(String seqNo);
  13 +
  14 + int updateByPrimaryKeySelective(commandInfo record);
  15 +
  16 + int updateByPrimaryKey(commandInfo record);
9 } 17 }
1 -package com.sy.mapper;  
2 -  
3 -import com.sy.model.gatherinfo;  
4 -  
5 -public interface gatherinfoMapper {  
6 - int deleteByPrimaryKey(String seqno);  
7 -  
8 - int insert(gatherinfo record);  
9 -  
10 - int insertSelective(gatherinfo record);  
11 -  
12 - gatherinfo selectByPrimaryKey(String seqno);  
13 -  
14 - int updateByPrimaryKeySelective(gatherinfo record);  
15 -  
16 - int updateByPrimaryKey(gatherinfo record);  
17 -}  
@@ -3,7 +3,7 @@ package com.sy.model; @@ -3,7 +3,7 @@ package com.sy.model;
3 import java.math.BigDecimal; 3 import java.math.BigDecimal;
4 import java.util.Date; 4 import java.util.Date;
5 5
6 -public class gatherinfo { 6 +public class GatherInfo {
7 private String seqno; 7 private String seqno;
8 8
9 private String sender; 9 private String sender;
@@ -32,7 +32,9 @@ public class gatherinfo { @@ -32,7 +32,9 @@ public class gatherinfo {
32 32
33 private String icbillno; 33 private String icbillno;
34 34
35 - private String icgrosswt; 35 + private String icfromtype;
  36 +
  37 + private BigDecimal icgrosswt;
36 38
37 private String icvecustomsno; 39 private String icvecustomsno;
38 40
@@ -46,6 +48,10 @@ public class gatherinfo { @@ -46,6 +48,10 @@ public class gatherinfo {
46 48
47 private String icexdata; 49 private String icexdata;
48 50
  51 + private Date icpegdatetime;
  52 +
  53 + private String icperdaydue;
  54 +
49 private BigDecimal grosswt; 55 private BigDecimal grosswt;
50 56
51 private String vename; 57 private String vename;
@@ -58,12 +64,6 @@ public class gatherinfo { @@ -58,12 +64,6 @@ public class gatherinfo {
58 64
59 private BigDecimal vewt; 65 private BigDecimal vewt;
60 66
61 - private String trecno;  
62 -  
63 - private String trname;  
64 -  
65 - private BigDecimal trwt;  
66 -  
67 private String contanum; 67 private String contanum;
68 68
69 private String contareco; 69 private String contareco;
@@ -80,10 +80,12 @@ public class gatherinfo { @@ -80,10 +80,12 @@ public class gatherinfo {
80 80
81 private String esealid; 81 private String esealid;
82 82
83 - private String esealicno; 83 + private String sealkey;
84 84
85 private Date createtime; 85 private Date createtime;
86 86
  87 + private String ordernum;
  88 +
87 public String getSeqno() { 89 public String getSeqno() {
88 return seqno; 90 return seqno;
89 } 91 }
@@ -196,12 +198,20 @@ public class gatherinfo { @@ -196,12 +198,20 @@ public class gatherinfo {
196 this.icbillno = icbillno == null ? null : icbillno.trim(); 198 this.icbillno = icbillno == null ? null : icbillno.trim();
197 } 199 }
198 200
199 - public String getIcgrosswt() { 201 + public String getIcfromtype() {
  202 + return icfromtype;
  203 + }
  204 +
  205 + public void setIcfromtype(String icfromtype) {
  206 + this.icfromtype = icfromtype == null ? null : icfromtype.trim();
  207 + }
  208 +
  209 + public BigDecimal getIcgrosswt() {
200 return icgrosswt; 210 return icgrosswt;
201 } 211 }
202 212
203 - public void setIcgrosswt(String icgrosswt) {  
204 - this.icgrosswt = icgrosswt == null ? null : icgrosswt.trim(); 213 + public void setIcgrosswt(BigDecimal icgrosswt) {
  214 + this.icgrosswt = icgrosswt;
205 } 215 }
206 216
207 public String getIcvecustomsno() { 217 public String getIcvecustomsno() {
@@ -252,6 +262,22 @@ public class gatherinfo { @@ -252,6 +262,22 @@ public class gatherinfo {
252 this.icexdata = icexdata == null ? null : icexdata.trim(); 262 this.icexdata = icexdata == null ? null : icexdata.trim();
253 } 263 }
254 264
  265 + public Date getIcpegdatetime() {
  266 + return icpegdatetime;
  267 + }
  268 +
  269 + public void setIcpegdatetime(Date icpegdatetime) {
  270 + this.icpegdatetime = icpegdatetime;
  271 + }
  272 +
  273 + public String getIcperdaydue() {
  274 + return icperdaydue;
  275 + }
  276 +
  277 + public void setIcperdaydue(String icperdaydue) {
  278 + this.icperdaydue = icperdaydue == null ? null : icperdaydue.trim();
  279 + }
  280 +
255 public BigDecimal getGrosswt() { 281 public BigDecimal getGrosswt() {
256 return grosswt; 282 return grosswt;
257 } 283 }
@@ -300,30 +326,6 @@ public class gatherinfo { @@ -300,30 +326,6 @@ public class gatherinfo {
300 this.vewt = vewt; 326 this.vewt = vewt;
301 } 327 }
302 328
303 - public String getTrecno() {  
304 - return trecno;  
305 - }  
306 -  
307 - public void setTrecno(String trecno) {  
308 - this.trecno = trecno == null ? null : trecno.trim();  
309 - }  
310 -  
311 - public String getTrname() {  
312 - return trname;  
313 - }  
314 -  
315 - public void setTrname(String trname) {  
316 - this.trname = trname == null ? null : trname.trim();  
317 - }  
318 -  
319 - public BigDecimal getTrwt() {  
320 - return trwt;  
321 - }  
322 -  
323 - public void setTrwt(BigDecimal trwt) {  
324 - this.trwt = trwt;  
325 - }  
326 -  
327 public String getContanum() { 329 public String getContanum() {
328 return contanum; 330 return contanum;
329 } 331 }
@@ -388,12 +390,12 @@ public class gatherinfo { @@ -388,12 +390,12 @@ public class gatherinfo {
388 this.esealid = esealid == null ? null : esealid.trim(); 390 this.esealid = esealid == null ? null : esealid.trim();
389 } 391 }
390 392
391 - public String getEsealicno() {  
392 - return esealicno; 393 + public String getSealkey() {
  394 + return sealkey;
393 } 395 }
394 396
395 - public void setEsealicno(String esealicno) {  
396 - this.esealicno = esealicno == null ? null : esealicno.trim(); 397 + public void setSealkey(String sealkey) {
  398 + this.sealkey = sealkey == null ? null : sealkey.trim();
397 } 399 }
398 400
399 public Date getCreatetime() { 401 public Date getCreatetime() {
@@ -403,4 +405,12 @@ public class gatherinfo { @@ -403,4 +405,12 @@ public class gatherinfo {
403 public void setCreatetime(Date createtime) { 405 public void setCreatetime(Date createtime) {
404 this.createtime = createtime; 406 this.createtime = createtime;
405 } 407 }
  408 +
  409 + public String getOrdernum() {
  410 + return ordernum;
  411 + }
  412 +
  413 + public void setOrdernum(String ordernum) {
  414 + this.ordernum = ordernum == null ? null : ordernum.trim();
  415 + }
406 } 416 }
@@ -3,197 +3,186 @@ package com.sy.model; @@ -3,197 +3,186 @@ package com.sy.model;
3 import java.util.Date; 3 import java.util.Date;
4 4
5 public class commandInfo { 5 public class commandInfo {
6 -  
7 - private String areaId;  
8 -  
9 - private String chnlNo;  
10 -  
11 - private String iEType;  
12 -  
13 private String seqNo; 6 private String seqNo;
14 7
15 - private String executeResult; 8 + private String sender;
16 9
17 - private String source; 10 + private String receiver;
18 11
19 - private String action; 12 + private String seqn;
20 13
21 - private Integer openTimes; 14 + private Date sendtime;
22 15
23 - private String esealIcNo; 16 + private String btype;
24 17
25 - private String esealId; 18 + private String stype;
26 19
27 - private String esealStatehint; 20 + private String areaId;
28 21
29 - private String esealStatecode; 22 + private String chnlNo;
30 23
31 - private String oldesealId; 24 + private String iEType;
32 25
33 - private String newesealId; 26 + private String checkResult;
34 27
35 - private String esealKey; 28 + private String veName;
36 29
37 - private String actionModel; 30 + private String gpsId;
38 31
39 - private String changeCause; 32 + private String originCustoms;
40 33
41 - private Date changeTime; 34 + private String destCustoms;
42 35
43 - private String operName; 36 + private String esealId;
44 37
45 - private String opHint; 38 + private String sealKey;
46 39
47 - public String getAreaId() {  
48 - return areaId;  
49 - } 40 + private String formId;
50 41
51 - public void setAreaId(String areaId) {  
52 - this.areaId = areaId == null ? null : areaId.trim();  
53 - } 42 + private String opHint;
54 43
55 - public String getChnlNo() {  
56 - return chnlNo; 44 + public String getSeqNo() {
  45 + return seqNo;
57 } 46 }
58 47
59 - public void setChnlNo(String chnlNo) {  
60 - this.chnlNo = chnlNo == null ? null : chnlNo.trim(); 48 + public void setSeqNo(String seqNo) {
  49 + this.seqNo = seqNo == null ? null : seqNo.trim();
61 } 50 }
62 51
63 - public String getiEType() {  
64 - return iEType; 52 + public String getSender() {
  53 + return sender;
65 } 54 }
66 55
67 - public void setiEType(String iEType) {  
68 - this.iEType = iEType == null ? null : iEType.trim(); 56 + public void setSender(String sender) {
  57 + this.sender = sender == null ? null : sender.trim();
69 } 58 }
70 59
71 - public String getSeqNo() {  
72 - return seqNo; 60 + public String getReceiver() {
  61 + return receiver;
73 } 62 }
74 63
75 - public void setSeqNo(String seqNo) {  
76 - this.seqNo = seqNo == null ? null : seqNo.trim(); 64 + public void setReceiver(String receiver) {
  65 + this.receiver = receiver == null ? null : receiver.trim();
77 } 66 }
78 67
79 - public String getExecuteResult() {  
80 - return executeResult; 68 + public String getSeqn() {
  69 + return seqn;
81 } 70 }
82 71
83 - public void setExecuteResult(String executeResult) {  
84 - this.executeResult = executeResult == null ? null : executeResult.trim(); 72 + public void setSeqn(String seqn) {
  73 + this.seqn = seqn == null ? null : seqn.trim();
85 } 74 }
86 75
87 - public String getSource() {  
88 - return source; 76 + public Date getSendtime() {
  77 + return sendtime;
89 } 78 }
90 79
91 - public void setSource(String source) {  
92 - this.source = source == null ? null : source.trim(); 80 + public void setSendtime(Date sendtime) {
  81 + this.sendtime = sendtime;
93 } 82 }
94 83
95 - public String getAction() {  
96 - return action; 84 + public String getBtype() {
  85 + return btype;
97 } 86 }
98 87
99 - public void setAction(String action) {  
100 - this.action = action == null ? null : action.trim(); 88 + public void setBtype(String btype) {
  89 + this.btype = btype == null ? null : btype.trim();
101 } 90 }
102 91
103 - public Integer getOpenTimes() {  
104 - return openTimes; 92 + public String getStype() {
  93 + return stype;
105 } 94 }
106 95
107 - public void setOpenTimes(Integer openTimes) {  
108 - this.openTimes = openTimes; 96 + public void setStype(String stype) {
  97 + this.stype = stype == null ? null : stype.trim();
109 } 98 }
110 99
111 - public String getEsealIcNo() {  
112 - return esealIcNo; 100 + public String getAreaId() {
  101 + return areaId;
113 } 102 }
114 103
115 - public void setEsealIcNo(String esealIcNo) {  
116 - this.esealIcNo = esealIcNo == null ? null : esealIcNo.trim(); 104 + public void setAreaId(String areaId) {
  105 + this.areaId = areaId == null ? null : areaId.trim();
117 } 106 }
118 107
119 - public String getEsealId() {  
120 - return esealId; 108 + public String getChnlNo() {
  109 + return chnlNo;
121 } 110 }
122 111
123 - public void setEsealId(String esealId) {  
124 - this.esealId = esealId == null ? null : esealId.trim(); 112 + public void setChnlNo(String chnlNo) {
  113 + this.chnlNo = chnlNo == null ? null : chnlNo.trim();
125 } 114 }
126 115
127 - public String getEsealStatehint() {  
128 - return esealStatehint; 116 + public String getiEType() {
  117 + return iEType;
129 } 118 }
130 119
131 - public void setEsealStatehint(String esealStatehint) {  
132 - this.esealStatehint = esealStatehint == null ? null : esealStatehint.trim(); 120 + public void setiEType(String iEType) {
  121 + this.iEType = iEType == null ? null : iEType.trim();
133 } 122 }
134 123
135 - public String getEsealStatecode() {  
136 - return esealStatecode; 124 + public String getCheckResult() {
  125 + return checkResult;
137 } 126 }
138 127
139 - public void setEsealStatecode(String esealStatecode) {  
140 - this.esealStatecode = esealStatecode == null ? null : esealStatecode.trim(); 128 + public void setCheckResult(String checkResult) {
  129 + this.checkResult = checkResult == null ? null : checkResult.trim();
141 } 130 }
142 131
143 - public String getOldesealId() {  
144 - return oldesealId; 132 + public String getVeName() {
  133 + return veName;
145 } 134 }
146 135
147 - public void setOldesealId(String oldesealId) {  
148 - this.oldesealId = oldesealId == null ? null : oldesealId.trim(); 136 + public void setVeName(String veName) {
  137 + this.veName = veName == null ? null : veName.trim();
149 } 138 }
150 139
151 - public String getNewesealI() {  
152 - return newesealId; 140 + public String getGpsId() {
  141 + return gpsId;
153 } 142 }
154 143
155 - public void setNewesealId(String ewesealId) {  
156 - this.newesealId = ewesealId == null ? null : ewesealId.trim(); 144 + public void setGpsId(String gpsId) {
  145 + this.gpsId = gpsId == null ? null : gpsId.trim();
157 } 146 }
158 147
159 - public String getEsealKey() {  
160 - return esealKey; 148 + public String getOriginCustoms() {
  149 + return originCustoms;
161 } 150 }
162 151
163 - public void setEsealKey(String esealKey) {  
164 - this.esealKey = esealKey == null ? null : esealKey.trim(); 152 + public void setOriginCustoms(String originCustoms) {
  153 + this.originCustoms = originCustoms == null ? null : originCustoms.trim();
165 } 154 }
166 155
167 - public String getActionModel() {  
168 - return actionModel; 156 + public String getDestCustoms() {
  157 + return destCustoms;
169 } 158 }
170 159
171 - public void setActionModel(String actionModel) {  
172 - this.actionModel = actionModel == null ? null : actionModel.trim(); 160 + public void setDestCustoms(String destCustoms) {
  161 + this.destCustoms = destCustoms == null ? null : destCustoms.trim();
173 } 162 }
174 163
175 - public String getChangeCause() {  
176 - return changeCause; 164 + public String getEsealId() {
  165 + return esealId;
177 } 166 }
178 167
179 - public void setChangeCause(String changeCause) {  
180 - this.changeCause = changeCause == null ? null : changeCause.trim(); 168 + public void setEsealId(String esealId) {
  169 + this.esealId = esealId == null ? null : esealId.trim();
181 } 170 }
182 171
183 - public Date getChangeTime() {  
184 - return changeTime; 172 + public String getSealKey() {
  173 + return sealKey;
185 } 174 }
186 175
187 - public void setChangeTime(Date changeTime) {  
188 - this.changeTime = changeTime; 176 + public void setSealKey(String sealKey) {
  177 + this.sealKey = sealKey == null ? null : sealKey.trim();
189 } 178 }
190 179
191 - public String getOperName() {  
192 - return operName; 180 + public String getFormId() {
  181 + return formId;
193 } 182 }
194 183
195 - public void setOperName(String operName) {  
196 - this.operName = operName == null ? null : operName.trim(); 184 + public void setFormId(String formId) {
  185 + this.formId = formId == null ? null : formId.trim();
197 } 186 }
198 187
199 public String getOpHint() { 188 public String getOpHint() {
1 package com.sy.service; 1 package com.sy.service;
2 2
3 -import com.sy.model.gatherinfo; 3 +import com.sy.model.GatherInfo;
4 4
5 -/**  
6 - * @author zhangfan  
7 - * @web www.sy.com  
8 - * @company 郑州商友科技有限公司  
9 - * @time 2018-11-28 16:40  
10 - */  
11 public interface GatherInfoService { 5 public interface GatherInfoService {
12 6
13 - int save(gatherinfo info); 7 + int save(GatherInfo info);
14 } 8 }
@@ -5,7 +5,9 @@ import com.sy.mapper.commandInfoMapper; @@ -5,7 +5,9 @@ import com.sy.mapper.commandInfoMapper;
5 import com.sy.model.commandInfo; 5 import com.sy.model.commandInfo;
6 import com.sy.service.CommandInfoService; 6 import com.sy.service.CommandInfoService;
7 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
  8 +import org.springframework.stereotype.Service;
8 9
  10 +@Service
9 public class CommandInfoImpl implements CommandInfoService { 11 public class CommandInfoImpl implements CommandInfoService {
10 12
11 @Autowired 13 @Autowired
1 package com.sy.service.impl; 1 package com.sy.service.impl;
2 2
3 -import com.sy.mapper.gatherinfoMapper;  
4 -import com.sy.model.gatherinfo; 3 +import com.sy.mapper.GatherInfoMapper;
  4 +import com.sy.model.GatherInfo;
5 import com.sy.service.GatherInfoService; 5 import com.sy.service.GatherInfoService;
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
9 -/**  
10 - * @author zhangfan  
11 - * @web www.sy.com  
12 - * @company 郑州商友科技有限公司  
13 - * @time 2018-11-28 16:52  
14 - */  
15 @Service 9 @Service
16 public class GatherInfoServiceImpl implements GatherInfoService { 10 public class GatherInfoServiceImpl implements GatherInfoService {
17 11
18 @Autowired 12 @Autowired
19 - private gatherinfoMapper infoMapper; 13 + private GatherInfoMapper infoMapper;
20 14
21 @Override 15 @Override
22 - public int save(gatherinfo info) { 16 + public int save(GatherInfo info) {
23 int row = 0; 17 int row = 0;
24 try { 18 try {
25 row =infoMapper.insert(info); 19 row =infoMapper.insert(info);
1 #设置访问端口 1 #设置访问端口
2 server.port=8082 2 server.port=8082
3 -#thymeleaf配置,这里是可以省略的，因为默认配置已经足够  
4 -#关闭缓存，及时刷新页面,这一点很重要  
5 -#spring.thymeleaf.cache=false  
6 -#注释的部分是Thymeleaf默认的配置，如有其它需求可以自行更改  
7 -#spring.thymeleaf.prefix=classpath:/webapp/WEB-INF/  
8 -#spring.thymeleaf.suffix=.html  
9 -#spring.thymeleaf.mode=HTML5  
10 -#spring.thymeleaf.encoding=UTF-8  
11 -#spring.thymeleaf.servlet.content-type=text/html  
12 -  
13 #eureka注册中心服务器地址 3 #eureka注册中心服务器地址
14 -eureka.client.service-url.defaultZone=http://10.50.3.82:19527/eureka/ 4 +#eureka.client.service-url.defaultZone=http://10.50.3.82:19527/eureka/
15 #服务名 5 #服务名
16 -spring.application.name=AnalysisForStation 6 +#spring.application.name=AnalysisForStation
17 #设置热部署 7 #设置热部署
18 #开启热部署 8 #开启热部署
19 spring.devtools.restart.enabled=true 9 spring.devtools.restart.enabled=true
@@ -31,8 +21,9 @@ spring.datasource.password=root @@ -31,8 +21,9 @@ spring.datasource.password=root
31 #驱动 21 #驱动
32 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver 22 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
33 #数据库连接路径 23 #数据库连接路径
34 -spring.datasource.url=jdbc:mysql://localhost:3306/bysj  
35 -#连接池类型 24 +spring.datasource.url=jdbc:mysql://localhost:3306/bysj?useUnicode=true&characterEncoding=utf8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai
  25 +
  26 +#连接池类
36 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource 27 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
37 #连接池配置，因为springboot默认是开启了连接池的，它有默认配置，这一段可以忽略 28 #连接池配置，因为springboot默认是开启了连接池的，它有默认配置，这一段可以忽略
38 # 初始化大小，最小，最大 29 # 初始化大小，最小，最大
@@ -62,7 +62,8 @@ @@ -62,7 +62,8 @@
62 enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table> 62 enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>
63 <table tableName="vehicle_mainifist_relation" domainObjectName="vehicle_mainifist_relation" enableCountByExample="false" enableUpdateByExample="false" 63 <table tableName="vehicle_mainifist_relation" domainObjectName="vehicle_mainifist_relation" enableCountByExample="false" enableUpdateByExample="false"
64 enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>--> 64 enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>-->
65 - <table tableName="commandInfo" domainObjectName="commandInfo" enableCountByExample="false" enableUpdateByExample="false" 65 + <table tableName="gatherinfo" domainObjectName="GatherInfo" enableCountByExample="false"
  66 + enableUpdateByExample="false"
66 enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table> 67 enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>
67 </context> 68 </context>
68 </generatorConfiguration> 69 </generatorConfiguration>
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.sy.mapper.gatherinfoMapper">  
4 - <resultMap id="BaseResultMap" type="com.sy.model.gatherinfo"> 3 +<mapper namespace="com.sy.mapper.GatherInfoMapper">
  4 + <resultMap id="BaseResultMap" type="com.sy.model.GatherInfo">
5 <id column="SeqNo" jdbcType="VARCHAR" property="seqno" /> 5 <id column="SeqNo" jdbcType="VARCHAR" property="seqno" />
6 <result column="sender" jdbcType="VARCHAR" property="sender" /> 6 <result column="sender" jdbcType="VARCHAR" property="sender" />
7 <result column="receiver" jdbcType="VARCHAR" property="receiver" /> 7 <result column="receiver" jdbcType="VARCHAR" property="receiver" />
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
16 <result column="IcDrCustomsNo" jdbcType="VARCHAR" property="icdrcustomsno" /> 16 <result column="IcDrCustomsNo" jdbcType="VARCHAR" property="icdrcustomsno" />
17 <result column="IcCoCustomsNo" jdbcType="VARCHAR" property="iccocustomsno" /> 17 <result column="IcCoCustomsNo" jdbcType="VARCHAR" property="iccocustomsno" />
18 <result column="IcBillNo" jdbcType="VARCHAR" property="icbillno" /> 18 <result column="IcBillNo" jdbcType="VARCHAR" property="icbillno" />
  19 + <result column="IcFromType" jdbcType="VARCHAR" property="icfromtype" />
19 <result column="IcGrossWt" jdbcType="DECIMAL" property="icgrosswt" /> 20 <result column="IcGrossWt" jdbcType="DECIMAL" property="icgrosswt" />
20 <result column="IcVeCustomsNo" jdbcType="VARCHAR" property="icvecustomsno" /> 21 <result column="IcVeCustomsNo" jdbcType="VARCHAR" property="icvecustomsno" />
21 <result column="IcVeName" jdbcType="VARCHAR" property="icvename" /> 22 <result column="IcVeName" jdbcType="VARCHAR" property="icvename" />
@@ -23,15 +24,14 @@ @@ -23,15 +24,14 @@
23 <result column="IcEsealId" jdbcType="VARCHAR" property="icesealid" /> 24 <result column="IcEsealId" jdbcType="VARCHAR" property="icesealid" />
24 <result column="IcBussType" jdbcType="VARCHAR" property="icbusstype" /> 25 <result column="IcBussType" jdbcType="VARCHAR" property="icbusstype" />
25 <result column="IcExData" jdbcType="VARCHAR" property="icexdata" /> 26 <result column="IcExData" jdbcType="VARCHAR" property="icexdata" />
  27 + <result column="IcPegDatetime" jdbcType="TIMESTAMP" property="icpegdatetime" />
  28 + <result column="IcPerDayDue" jdbcType="VARCHAR" property="icperdaydue" />
26 <result column="GrossWt" jdbcType="DECIMAL" property="grosswt" /> 29 <result column="GrossWt" jdbcType="DECIMAL" property="grosswt" />
27 <result column="VeName" jdbcType="VARCHAR" property="vename" /> 30 <result column="VeName" jdbcType="VARCHAR" property="vename" />
28 <result column="CarEcNo" jdbcType="VARCHAR" property="carecno" /> 31 <result column="CarEcNo" jdbcType="VARCHAR" property="carecno" />
29 <result column="CarEcNo2" jdbcType="VARCHAR" property="carecno2" /> 32 <result column="CarEcNo2" jdbcType="VARCHAR" property="carecno2" />
30 <result column="VeCustomsNo" jdbcType="VARCHAR" property="vecustomsno" /> 33 <result column="VeCustomsNo" jdbcType="VARCHAR" property="vecustomsno" />
31 <result column="VeWt" jdbcType="DECIMAL" property="vewt" /> 34 <result column="VeWt" jdbcType="DECIMAL" property="vewt" />
32 - <result column="trEcNo" jdbcType="VARCHAR" property="trecno" />  
33 - <result column="TrName" jdbcType="VARCHAR" property="trname" />  
34 - <result column="TrWt" jdbcType="DECIMAL" property="trwt" />  
35 <result column="ContaNum" jdbcType="VARCHAR" property="contanum" /> 35 <result column="ContaNum" jdbcType="VARCHAR" property="contanum" />
36 <result column="ContaReco" jdbcType="VARCHAR" property="contareco" /> 36 <result column="ContaReco" jdbcType="VARCHAR" property="contareco" />
37 <result column="ContaIdF" jdbcType="VARCHAR" property="contaidf" /> 37 <result column="ContaIdF" jdbcType="VARCHAR" property="contaidf" />
@@ -40,15 +40,16 @@ @@ -40,15 +40,16 @@
40 <result column="ContaModelB" jdbcType="VARCHAR" property="contamodelb" /> 40 <result column="ContaModelB" jdbcType="VARCHAR" property="contamodelb" />
41 <result column="BarCode" jdbcType="VARCHAR" property="barcode" /> 41 <result column="BarCode" jdbcType="VARCHAR" property="barcode" />
42 <result column="EsealId" jdbcType="VARCHAR" property="esealid" /> 42 <result column="EsealId" jdbcType="VARCHAR" property="esealid" />
43 - <result column="EsealIcNo" jdbcType="VARCHAR" property="esealicno" />  
44 - <result column="CreateTime" jdbcType="TIMESTAMP" property="createtime" /> 43 + <result column="SealKey" jdbcType="VARCHAR" property="sealkey" />
  44 + <result column="CreateTime" jdbcType="DATE" property="createtime" />
  45 + <result column="OrderNum" jdbcType="VARCHAR" property="ordernum" />
45 </resultMap> 46 </resultMap>
46 <sql id="Base_Column_List"> 47 <sql id="Base_Column_List">
47 SeqNo, sender, receiver, seqn, sendTime, type, smType, areaId, chnlNo, IEtype, DrIcNo, 48 SeqNo, sender, receiver, seqn, sendTime, type, smType, areaId, chnlNo, IEtype, DrIcNo,
48 - IcDrCustomsNo, IcCoCustomsNo, IcBillNo, IcGrossWt, IcVeCustomsNo, IcVeName, IcContaId,  
49 - IcEsealId, IcBussType, IcExData, GrossWt, VeName, CarEcNo, CarEcNo2, VeCustomsNo,  
50 - VeWt, trEcNo, TrName, TrWt, ContaNum, ContaReco, ContaIdF, ContaIdB, ContaModelF,  
51 - ContaModelB, BarCode, EsealId, EsealIcNo,CreateTime 49 + IcDrCustomsNo, IcCoCustomsNo, IcBillNo, IcFromType, IcGrossWt, IcVeCustomsNo, IcVeName,
  50 + IcContaId, IcEsealId, IcBussType, IcExData, IcPegDatetime, IcPerDayDue, GrossWt,
  51 + VeName, CarEcNo, CarEcNo2, VeCustomsNo, VeWt, ContaNum, ContaReco, ContaIdF, ContaIdB,
  52 + ContaModelF, ContaModelB, BarCode, EsealId, SealKey, CreateTime, OrderNum
52 </sql> 53 </sql>
53 <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap"> 54 <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
54 select 55 select
@@ -60,38 +61,37 @@ @@ -60,38 +61,37 @@
60 delete from gatherinfo 61 delete from gatherinfo
61 where SeqNo = #{seqno,jdbcType=VARCHAR} 62 where SeqNo = #{seqno,jdbcType=VARCHAR}
62 </delete> 63 </delete>
63 - <insert id="insert" parameterType="com.sy.model.gatherinfo"> 64 + <insert id="insert" parameterType="com.sy.model.GatherInfo">
64 insert into gatherinfo (SeqNo, sender, receiver, 65 insert into gatherinfo (SeqNo, sender, receiver,
65 seqn, sendTime, type, 66 seqn, sendTime, type,
66 smType, areaId, chnlNo, 67 smType, areaId, chnlNo,
67 IEtype, DrIcNo, IcDrCustomsNo, 68 IEtype, DrIcNo, IcDrCustomsNo,
68 - IcCoCustomsNo, IcBillNo, IcGrossWt,  
69 - IcVeCustomsNo, IcVeName, IcContaId,  
70 - IcEsealId, IcBussType, IcExData, 69 + IcCoCustomsNo, IcBillNo, IcFromType,
  70 + IcGrossWt, IcVeCustomsNo, IcVeName,
  71 + IcContaId, IcEsealId, IcBussType,
  72 + IcExData, IcPegDatetime, IcPerDayDue,
71 GrossWt, VeName, CarEcNo, 73 GrossWt, VeName, CarEcNo,
72 CarEcNo2, VeCustomsNo, VeWt, 74 CarEcNo2, VeCustomsNo, VeWt,
73 - trEcNo, TrName, TrWt,  
74 ContaNum, ContaReco, ContaIdF, 75 ContaNum, ContaReco, ContaIdF,
75 ContaIdB, ContaModelF, ContaModelB, 76 ContaIdB, ContaModelF, ContaModelB,
76 - BarCode, EsealId, EsealIcNo,CreateTime  
77 - ) 77 + BarCode, EsealId, SealKey,
  78 + CreateTime, OrderNum)
78 values (#{seqno,jdbcType=VARCHAR}, #{sender,jdbcType=VARCHAR}, #{receiver,jdbcType=VARCHAR}, 79 values (#{seqno,jdbcType=VARCHAR}, #{sender,jdbcType=VARCHAR}, #{receiver,jdbcType=VARCHAR},
79 #{seqn,jdbcType=VARCHAR}, #{sendtime,jdbcType=TIMESTAMP}, #{type,jdbcType=VARCHAR}, 80 #{seqn,jdbcType=VARCHAR}, #{sendtime,jdbcType=TIMESTAMP}, #{type,jdbcType=VARCHAR},
80 #{smtype,jdbcType=VARCHAR}, #{areaid,jdbcType=VARCHAR}, #{chnlno,jdbcType=VARCHAR}, 81 #{smtype,jdbcType=VARCHAR}, #{areaid,jdbcType=VARCHAR}, #{chnlno,jdbcType=VARCHAR},
81 #{ietype,jdbcType=VARCHAR}, #{dricno,jdbcType=VARCHAR}, #{icdrcustomsno,jdbcType=VARCHAR}, 82 #{ietype,jdbcType=VARCHAR}, #{dricno,jdbcType=VARCHAR}, #{icdrcustomsno,jdbcType=VARCHAR},
82 - #{iccocustomsno,jdbcType=VARCHAR}, #{icbillno,jdbcType=VARCHAR}, #{icgrosswt,jdbcType=DECIMAL},  
83 - #{icvecustomsno,jdbcType=VARCHAR}, #{icvename,jdbcType=VARCHAR}, #{iccontaid,jdbcType=VARCHAR},  
84 - #{icesealid,jdbcType=VARCHAR}, #{icbusstype,jdbcType=VARCHAR}, #{icexdata,jdbcType=VARCHAR},  
85 - #{grosswt,jdbcType=DECIMAL}, #{vename,jdbcType=VARCHAR}, #{carecno,jdbcType=VARCHAR}, 83 + #{iccocustomsno,jdbcType=VARCHAR}, #{icbillno,jdbcType=VARCHAR}, #{icfromtype,jdbcType=VARCHAR},
  84 + #{icgrosswt,jdbcType=DECIMAL}, #{icvecustomsno,jdbcType=VARCHAR}, #{icvename,jdbcType=VARCHAR},
  85 + #{iccontaid,jdbcType=VARCHAR}, #{icesealid,jdbcType=VARCHAR}, #{icbusstype,jdbcType=VARCHAR},
  86 + #{icexdata,jdbcType=VARCHAR}, #{icpegdatetime,jdbcType=TIMESTAMP}, #{icperdaydue,jdbcType=VARCHAR},
  87 + #{grosswt,jdbcType=DECIMAL}, #{vename,jdbcType=VARCHAR}, #{carecno,jdbcType=VARCHAR},
86 #{carecno2,jdbcType=VARCHAR}, #{vecustomsno,jdbcType=VARCHAR}, #{vewt,jdbcType=DECIMAL}, 88 #{carecno2,jdbcType=VARCHAR}, #{vecustomsno,jdbcType=VARCHAR}, #{vewt,jdbcType=DECIMAL},
87 - #{trecno,jdbcType=VARCHAR}, #{trname,jdbcType=VARCHAR}, #{trwt,jdbcType=DECIMAL},  
88 #{contanum,jdbcType=VARCHAR}, #{contareco,jdbcType=VARCHAR}, #{contaidf,jdbcType=VARCHAR}, 89 #{contanum,jdbcType=VARCHAR}, #{contareco,jdbcType=VARCHAR}, #{contaidf,jdbcType=VARCHAR},
89 #{contaidb,jdbcType=VARCHAR}, #{contamodelf,jdbcType=VARCHAR}, #{contamodelb,jdbcType=VARCHAR}, 90 #{contaidb,jdbcType=VARCHAR}, #{contamodelf,jdbcType=VARCHAR}, #{contamodelb,jdbcType=VARCHAR},
90 - #{barcode,jdbcType=VARCHAR}, #{esealid,jdbcType=VARCHAR}, #{esealicno,jdbcType=VARCHAR},  
91 - #{createtime,jdbcType=TIMESTAMP}  
92 - ) 91 + #{barcode,jdbcType=VARCHAR}, #{esealid,jdbcType=VARCHAR}, #{sealkey,jdbcType=VARCHAR},
  92 + #{createtime,jdbcType=DATE}, #{ordernum,jdbcType=VARCHAR})
93 </insert> 93 </insert>
94 - <insert id="insertSelective" parameterType="com.sy.model.gatherinfo"> 94 + <insert id="insertSelective" parameterType="com.sy.model.GatherInfo">
95 insert into gatherinfo 95 insert into gatherinfo
96 <trim prefix="(" suffix=")" suffixOverrides=","> 96 <trim prefix="(" suffix=")" suffixOverrides=",">
97 <if test="seqno != null"> 97 <if test="seqno != null">
@@ -136,6 +136,9 @@ @@ -136,6 +136,9 @@
136 <if test="icbillno != null"> 136 <if test="icbillno != null">
137 IcBillNo, 137 IcBillNo,
138 </if> 138 </if>
  139 + <if test="icfromtype != null">
  140 + IcFromType,
  141 + </if>
139 <if test="icgrosswt != null"> 142 <if test="icgrosswt != null">
140 IcGrossWt, 143 IcGrossWt,
141 </if> 144 </if>
@@ -157,6 +160,12 @@ @@ -157,6 +160,12 @@
157 <if test="icexdata != null"> 160 <if test="icexdata != null">
158 IcExData, 161 IcExData,
159 </if> 162 </if>
  163 + <if test="icpegdatetime != null">
  164 + IcPegDatetime,
  165 + </if>
  166 + <if test="icperdaydue != null">
  167 + IcPerDayDue,
  168 + </if>
160 <if test="grosswt != null"> 169 <if test="grosswt != null">
161 GrossWt, 170 GrossWt,
162 </if> 171 </if>
@@ -175,15 +184,6 @@ @@ -175,15 +184,6 @@
175 <if test="vewt != null"> 184 <if test="vewt != null">
176 VeWt, 185 VeWt,
177 </if> 186 </if>
178 - <if test="trecno != null">  
179 - trEcNo,  
180 - </if>  
181 - <if test="trname != null">  
182 - TrName,  
183 - </if>  
184 - <if test="trwt != null">  
185 - TrWt,  
186 - </if>  
187 <if test="contanum != null"> 187 <if test="contanum != null">
188 ContaNum, 188 ContaNum,
189 </if> 189 </if>
@@ -208,12 +208,15 @@ @@ -208,12 +208,15 @@
208 <if test="esealid != null"> 208 <if test="esealid != null">
209 EsealId, 209 EsealId,
210 </if> 210 </if>
211 - <if test="esealicno != null">  
212 - EsealIcNo, 211 + <if test="sealkey != null">
  212 + SealKey,
213 </if> 213 </if>
214 <if test="createtime != null"> 214 <if test="createtime != null">
215 CreateTime, 215 CreateTime,
216 </if> 216 </if>
  217 + <if test="ordernum != null">
  218 + OrderNum,
  219 + </if>
217 </trim> 220 </trim>
218 <trim prefix="values (" suffix=")" suffixOverrides=","> 221 <trim prefix="values (" suffix=")" suffixOverrides=",">
219 <if test="seqno != null"> 222 <if test="seqno != null">
@@ -258,6 +261,9 @@ @@ -258,6 +261,9 @@
258 <if test="icbillno != null"> 261 <if test="icbillno != null">
259 #{icbillno,jdbcType=VARCHAR}, 262 #{icbillno,jdbcType=VARCHAR},
260 </if> 263 </if>
  264 + <if test="icfromtype != null">
  265 + #{icfromtype,jdbcType=VARCHAR},
  266 + </if>
261 <if test="icgrosswt != null"> 267 <if test="icgrosswt != null">
262 #{icgrosswt,jdbcType=DECIMAL}, 268 #{icgrosswt,jdbcType=DECIMAL},
263 </if> 269 </if>
@@ -279,6 +285,12 @@ @@ -279,6 +285,12 @@
279 <if test="icexdata != null"> 285 <if test="icexdata != null">
280 #{icexdata,jdbcType=VARCHAR}, 286 #{icexdata,jdbcType=VARCHAR},
281 </if> 287 </if>
  288 + <if test="icpegdatetime != null">
  289 + #{icpegdatetime,jdbcType=TIMESTAMP},
  290 + </if>
  291 + <if test="icperdaydue != null">
  292 + #{icperdaydue,jdbcType=VARCHAR},
  293 + </if>
282 <if test="grosswt != null"> 294 <if test="grosswt != null">
283 #{grosswt,jdbcType=DECIMAL}, 295 #{grosswt,jdbcType=DECIMAL},
284 </if> 296 </if>
@@ -297,15 +309,6 @@ @@ -297,15 +309,6 @@
297 <if test="vewt != null"> 309 <if test="vewt != null">
298 #{vewt,jdbcType=DECIMAL}, 310 #{vewt,jdbcType=DECIMAL},
299 </if> 311 </if>
300 - <if test="trecno != null">  
301 - #{trecno,jdbcType=VARCHAR},  
302 - </if>  
303 - <if test="trname != null">  
304 - #{trname,jdbcType=VARCHAR},  
305 - </if>  
306 - <if test="trwt != null">  
307 - #{trwt,jdbcType=DECIMAL},  
308 - </if>  
309 <if test="contanum != null"> 312 <if test="contanum != null">
310 #{contanum,jdbcType=VARCHAR}, 313 #{contanum,jdbcType=VARCHAR},
311 </if> 314 </if>
@@ -330,15 +333,18 @@ @@ -330,15 +333,18 @@
330 <if test="esealid != null"> 333 <if test="esealid != null">
331 #{esealid,jdbcType=VARCHAR}, 334 #{esealid,jdbcType=VARCHAR},
332 </if> 335 </if>
333 - <if test="esealicno != null">  
334 - #{esealicno,jdbcType=VARCHAR}, 336 + <if test="sealkey != null">
  337 + #{sealkey,jdbcType=VARCHAR},
  338 + </if>
  339 + <if test="createtime != null">
  340 + #{createtime,jdbcType=DATE},
  341 + </if>
  342 + <if test="ordernum != null">
  343 + #{ordernum,jdbcType=VARCHAR},
335 </if> 344 </if>
336 - <if test="createtime !=null">  
337 - #{createtime,jdbcType=TIMESTAMP},  
338 - </if>  
339 </trim> 345 </trim>
340 </insert> 346 </insert>
341 - <update id="updateByPrimaryKeySelective" parameterType="com.sy.model.gatherinfo"> 347 + <update id="updateByPrimaryKeySelective" parameterType="com.sy.model.GatherInfo">
342 update gatherinfo 348 update gatherinfo
343 <set> 349 <set>
344 <if test="sender != null"> 350 <if test="sender != null">
@@ -380,6 +386,9 @@ @@ -380,6 +386,9 @@
380 <if test="icbillno != null"> 386 <if test="icbillno != null">
381 IcBillNo = #{icbillno,jdbcType=VARCHAR}, 387 IcBillNo = #{icbillno,jdbcType=VARCHAR},
382 </if> 388 </if>
  389 + <if test="icfromtype != null">
  390 + IcFromType = #{icfromtype,jdbcType=VARCHAR},
  391 + </if>
383 <if test="icgrosswt != null"> 392 <if test="icgrosswt != null">
384 IcGrossWt = #{icgrosswt,jdbcType=DECIMAL}, 393 IcGrossWt = #{icgrosswt,jdbcType=DECIMAL},
385 </if> 394 </if>
@@ -401,6 +410,12 @@ @@ -401,6 +410,12 @@
401 <if test="icexdata != null"> 410 <if test="icexdata != null">
402 IcExData = #{icexdata,jdbcType=VARCHAR}, 411 IcExData = #{icexdata,jdbcType=VARCHAR},
403 </if> 412 </if>
  413 + <if test="icpegdatetime != null">
  414 + IcPegDatetime = #{icpegdatetime,jdbcType=TIMESTAMP},
  415 + </if>
  416 + <if test="icperdaydue != null">
  417 + IcPerDayDue = #{icperdaydue,jdbcType=VARCHAR},
  418 + </if>
404 <if test="grosswt != null"> 419 <if test="grosswt != null">
405 GrossWt = #{grosswt,jdbcType=DECIMAL}, 420 GrossWt = #{grosswt,jdbcType=DECIMAL},
406 </if> 421 </if>
@@ -419,15 +434,6 @@ @@ -419,15 +434,6 @@
419 <if test="vewt != null"> 434 <if test="vewt != null">
420 VeWt = #{vewt,jdbcType=DECIMAL}, 435 VeWt = #{vewt,jdbcType=DECIMAL},
421 </if> 436 </if>
422 - <if test="trecno != null">  
423 - trEcNo = #{trecno,jdbcType=VARCHAR},  
424 - </if>  
425 - <if test="trname != null">  
426 - TrName = #{trname,jdbcType=VARCHAR},  
427 - </if>  
428 - <if test="trwt != null">  
429 - TrWt = #{trwt,jdbcType=DECIMAL},  
430 - </if>  
431 <if test="contanum != null"> 437 <if test="contanum != null">
432 ContaNum = #{contanum,jdbcType=VARCHAR}, 438 ContaNum = #{contanum,jdbcType=VARCHAR},
433 </if> 439 </if>
@@ -452,16 +458,19 @@ @@ -452,16 +458,19 @@
452 <if test="esealid != null"> 458 <if test="esealid != null">
453 EsealId = #{esealid,jdbcType=VARCHAR}, 459 EsealId = #{esealid,jdbcType=VARCHAR},
454 </if> 460 </if>
455 - <if test="esealicno != null">  
456 - EsealIcNo = #{esealicno,jdbcType=VARCHAR}, 461 + <if test="sealkey != null">
  462 + SealKey = #{sealkey,jdbcType=VARCHAR},
  463 + </if>
  464 + <if test="createtime != null">
  465 + CreateTime = #{createtime,jdbcType=DATE},
457 </if> 466 </if>
458 - <if test="createtime !=null">  
459 - CreateTime = #{createtime,jdbcType=TIMESTAMP}, 467 + <if test="ordernum != null">
  468 + OrderNum = #{ordernum,jdbcType=VARCHAR},
460 </if> 469 </if>
461 </set> 470 </set>
462 where SeqNo = #{seqno,jdbcType=VARCHAR} 471 where SeqNo = #{seqno,jdbcType=VARCHAR}
463 </update> 472 </update>
464 - <update id="updateByPrimaryKey" parameterType="com.sy.model.gatherinfo"> 473 + <update id="updateByPrimaryKey" parameterType="com.sy.model.GatherInfo">
465 update gatherinfo 474 update gatherinfo
466 set sender = #{sender,jdbcType=VARCHAR}, 475 set sender = #{sender,jdbcType=VARCHAR},
467 receiver = #{receiver,jdbcType=VARCHAR}, 476 receiver = #{receiver,jdbcType=VARCHAR},
@@ -476,6 +485,7 @@ @@ -476,6 +485,7 @@
476 IcDrCustomsNo = #{icdrcustomsno,jdbcType=VARCHAR}, 485 IcDrCustomsNo = #{icdrcustomsno,jdbcType=VARCHAR},
477 IcCoCustomsNo = #{iccocustomsno,jdbcType=VARCHAR}, 486 IcCoCustomsNo = #{iccocustomsno,jdbcType=VARCHAR},
478 IcBillNo = #{icbillno,jdbcType=VARCHAR}, 487 IcBillNo = #{icbillno,jdbcType=VARCHAR},
  488 + IcFromType = #{icfromtype,jdbcType=VARCHAR},
479 IcGrossWt = #{icgrosswt,jdbcType=DECIMAL}, 489 IcGrossWt = #{icgrosswt,jdbcType=DECIMAL},
480 IcVeCustomsNo = #{icvecustomsno,jdbcType=VARCHAR}, 490 IcVeCustomsNo = #{icvecustomsno,jdbcType=VARCHAR},
481 IcVeName = #{icvename,jdbcType=VARCHAR}, 491 IcVeName = #{icvename,jdbcType=VARCHAR},
@@ -483,15 +493,14 @@ @@ -483,15 +493,14 @@
483 IcEsealId = #{icesealid,jdbcType=VARCHAR}, 493 IcEsealId = #{icesealid,jdbcType=VARCHAR},
484 IcBussType = #{icbusstype,jdbcType=VARCHAR}, 494 IcBussType = #{icbusstype,jdbcType=VARCHAR},
485 IcExData = #{icexdata,jdbcType=VARCHAR}, 495 IcExData = #{icexdata,jdbcType=VARCHAR},
  496 + IcPegDatetime = #{icpegdatetime,jdbcType=TIMESTAMP},
  497 + IcPerDayDue = #{icperdaydue,jdbcType=VARCHAR},
486 GrossWt = #{grosswt,jdbcType=DECIMAL}, 498 GrossWt = #{grosswt,jdbcType=DECIMAL},
487 VeName = #{vename,jdbcType=VARCHAR}, 499 VeName = #{vename,jdbcType=VARCHAR},
488 CarEcNo = #{carecno,jdbcType=VARCHAR}, 500 CarEcNo = #{carecno,jdbcType=VARCHAR},
489 CarEcNo2 = #{carecno2,jdbcType=VARCHAR}, 501 CarEcNo2 = #{carecno2,jdbcType=VARCHAR},
490 VeCustomsNo = #{vecustomsno,jdbcType=VARCHAR}, 502 VeCustomsNo = #{vecustomsno,jdbcType=VARCHAR},
491 VeWt = #{vewt,jdbcType=DECIMAL}, 503 VeWt = #{vewt,jdbcType=DECIMAL},
492 - trEcNo = #{trecno,jdbcType=VARCHAR},  
493 - TrName = #{trname,jdbcType=VARCHAR},  
494 - TrWt = #{trwt,jdbcType=DECIMAL},  
495 ContaNum = #{contanum,jdbcType=VARCHAR}, 504 ContaNum = #{contanum,jdbcType=VARCHAR},
496 ContaReco = #{contareco,jdbcType=VARCHAR}, 505 ContaReco = #{contareco,jdbcType=VARCHAR},
497 ContaIdF = #{contaidf,jdbcType=VARCHAR}, 506 ContaIdF = #{contaidf,jdbcType=VARCHAR},
@@ -500,8 +509,9 @@ @@ -500,8 +509,9 @@
500 ContaModelB = #{contamodelb,jdbcType=VARCHAR}, 509 ContaModelB = #{contamodelb,jdbcType=VARCHAR},
501 BarCode = #{barcode,jdbcType=VARCHAR}, 510 BarCode = #{barcode,jdbcType=VARCHAR},
502 EsealId = #{esealid,jdbcType=VARCHAR}, 511 EsealId = #{esealid,jdbcType=VARCHAR},
503 - EsealIcNo = #{esealicno,jdbcType=VARCHAR},  
504 - CreateTime = #{createtime,jdbcType=TIMESTAMP} 512 + SealKey = #{sealkey,jdbcType=VARCHAR},
  513 + CreateTime = #{createtime,jdbcType=DATE},
  514 + OrderNum = #{ordernum,jdbcType=VARCHAR}
505 where SeqNo = #{seqno,jdbcType=VARCHAR} 515 where SeqNo = #{seqno,jdbcType=VARCHAR}
506 </update> 516 </update>
507 </mapper> 517 </mapper>
@@ -2,46 +2,81 @@ @@ -2,46 +2,81 @@
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.sy.mapper.commandInfoMapper"> 3 <mapper namespace="com.sy.mapper.commandInfoMapper">
4 <resultMap id="BaseResultMap" type="com.sy.model.commandInfo"> 4 <resultMap id="BaseResultMap" type="com.sy.model.commandInfo">
  5 + <id column="SEQ_NO" jdbcType="VARCHAR" property="seqNo" />
  6 + <result column="sender" jdbcType="VARCHAR" property="sender" />
  7 + <result column="receiver" jdbcType="VARCHAR" property="receiver" />
  8 + <result column="seqn" jdbcType="VARCHAR" property="seqn" />
  9 + <result column="sendtime" jdbcType="TIMESTAMP" property="sendtime" />
  10 + <result column="btype" jdbcType="VARCHAR" property="btype" />
  11 + <result column="stype" jdbcType="VARCHAR" property="stype" />
5 <result column="AREA_ID" jdbcType="VARCHAR" property="areaId" /> 12 <result column="AREA_ID" jdbcType="VARCHAR" property="areaId" />
6 <result column="CHNL_NO" jdbcType="VARCHAR" property="chnlNo" /> 13 <result column="CHNL_NO" jdbcType="VARCHAR" property="chnlNo" />
7 <result column="I_E_TYPE" jdbcType="VARCHAR" property="iEType" /> 14 <result column="I_E_TYPE" jdbcType="VARCHAR" property="iEType" />
8 - <result column="SEQ_NO" jdbcType="VARCHAR" property="seqNo" />  
9 - <result column="EXECUTE_RESULT" jdbcType="VARCHAR" property="executeResult" />  
10 - <result column="SOURCE" jdbcType="VARCHAR" property="source" />  
11 - <result column="ACTION" jdbcType="VARCHAR" property="action" />  
12 - <result column="OPEN_TIMES" jdbcType="DECIMAL" property="openTimes" />  
13 - <result column="ESEAL_IC_NO" jdbcType="VARCHAR" property="esealIcNo" /> 15 + <result column="CHECK_RESULT" jdbcType="VARCHAR" property="checkResult" />
  16 + <result column="VE_NAME" jdbcType="VARCHAR" property="veName" />
  17 + <result column="GPS_ID" jdbcType="VARCHAR" property="gpsId" />
  18 + <result column="ORIGIN_CUSTOMS" jdbcType="VARCHAR" property="originCustoms" />
  19 + <result column="DEST_CUSTOMS" jdbcType="VARCHAR" property="destCustoms" />
14 <result column="ESEAL_ID" jdbcType="VARCHAR" property="esealId" /> 20 <result column="ESEAL_ID" jdbcType="VARCHAR" property="esealId" />
15 - <result column="ESEAL_STATEHINT" jdbcType="VARCHAR" property="esealStatehint" />  
16 - <result column="ESEAL_STATECODE" jdbcType="VARCHAR" property="esealStatecode" />  
17 - <result column="OLDESEAL_ID" jdbcType="VARCHAR" property="oldesealId" />  
18 - <result column="NEWESEAL_ID" jdbcType="VARCHAR" property="newesealId" />  
19 - <result column="ESEAL_KEY" jdbcType="VARCHAR" property="esealKey" />  
20 - <result column="ACTION_MODEL" jdbcType="VARCHAR" property="actionModel" />  
21 - <result column="CHANGE_CAUSE" jdbcType="VARCHAR" property="changeCause" />  
22 - <result column="CHANGE_TIME" jdbcType="TIMESTAMP" property="changeTime" />  
23 - <result column="OPER_NAME" jdbcType="VARCHAR" property="operName" /> 21 + <result column="SEAL_KEY" jdbcType="VARCHAR" property="sealKey" />
  22 + <result column="FORM_ID" jdbcType="VARCHAR" property="formId" />
24 <result column="OP_HINT" jdbcType="VARCHAR" property="opHint" /> 23 <result column="OP_HINT" jdbcType="VARCHAR" property="opHint" />
25 </resultMap> 24 </resultMap>
  25 + <sql id="Base_Column_List">
  26 + SEQ_NO, sender, receiver, seqn, sendtime, btype, stype, AREA_ID, CHNL_NO, I_E_TYPE,
  27 + CHECK_RESULT, VE_NAME, GPS_ID, ORIGIN_CUSTOMS, DEST_CUSTOMS, ESEAL_ID, SEAL_KEY,
  28 + FORM_ID, OP_HINT
  29 + </sql>
  30 + <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
  31 + select
  32 + <include refid="Base_Column_List" />
  33 + from commandinfo
  34 + where SEQ_NO = #{seqNo,jdbcType=VARCHAR}
  35 + </select>
  36 + <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
  37 + delete from commandinfo
  38 + where SEQ_NO = #{seqNo,jdbcType=VARCHAR}
  39 + </delete>
26 <insert id="insert" parameterType="com.sy.model.commandInfo"> 40 <insert id="insert" parameterType="com.sy.model.commandInfo">
27 - insert into commandinfo (AREA_ID, CHNL_NO, I_E_TYPE,  
28 - SEQ_NO, EXECUTE_RESULT, SOURCE,  
29 - ACTION, OPEN_TIMES, ESEAL_IC_NO,  
30 - ESEAL_ID, ESEAL_STATEHINT, ESEAL_STATECODE,  
31 - OLDESEAL_ID, NEWESEAL_ID, ESEAL_KEY,  
32 - ACTION_MODEL, CHANGE_CAUSE, CHANGE_TIME,  
33 - OPER_NAME, OP_HINT)  
34 - values (#{areaId,jdbcType=VARCHAR}, #{chnlNo,jdbcType=VARCHAR}, #{iEType,jdbcType=VARCHAR},  
35 - #{seqNo,jdbcType=VARCHAR}, #{executeResult,jdbcType=VARCHAR}, #{source,jdbcType=VARCHAR},  
36 - #{action,jdbcType=VARCHAR}, #{openTimes,jdbcType=DECIMAL}, #{esealIcNo,jdbcType=VARCHAR},  
37 - #{esealId,jdbcType=VARCHAR}, #{esealStatehint,jdbcType=VARCHAR}, #{esealStatecode,jdbcType=VARCHAR},  
38 - #{oldesealId,jdbcType=VARCHAR}, #{newesealId,jdbcType=VARCHAR}, #{esealKey,jdbcType=VARCHAR},  
39 - #{actionModel,jdbcType=VARCHAR}, #{changeCause,jdbcType=VARCHAR}, #{changeTime,jdbcType=TIMESTAMP},  
40 - #{operName,jdbcType=VARCHAR}, #{opHint,jdbcType=VARCHAR}) 41 + insert into commandinfo (SEQ_NO, sender, receiver,
  42 + seqn, sendtime, btype,
  43 + stype, AREA_ID, CHNL_NO,
  44 + I_E_TYPE, CHECK_RESULT, VE_NAME,
  45 + GPS_ID, ORIGIN_CUSTOMS, DEST_CUSTOMS,
  46 + ESEAL_ID, SEAL_KEY, FORM_ID,
  47 + OP_HINT)
  48 + values (#{seqNo,jdbcType=VARCHAR}, #{sender,jdbcType=VARCHAR}, #{receiver,jdbcType=VARCHAR},
  49 + #{seqn,jdbcType=VARCHAR}, #{sendtime,jdbcType=TIMESTAMP}, #{btype,jdbcType=VARCHAR},
  50 + #{stype,jdbcType=VARCHAR}, #{areaId,jdbcType=VARCHAR}, #{chnlNo,jdbcType=VARCHAR},
  51 + #{iEType,jdbcType=VARCHAR}, #{checkResult,jdbcType=VARCHAR}, #{veName,jdbcType=VARCHAR},
  52 + #{gpsId,jdbcType=VARCHAR}, #{originCustoms,jdbcType=VARCHAR}, #{destCustoms,jdbcType=VARCHAR},
  53 + #{esealId,jdbcType=VARCHAR}, #{sealKey,jdbcType=VARCHAR}, #{formId,jdbcType=VARCHAR},
  54 + #{opHint,jdbcType=VARCHAR})
41 </insert> 55 </insert>
42 <insert id="insertSelective" parameterType="com.sy.model.commandInfo"> 56 <insert id="insertSelective" parameterType="com.sy.model.commandInfo">
43 insert into commandinfo 57 insert into commandinfo
44 <trim prefix="(" suffix=")" suffixOverrides=","> 58 <trim prefix="(" suffix=")" suffixOverrides=",">
  59 + <if test="seqNo != null">
  60 + SEQ_NO,
  61 + </if>
  62 + <if test="sender != null">
  63 + sender,
  64 + </if>
  65 + <if test="receiver != null">
  66 + receiver,
  67 + </if>
  68 + <if test="seqn != null">
  69 + seqn,
  70 + </if>
  71 + <if test="sendtime != null">
  72 + sendtime,
  73 + </if>
  74 + <if test="btype != null">
  75 + btype,
  76 + </if>
  77 + <if test="stype != null">
  78 + stype,
  79 + </if>
45 <if test="areaId != null"> 80 <if test="areaId != null">
46 AREA_ID, 81 AREA_ID,
47 </if> 82 </if>
@@ -51,59 +86,56 @@ @@ -51,59 +86,56 @@
51 <if test="iEType != null"> 86 <if test="iEType != null">
52 I_E_TYPE, 87 I_E_TYPE,
53 </if> 88 </if>
54 - <if test="seqNo != null">  
55 - SEQ_NO,  
56 - </if>  
57 - <if test="executeResult != null">  
58 - EXECUTE_RESULT, 89 + <if test="checkResult != null">
  90 + CHECK_RESULT,
59 </if> 91 </if>
60 - <if test="source != null">  
61 - SOURCE, 92 + <if test="veName != null">
  93 + VE_NAME,
62 </if> 94 </if>
63 - <if test="action != null">  
64 - ACTION, 95 + <if test="gpsId != null">
  96 + GPS_ID,
65 </if> 97 </if>
66 - <if test="openTimes != null">  
67 - OPEN_TIMES, 98 + <if test="originCustoms != null">
  99 + ORIGIN_CUSTOMS,
68 </if> 100 </if>
69 - <if test="esealIcNo != null">  
70 - ESEAL_IC_NO, 101 + <if test="destCustoms != null">
  102 + DEST_CUSTOMS,
71 </if> 103 </if>
72 <if test="esealId != null"> 104 <if test="esealId != null">
73 ESEAL_ID, 105 ESEAL_ID,
74 </if> 106 </if>
75 - <if test="esealStatehint != null">  
76 - ESEAL_STATEHINT, 107 + <if test="sealKey != null">
  108 + SEAL_KEY,
77 </if> 109 </if>
78 - <if test="esealStatecode != null">  
79 - ESEAL_STATECODE, 110 + <if test="formId != null">
  111 + FORM_ID,
80 </if> 112 </if>
81 - <if test="oldesealId != null">  
82 - OLDESEAL_ID, 113 + <if test="opHint != null">
  114 + OP_HINT,
83 </if> 115 </if>
84 - <if test="newesealId != null">  
85 - NEWESEAL_ID, 116 + </trim>
  117 + <trim prefix="values (" suffix=")" suffixOverrides=",">
  118 + <if test="seqNo != null">
  119 + #{seqNo,jdbcType=VARCHAR},
86 </if> 120 </if>
87 - <if test="esealKey != null">  
88 - ESEAL_KEY, 121 + <if test="sender != null">
  122 + #{sender,jdbcType=VARCHAR},
89 </if> 123 </if>
90 - <if test="actionModel != null">  
91 - ACTION_MODEL, 124 + <if test="receiver != null">
  125 + #{receiver,jdbcType=VARCHAR},
92 </if> 126 </if>
93 - <if test="changeCause != null">  
94 - CHANGE_CAUSE, 127 + <if test="seqn != null">
  128 + #{seqn,jdbcType=VARCHAR},
95 </if> 129 </if>
96 - <if test="changeTime != null">  
97 - CHANGE_TIME, 130 + <if test="sendtime != null">
  131 + #{sendtime,jdbcType=TIMESTAMP},
98 </if> 132 </if>
99 - <if test="operName != null">  
100 - OPER_NAME, 133 + <if test="btype != null">
  134 + #{btype,jdbcType=VARCHAR},
101 </if> 135 </if>
102 - <if test="opHint != null">  
103 - OP_HINT, 136 + <if test="stype != null">
  137 + #{stype,jdbcType=VARCHAR},
104 </if> 138 </if>
105 - </trim>  
106 - <trim prefix="values (" suffix=")" suffixOverrides=",">  
107 <if test="areaId != null"> 139 <if test="areaId != null">
108 #{areaId,jdbcType=VARCHAR}, 140 #{areaId,jdbcType=VARCHAR},
109 </if> 141 </if>
@@ -113,57 +145,115 @@ @@ -113,57 +145,115 @@
113 <if test="iEType != null"> 145 <if test="iEType != null">
114 #{iEType,jdbcType=VARCHAR}, 146 #{iEType,jdbcType=VARCHAR},
115 </if> 147 </if>
116 - <if test="seqNo != null">  
117 - #{seqNo,jdbcType=VARCHAR},  
118 - </if>  
119 - <if test="executeResult != null">  
120 - #{executeResult,jdbcType=VARCHAR}, 148 + <if test="checkResult != null">
  149 + #{checkResult,jdbcType=VARCHAR},
121 </if> 150 </if>
122 - <if test="source != null">  
123 - #{source,jdbcType=VARCHAR}, 151 + <if test="veName != null">
  152 + #{veName,jdbcType=VARCHAR},
124 </if> 153 </if>
125 - <if test="action != null">  
126 - #{action,jdbcType=VARCHAR}, 154 + <if test="gpsId != null">
  155 + #{gpsId,jdbcType=VARCHAR},
127 </if> 156 </if>
128 - <if test="openTimes != null">  
129 - #{openTimes,jdbcType=DECIMAL}, 157 + <if test="originCustoms != null">
  158 + #{originCustoms,jdbcType=VARCHAR},
130 </if> 159 </if>
131 - <if test="esealIcNo != null">  
132 - #{esealIcNo,jdbcType=VARCHAR}, 160 + <if test="destCustoms != null">
  161 + #{destCustoms,jdbcType=VARCHAR},
133 </if> 162 </if>
134 <if test="esealId != null"> 163 <if test="esealId != null">
135 #{esealId,jdbcType=VARCHAR}, 164 #{esealId,jdbcType=VARCHAR},
136 </if> 165 </if>
137 - <if test="esealStatehint != null">  
138 - #{esealStatehint,jdbcType=VARCHAR}, 166 + <if test="sealKey != null">
  167 + #{sealKey,jdbcType=VARCHAR},
139 </if> 168 </if>
140 - <if test="esealStatecode != null">  
141 - #{esealStatecode,jdbcType=VARCHAR}, 169 + <if test="formId != null">
  170 + #{formId,jdbcType=VARCHAR},
142 </if> 171 </if>
143 - <if test="oldesealId != null">  
144 - #{oldesealId,jdbcType=VARCHAR}, 172 + <if test="opHint != null">
  173 + #{opHint,jdbcType=VARCHAR},
145 </if> 174 </if>
146 - <if test="newesealId != null">  
147 - #{newesealId,jdbcType=VARCHAR}, 175 + </trim>
  176 + </insert>
  177 + <update id="updateByPrimaryKeySelective" parameterType="com.sy.model.commandInfo">
  178 + update commandinfo
  179 + <set>
  180 + <if test="sender != null">
  181 + sender = #{sender,jdbcType=VARCHAR},
148 </if> 182 </if>
149 - <if test="esealKey != null">  
150 - #{esealKey,jdbcType=VARCHAR}, 183 + <if test="receiver != null">
  184 + receiver = #{receiver,jdbcType=VARCHAR},
151 </if> 185 </if>
152 - <if test="actionModel != null">  
153 - #{actionModel,jdbcType=VARCHAR}, 186 + <if test="seqn != null">
  187 + seqn = #{seqn,jdbcType=VARCHAR},
154 </if> 188 </if>
155 - <if test="changeCause != null">  
156 - #{changeCause,jdbcType=VARCHAR}, 189 + <if test="sendtime != null">
  190 + sendtime = #{sendtime,jdbcType=TIMESTAMP},
157 </if> 191 </if>
158 - <if test="changeTime != null">  
159 - #{changeTime,jdbcType=TIMESTAMP}, 192 + <if test="btype != null">
  193 + btype = #{btype,jdbcType=VARCHAR},
160 </if> 194 </if>
161 - <if test="operName != null">  
162 - #{operName,jdbcType=VARCHAR}, 195 + <if test="stype != null">
  196 + stype = #{stype,jdbcType=VARCHAR},
163 </if> 197 </if>
164 - <if test="opHint != null">  
165 - #{opHint,jdbcType=VARCHAR}, 198 + <if test="areaId != null">
  199 + AREA_ID = #{areaId,jdbcType=VARCHAR},
166 </if> 200 </if>
167 - </trim>  
168 - </insert> 201 + <if test="chnlNo != null">
  202 + CHNL_NO = #{chnlNo,jdbcType=VARCHAR},
  203 + </if>
  204 + <if test="iEType != null">
  205 + I_E_TYPE = #{iEType,jdbcType=VARCHAR},
  206 + </if>
  207 + <if test="checkResult != null">
  208 + CHECK_RESULT = #{checkResult,jdbcType=VARCHAR},
  209 + </if>
  210 + <if test="veName != null">
  211 + VE_NAME = #{veName,jdbcType=VARCHAR},
  212 + </if>
  213 + <if test="gpsId != null">
  214 + GPS_ID = #{gpsId,jdbcType=VARCHAR},
  215 + </if>
  216 + <if test="originCustoms != null">
  217 + ORIGIN_CUSTOMS = #{originCustoms,jdbcType=VARCHAR},
  218 + </if>
  219 + <if test="destCustoms != null">
  220 + DEST_CUSTOMS = #{destCustoms,jdbcType=VARCHAR},
  221 + </if>
  222 + <if test="esealId != null">
  223 + ESEAL_ID = #{esealId,jdbcType=VARCHAR},
  224 + </if>
  225 + <if test="sealKey != null">
  226 + SEAL_KEY = #{sealKey,jdbcType=VARCHAR},
  227 + </if>
  228 + <if test="formId != null">
  229 + FORM_ID = #{formId,jdbcType=VARCHAR},
  230 + </if>
  231 + <if test="opHint != null">
  232 + OP_HINT = #{opHint,jdbcType=VARCHAR},
  233 + </if>
  234 + </set>
  235 + where SEQ_NO = #{seqNo,jdbcType=VARCHAR}
  236 + </update>
  237 + <update id="updateByPrimaryKey" parameterType="com.sy.model.commandInfo">
  238 + update commandinfo
  239 + set sender = #{sender,jdbcType=VARCHAR},
  240 + receiver = #{receiver,jdbcType=VARCHAR},
  241 + seqn = #{seqn,jdbcType=VARCHAR},
  242 + sendtime = #{sendtime,jdbcType=TIMESTAMP},
  243 + btype = #{btype,jdbcType=VARCHAR},
  244 + stype = #{stype,jdbcType=VARCHAR},
  245 + AREA_ID = #{areaId,jdbcType=VARCHAR},
  246 + CHNL_NO = #{chnlNo,jdbcType=VARCHAR},
  247 + I_E_TYPE = #{iEType,jdbcType=VARCHAR},
  248 + CHECK_RESULT = #{checkResult,jdbcType=VARCHAR},
  249 + VE_NAME = #{veName,jdbcType=VARCHAR},
  250 + GPS_ID = #{gpsId,jdbcType=VARCHAR},
  251 + ORIGIN_CUSTOMS = #{originCustoms,jdbcType=VARCHAR},
  252 + DEST_CUSTOMS = #{destCustoms,jdbcType=VARCHAR},
  253 + ESEAL_ID = #{esealId,jdbcType=VARCHAR},
  254 + SEAL_KEY = #{sealKey,jdbcType=VARCHAR},
  255 + FORM_ID = #{formId,jdbcType=VARCHAR},
  256 + OP_HINT = #{opHint,jdbcType=VARCHAR}
  257 + where SEQ_NO = #{seqNo,jdbcType=VARCHAR}
  258 + </update>
169 </mapper> 259 </mapper>