kakoIMF check some message

@@ -34,10 +34,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <dependency>
+<!--        <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
@@ -89,6 +89,13 @@
             <artifactId>log4j</artifactId>
             <version>1.2.17</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.10</version>
+        </dependency>
+
     </dependencies>
     <dependencyManagement>
         <dependencies>

@@ -3,12 +3,11 @@ package com.sy;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableScheduling
-@EnableEurekaClient
+//@EnableEurekaClient
 @MapperScan(value = "com.sy.mapper")
 public class AnalysisImfApplication {
 

@@ -7,12 +7,6 @@ import org.apache.log4j.PropertyConfigurator;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-/**
- * @author zhangfan
- * @web www.sy.com
- * @company 郑州商友科技有限公司
- * @time 2018-11-27 16:05
- */
 @Component
 public class IMF_Tesk {
 
@@ -47,7 +41,7 @@ public class IMF_Tesk {
 
         }
         if (!LOGIN_OK){
-             loginIMF(client, "KAOR", "KAOR", "config/imf_config.properties");
+             loginIMF(client, "KKW1", "KKW1", "config/imf_config.properties");
         }
 
 

@@ -31,7 +31,7 @@ public class KAKO_Reader extends Thread{
                 }
 
                 try {
-                    Thread.sleep(5000L);
+                    Thread.sleep(1000L);
                 } catch (InterruptedException var3) {
                     var3.printStackTrace();
 

@@ -12,33 +12,24 @@ public class CommandInfoAnalysis {
 		commandInfo bean = new commandInfo();
 		CommandInfo info = msg.getComInfo();
 		Meta meta = msg.getMeta();
-/*		bean.setSender(meta.getSender());
+		bean.setSender(meta.getSender());
 		bean.setReceiver(meta.getReceiver());
 		bean.setSeqn(meta.getSeqn());
 		bean.setSendtime(meta.getSendTime());
-		bean.setType(meta.getType());
-		bean.setSmtype(meta.getSmType());*/
+		bean.setBtype(meta.getType());
+		bean.setStype(meta.getSmType());
 		bean.setAreaId(info.getAREA_ID());
 		bean.setChnlNo(info.getCHNL_NO());
 		bean.setiEType(info.getI_E_TYPE());
 		bean.setSeqNo(info.getSEQ_NO());
-		bean.setExecuteResult(info.getExecuteResult());
-		bean.setEsealIcNo(info.getSeal().getEsealIcNo());
 		bean.setEsealId(info.getSeal().getEsealId());
-		bean.setEsealStatecode(info.getSeal().getEsealStateCode());
-		bean.setEsealStatehint(info.getSeal().getEsealStateHint());
-		bean.setAction(info.getMessageInfo().getAction());
-		bean.setSource(info.getMessageInfo().getSource());
-		bean.setEsealKey(info.getCtrlChanging().getEsealKey());
-		bean.setActionModel(info.getCtrlChanging().getActionModel());
-		bean.setActionModel(info.getCtrlChanging().getActionModel());
-		bean.setOpenTimes(info.getSeal().getOperTimes());
+		bean.setSealKey(info.getSeal().getSealKey());
+		bean.setVeName(info.getGps().getVeName());
+		bean.setGpsId(info.getGps().getGpsId());
+		bean.setDestCustoms(info.getGps().getDestCostoms());
+		bean.setOriginCustoms(info.getGps().getOpiginCostoms());
+		bean.setFormId(info.getFormId());
 		bean.setOpHint(info.getOpHint());
-		bean.setChangeCause(info.getCtrlChanging().getChanceCause());
-		bean.setChangeTime(info.getCtrlChanging().getChanceTime());
-		bean.setOperName(info.getCtrlChanging().getOperName());
-		bean.setOldesealId(info.getCtrlChanging().getOldesealId());
-		bean.setNewesealId(info.getCtrlChanging().getNewesealId());
 
 		return bean;
 	}

 package com.sy.bwAnalysis;
 
-import com.sy.bwAssist.GatherInfo;
+import com.sy.bwAssist.GatherInfoAssist;
 import com.sy.bwAssist.Message;
 import com.sy.bwAssist.Meta;
-import com.sy.model.gatherinfo;
-
+import com.sy.model.GatherInfo;
 
 
 public class GatherInfoAnalysis {
 
-	public gatherinfo toJavaBean(Message msg) {
-		gatherinfo bean = new gatherinfo();
-		GatherInfo info = msg.getInfo();
+	public GatherInfo toJavaBean(Message msg) {
+		GatherInfo bean = new GatherInfo();
+		GatherInfoAssist info = msg.getInfo();
 		Meta meta = msg.getMeta();
 		bean.setSender(meta.getSender());
 		bean.setReceiver(meta.getReceiver());
@@ -47,11 +46,12 @@ public class GatherInfoAnalysis {
 		bean.setIcbusstype(info.getIc().getIcBussType());
 		bean.setIcexdata(info.getIc().getIcExData());
 		bean.setGrosswt((info.getWeight().getGrossWt()));
-		bean.setTrecno(info.getTrailer().getTrEcNo());
-		bean.setTrname(info.getTrailer().getTrName());
-		bean.setTrwt((info.getTrailer().getTrWt()));
-		bean.setEsealicno(info.getSeal().getEsealIcNo());
+		bean.setSealkey(info.getSeal().getSealKey());
 		bean.setEsealid(info.getSeal().getEsealId());
+		bean.setOrdernum(info.getOderNum());
+		bean.setIcpegdatetime(info.getIc().getIcRegDatetime());
+		bean.setIcperdaydue(info.getIc().getIcPerDayDue());
+		bean.setIcfromtype(info.getIc().getIcFormType());
 		return bean;
 	}
 	

@@ -5,30 +5,89 @@ import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.xml.DomDriver;
 import com.thoughtworks.xstream.io.xml.XmlFriendlyNameCoder;
 
-import java.io.File;
-
-/**
- * @author zhangfan
- * @web www.sy.com
- * @company 郑州商友科技有限公司
- * @time 2018-11-28 12:13
- */
+import java.io.UnsupportedEncodingException;
+
 public class MessageAnalysis {
 
     public static Message msg = null;
 
-    public Message readTicketsXml(String str){
+    public Message readTicketsXml(String str) {
+     //   str = utf8Togb2312(str);
         return getMessage(str);
     }
 
+    public static String getUTF8StringFromGBKString(String gbkStr) {
+        try {
+            return new String(getUTF8BytesFromGBKString(gbkStr), "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new InternalError();
+        }
+    }
+
+    public static byte[] getUTF8BytesFromGBKString(String gbkStr) {
+        int n = gbkStr.length();
+        byte[] utfBytes = new byte[3 * n];
+        int k = 0;
+        for (int i = 0; i < n; i++) {
+            int m = gbkStr.charAt(i);
+            if (m < 128 && m >= 0) {
+                utfBytes[k++] = (byte) m;
+                continue;
+            }
+            utfBytes[k++] = (byte) (0xe0 | (m >> 12));
+            utfBytes[k++] = (byte) (0x80 | ((m >> 6) & 0x3f));
+            utfBytes[k++] = (byte) (0x80 | (m & 0x3f));
+        }
+        if (k < utfBytes.length) {
+            byte[] tmp = new byte[k];
+            System.arraycopy(utfBytes, 0, tmp, 0, k);
+            return tmp;
+        }
+        return utfBytes;
+    }
+
+    public static String utf8Togb2312(String str) {
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < str.length(); i++) {
+            char c = str.charAt(i);
+            switch (c) {
+                case '+':
+                    sb.append(' ');
+                    break;
+                case '%':
+                    try {
+                        sb.append((char) Integer.parseInt(
+                                str.substring(i + 1, i + 3), 16));
+                    } catch (NumberFormatException e) {
+                        throw new IllegalArgumentException();
+                    }
+                    i += 2;
+                    break;
+                default:
+                    sb.append(c);
+                    break;
+            }
+        }
+        String result = sb.toString();
+        String res = null;
+        try {
+            byte[] inputBytes = result.getBytes("8859_1");
+            res = new String(inputBytes, "UTF-8");
+        } catch (Exception e) {
+        }
+        return res;
+    }
+
+
     static Message getMessage(String str) {
         XStream xstream = new XStream(new DomDriver("UTF-8", new XmlFriendlyNameCoder("_-", "_")));
         xstream.processAnnotations(Message.class);
-        msg =(Message)xstream.fromXML(str);
+        msg = (Message) xstream.fromXML(str);
+        System.out.println("解析后的Message对象" + msg);
         return msg;
     }
 
-    public String getStype(){
+    public String getStype() {
         return msg.getMeta().getSmType();
     }
 }

@@ -19,18 +19,18 @@ public class CommandInfo {
 	@XStreamAsAttribute
 	private String SEQ_NO;
 	
-	@XStreamAlias("EXECUTE_RESULT")
-	private String executeResult;
+	@XStreamAlias("CHECK_RESULT")
+	private String checkResult;
 	
-	@XStreamAlias("MESSAGE_INFO ")
-	private MessageInfo  messageInfo;
-	
-	@XStreamAlias("CTRL_CHANGING")
-	private CtrlChanging ctrlChanging;
+	@XStreamAlias("GPS")
+	private GPS gps;
 	
 	@XStreamAlias("OP_HINT")
 	private String opHint;
 
+	@XStreamAlias("FORM_ID")
+	private String formId;
+
 	@XStreamAlias("SEAL")
 	private Seal seal;
 
@@ -75,35 +75,35 @@ public class CommandInfo {
 		this.seal = seal;
 	}
 
-	public String getExecuteResult() {
-		return executeResult;
+	public String getOpHint() {
+		return opHint;
 	}
 
-	public void setExecuteResult(String executeResult) {
-		this.executeResult = executeResult;
+	public void setOpHint(String opHint) {
+		this.opHint = opHint;
 	}
 
-	public MessageInfo getMessageInfo() {
-		return messageInfo;
+	public String getCheckResult() {
+		return checkResult;
 	}
 
-	public void setMessageInfo(MessageInfo messageInfo) {
-		this.messageInfo = messageInfo;
+	public void setCheckResult(String checkResult) {
+		this.checkResult = checkResult;
 	}
 
-	public CtrlChanging getCtrlChanging() {
-		return ctrlChanging;
+	public GPS getGps() {
+		return gps;
 	}
 
-	public void setCtrlChanging(CtrlChanging ctrlChanging) {
-		this.ctrlChanging = ctrlChanging;
+	public void setGps(GPS gps) {
+		this.gps = gps;
 	}
 
-	public String getOpHint() {
-		return opHint;
+	public String getFormId() {
+		return formId;
 	}
 
-	public void setOpHint(String opHint) {
-		this.opHint = opHint;
+	public void setFormId(String formId) {
+		this.formId = formId;
 	}
 }

+package com.sy.bwAssist;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
+/**
+ * @author zhangfan
+ * @web www.sy.com
+ * @company 郑州商友科技有限公司
+ * @time 2018-12-27 16:10
+ */
+public class GPS {
+
+    @XStreamAlias("VE_NAME")
+    private String veName;
+
+    @XStreamAlias("GPS_ID")
+    private String gpsId;
+
+    @XStreamAlias("ORIGIN_CUSTOMS")
+    private String opiginCostoms;
+
+    @XStreamAlias("DEST_CUSTOMS")
+    private String destCostoms;
+
+    public String getVeName() {
+        return veName;
+    }
+
+    public void setVeName(String veName) {
+        this.veName = veName;
+    }
+
+    public String getGpsId() {
+        return gpsId;
+    }
+
+    public void setGpsId(String gpsId) {
+        this.gpsId = gpsId;
+    }
+
+    public String getOpiginCostoms() {
+        return opiginCostoms;
+    }
+
+    public void setOpiginCostoms(String opiginCostoms) {
+        this.opiginCostoms = opiginCostoms;
+    }
+
+    public String getDestCostoms() {
+        return destCostoms;
+    }
+
+    public void setDestCostoms(String destCostoms) {
+        this.destCostoms = destCostoms;
+    }
+}

@@ -5,7 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
 import org.springframework.stereotype.Component;
 
 @Component
-public class GatherInfo {
+public class GatherInfoAssist {
 	
 	@XStreamAsAttribute
 	private String AREA_ID;
@@ -27,16 +27,16 @@ public class GatherInfo {
 	
 	@XStreamAlias("CAR")
 	private Car car;
-	
-	@XStreamAlias("TRAILER")
-	private Trailer trailer;
-	
+
 	@XStreamAlias("CONTA")
 	private Conta conta;
 	
 	@XStreamAlias("BAR_CODE")
 	private String BarCode;
-	
+
+	@XStreamAlias("ORDER_NUM")
+	private String orderNum;
+
 	@XStreamAlias("SEAL")
 	private Seal seal;
 
@@ -98,14 +98,6 @@ public class GatherInfo {
 		this.car = car;
 	}
 
-	public Trailer getTrailer() {
-		return trailer;
-	}
-
-	public void setTrailer(Trailer trailer) {
-		this.trailer = trailer;
-	}
-
 	public Conta getConta() {
 		return conta;
 	}
@@ -129,7 +121,15 @@ public class GatherInfo {
 	public void setSeal(Seal seal) {
 		this.seal = seal;
 	}
-	
+
+	public String getOderNum() {
+		return orderNum;
+	}
+
+	public void setOrderNum(String orderNum) {
+		orderNum = orderNum;
+	}
+
 	
 	
 

 package com.sy.bwAssist;
 
+import com.sy.utils.DateTimeConverter;
+import com.sy.utils.NumberConverter;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamConverter;
+
+import java.math.BigDecimal;
+import java.util.Date;
 
 public class IC {
 	
@@ -15,9 +21,13 @@ public class IC {
 	
 	@XStreamAlias("IC_BILL_NO")
 	private String IcBillNo;
-	
+
+	@XStreamAlias("IC_FORM_TYPE")
+	private String IcFormType;
+
 	@XStreamAlias("IC_GROSS_WT")
-	private String IcGrossWt;
+	@XStreamConverter(NumberConverter.class)
+	private BigDecimal IcGrossWt;
 	
 	@XStreamAlias("IC_VE_CUSTOMS_NO")
 	private String IcVeCustomsNo;
@@ -37,6 +47,13 @@ public class IC {
 	@XStreamAlias("IC_EX_DATA")
 	private String IcExData;
 
+	@XStreamAlias("IC_REG_DATETIME")
+	@XStreamConverter(DateTimeConverter.class)
+	private Date IcRegDatetime;
+
+	@XStreamAlias("IC_PER_DAY_DUE")
+	private String IcPerDayDue;
+
 	public String getDRICNO() {
 		return DRICNO;
 	}
@@ -69,11 +86,11 @@ public class IC {
 		IcBillNo = icBillNo;
 	}
 
-	public String getIcGrossWt() {
+	public BigDecimal getIcGrossWt() {
 		return IcGrossWt;
 	}
 
-	public void setIcGrossWt(String icGrossWt) {
+	public void setIcGrossWt(BigDecimal icGrossWt) {
 		IcGrossWt = icGrossWt;
 	}
 
@@ -124,7 +141,28 @@ public class IC {
 	public void setIcExData(String icExData) {
 		IcExData = icExData;
 	}
-	
-	
 
+	public String getIcFormType() {
+		return IcFormType;
+	}
+
+	public void setIcFormType(String icFormType) {
+		IcFormType = icFormType;
+	}
+
+	public Date getIcRegDatetime() {
+		return IcRegDatetime;
+	}
+
+	public void setIcRegDatetime(Date icRegDatetime) {
+		IcRegDatetime = icRegDatetime;
+	}
+
+	public String getIcPerDayDue() {
+		return IcPerDayDue;
+	}
+
+	public void setIcPerDayDue(String icPerDayDue) {
+		IcPerDayDue = icPerDayDue;
+	}
 }

@@ -11,7 +11,7 @@ public class Message {
 	private Meta meta;
 
 	@XStreamAlias("GATHER_INFO")
-	private GatherInfo info;
+	private GatherInfoAssist info;
 
 	@XStreamAlias("COMMAND_INFO")
 	private CommandInfo ComInfo;
@@ -35,11 +35,11 @@ public class Message {
 		this.meta = meta;
 	}
 
-	public GatherInfo getInfo() {
+	public GatherInfoAssist getInfo() {
 		return info;
 	}
 
-	public void setInfo(GatherInfo info) {
+	public void setInfo(GatherInfoAssist info) {
 		this.info = info;
 	}
 

 package com.sy.bwAssist;
 
-import com.sy.utils.NumberConverter;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamConverter;
 
 @XStreamAlias("SEAL")
 public class Seal {
@@ -10,19 +8,11 @@ public class Seal {
 	@XStreamAlias("ESEAL_ID")
 	private String EsealId;
 	
-	@XStreamAlias("ESEAL_IC_NO")
-	private String EsealIcNo;
-
-	@XStreamAlias("OPEN_TIMES")
-	@XStreamConverter(NumberConverter.class)
-	private Integer operTimes;
-
-	@XStreamAlias("ESEAL_STATEHINT")
-	private String EsealStateHint;
-
-	@XStreamAlias("ESEAL_STATECODE")
-	private String EsealStateCode;
+	@XStreamAlias("SEAL_KEY")
+	private String sealKey;
 
+	@XStreamAlias("CONTA_NUM")
+	private String countNum;
 
 
 	public String getEsealId() {
@@ -33,35 +23,21 @@ public class Seal {
 		EsealId = esealId;
 	}
 
-	public String getEsealIcNo() {
-		return EsealIcNo;
+	public String getSealKey() {
+		return sealKey;
 	}
 
-	public void setEsealIcNo(String esealIcNo) {
-		EsealIcNo = esealIcNo;
+	public void setSealKey(String sealKey) {
+		sealKey = sealKey;
 	}
 
-	public Integer getOperTimes() {
-		return operTimes;
+	public String getCountNum() {
+		return countNum;
 	}
 
-	public void setOperTimes(Integer operTimes) {
-		this.operTimes = operTimes;
-	}
-
-	public String getEsealStateHint() {
-		return EsealStateHint;
-	}
-
-	public void setEsealStateHint(String esealStateHint) {
-		EsealStateHint = esealStateHint;
+	public void setCountNum(String countNum) {
+		this.countNum = countNum;
 	}
+}
 
-	public String getEsealStateCode() {
-		return EsealStateCode;
-	}
 
-	public void setEsealStateCode(String esealStateCode) {
-		EsealStateCode = esealStateCode;
-	}
-}

-package com.sy.bwAssist;
-
-import com.sy.utils.NumberConverter;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamConverter;
-
-import java.math.BigDecimal;
-
-@XStreamAlias("TRAILER")
-public class Trailer {
-	
-	@XStreamAlias("TR_EC_NO")
-	private String trEcNo;
-	
-	@XStreamAlias("TR_NAME")
-	private String TrName;
-	
-	@XStreamAlias("TR_WT")
-	@XStreamConverter(value=NumberConverter.class)
-	private BigDecimal TrWt;
-
-	public String getTrEcNo() {
-		return trEcNo;
-	}
-
-	public void setTrEcNo(String trEcNo) {
-		this.trEcNo = trEcNo;
-	}
-
-	public String getTrName() {
-		return TrName;
-	}
-
-	public void setTrName(String trName) {
-		TrName = trName;
-	}
-
-	public BigDecimal getTrWt() {
-		return TrWt;
-	}
-
-	public void setTrWt(BigDecimal trWt) {
-		TrWt = trWt;
-	}
-	
-
-}

@@ -29,6 +29,9 @@ public class AnalysisRoute {
     @Autowired
     private GatherInfoService infoService;
 
+    @Autowired
+    private CommandInfoService commandService;
+
     private static AnalysisRoute route;
 
     private static MessageAnalysis analysis = new MessageAnalysis();
@@ -37,6 +40,7 @@ public class AnalysisRoute {
     private static ImStockAnalysis imStockAnalysis = new ImStockAnalysis();
     private static GATAnaluysis gatAnaluysis = new GATAnaluysis();
     private static GatherInfoAnalysis gatherInfoAnalysis = new GatherInfoAnalysis();
+    private static CommandInfoAnalysis commandInfoAnalysis = new CommandInfoAnalysis();
 
     @PostConstruct
     public void init(){
@@ -46,14 +50,62 @@ public class AnalysisRoute {
         route.imStockService = this.imStockService;
         route.gatService = this.gatService;
         route.infoService = this.infoService;
+        route.commandService = this.commandService;
     }
-
+ /*   public static void main(String[] args) {
+        AnalysisRoute route = new AnalysisRoute();
+        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" +
+                "\t<IC>\n" +
+                "\t\t<DR_IC_NO/>\n" +
+                "\t\t<IC_DR_CUSTOMS_NO/>\n" +
+                "\t\t<IC_CO_CUSTOMS_NO/>\n" +
+                "\t\t<IC_BILL_NO/>\n" +
+                "\t\t<IC_FORM_TYPE/>\n" +
+                "\t\t<IC_GROSS_WT/>\n" +
+                "\t\t<IC_VE_CUSTOMS_NO/>\n" +
+                "\t\t<IC_VE_NAME/>\n" +
+                "\t\t<IC_CONTA_ID/>\n" +
+                "\t\t<IC_ESEAL_ID/>\n" +
+                "\t\t<IC_REG_DATETIME/>\n" +
+                "\t\t<IC_PER_DAY_DUE/>\n" +
+                "\t</IC>\n" +
+                "\t<WEIGHT>\n" +
+                "\t\t<GROSS_WT>9100</GROSS_WT>\n" +
+                "\t</WEIGHT>\n" +
+                "\t<CAR>\n" +
+                "\t\t<VE_NAME>豫AJ1205</VE_NAME>\n" +
+                "\t\t<CAR_EC_NO>E0040000BFB0C007</CAR_EC_NO>\n" +
+                "\t\t<CAR_EC_NO2/>\n" +
+                "\t\t<VE_CUSTOMS_NO/>\n" +
+                "\t\t<VE_WT/>\n" +
+                "\t</CAR>\n" +
+                "\t<CONTA>\n" +
+                "\t\t<CONTA_NUM/>\n" +
+                "\t\t<CONTA_RECO>1</CONTA_RECO>\n" +
+                "\t\t<CONTA_ID_F/>\n" +
+                "\t\t<CONTA_ID_B/>\n" +
+                "\t\t<CONTA_MODEL_F/>\n" +
+                "\t\t<CONTA_MODEL_B/>\n" +
+                "\t</CONTA>\n" +
+                "\t<ORDER_NUM/>\n" +
+                "\t<BAR_CODE/>\n" +
+                "\t<SEAL>\n" +
+                "\t\t<ESEAL_ID/>\n" +
+                "\t\t<SEAL_KEY/>\n" +
+                "\t</SEAL>\n" +
+                "</GATHER_INFO></MSG>");
+    }*/
     public void analysis(String string) {
         Message message = analysis.readTicketsXml(string);
-        String stype = analysis.getStype();
+        String stype = message.getMeta().getSmType();
         if (stype.equals("CARM")) {
-            gatherinfo info = gatherInfoAnalysis.toJavaBean(message);
-            route.infoService.save(info);
+            if(message.getComInfo() !=null){
+                commandInfo info  = commandInfoAnalysis.toJavaBean(message);
+                route.commandService.save(info);
+            }else{
+                GatherInfo info = gatherInfoAnalysis.toJavaBean(message);
+                route.infoService.save(info);
+            }
         } else if (stype.equals("ES1")) {
             airone_ex_stock exStock = exStockAnalysis.toExStock(message);
             route.exStockService.save(exStock);

-package com.sy.controller;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * @author zhangfan
- * @web www.sy.com
- * @company 郑州商友科技有限公司
- * @time 2018-11-20 11:12
- */
-@Controller
-public class TestController {
-
-    @RequestMapping("/index")
-    public String toindex() {
-        return "hello springBoot";
-    }
-
-    @RequestMapping("/hello")
-    public String toHello() {
-        return "hello";
-    }
-
-    @RequestMapping("/welcome")
-    public String toWelcome() {
-        return "Welcome";
-    }
-
-}

+package com.sy.mapper;
+
+import com.sy.model.GatherInfo;
+
+public interface GatherInfoMapper {
+    int deleteByPrimaryKey(String seqno);
+
+    int insert(GatherInfo record);
+
+    int insertSelective(GatherInfo record);
+
+    GatherInfo selectByPrimaryKey(String seqno);
+
+    int updateByPrimaryKeySelective(GatherInfo record);
+
+    int updateByPrimaryKey(GatherInfo record);
+}
\ No newline at end of file

@@ -3,7 +3,15 @@ package com.sy.mapper;
 import com.sy.model.commandInfo;
 
 public interface commandInfoMapper {
-    int insert(commandInfo info);
+    int deleteByPrimaryKey(String seqNo);
+
+    int insert(commandInfo record);
 
     int insertSelective(commandInfo record);
+
+    commandInfo selectByPrimaryKey(String seqNo);
+
+    int updateByPrimaryKeySelective(commandInfo record);
+
+    int updateByPrimaryKey(commandInfo record);
 }
\ No newline at end of file

-package com.sy.mapper;
-
-import com.sy.model.gatherinfo;
-
-public interface gatherinfoMapper {
-    int deleteByPrimaryKey(String seqno);
-
-    int insert(gatherinfo record);
-
-    int insertSelective(gatherinfo record);
-
-    gatherinfo selectByPrimaryKey(String seqno);
-
-    int updateByPrimaryKeySelective(gatherinfo record);
-
-    int updateByPrimaryKey(gatherinfo record);
-}
\ No newline at end of file

@@ -3,7 +3,7 @@ package com.sy.model;
 import java.math.BigDecimal;
 import java.util.Date;
 
-public class gatherinfo {
+public class GatherInfo {
     private String seqno;
 
     private String sender;
@@ -32,7 +32,9 @@ public class gatherinfo {
 
     private String icbillno;
 
-    private String icgrosswt;
+    private String icfromtype;
+
+    private BigDecimal icgrosswt;
 
     private String icvecustomsno;
 
@@ -46,6 +48,10 @@ public class gatherinfo {
 
     private String icexdata;
 
+    private Date icpegdatetime;
+
+    private String icperdaydue;
+
     private BigDecimal grosswt;
 
     private String vename;
@@ -58,12 +64,6 @@ public class gatherinfo {
 
     private BigDecimal vewt;
 
-    private String trecno;
-
-    private String trname;
-
-    private BigDecimal trwt;
-
     private String contanum;
 
     private String contareco;
@@ -80,10 +80,12 @@ public class gatherinfo {
 
     private String esealid;
 
-    private String esealicno;
+    private String sealkey;
 
     private Date createtime;
 
+    private String ordernum;
+
     public String getSeqno() {
         return seqno;
     }
@@ -196,12 +198,20 @@ public class gatherinfo {
         this.icbillno = icbillno == null ? null : icbillno.trim();
     }
 
-    public String getIcgrosswt() {
+    public String getIcfromtype() {
+        return icfromtype;
+    }
+
+    public void setIcfromtype(String icfromtype) {
+        this.icfromtype = icfromtype == null ? null : icfromtype.trim();
+    }
+
+    public BigDecimal getIcgrosswt() {
         return icgrosswt;
     }
 
-    public void setIcgrosswt(String icgrosswt) {
-        this.icgrosswt = icgrosswt == null ? null : icgrosswt.trim();
+    public void setIcgrosswt(BigDecimal icgrosswt) {
+        this.icgrosswt = icgrosswt;
     }
 
     public String getIcvecustomsno() {
@@ -252,6 +262,22 @@ public class gatherinfo {
         this.icexdata = icexdata == null ? null : icexdata.trim();
     }
 
+    public Date getIcpegdatetime() {
+        return icpegdatetime;
+    }
+
+    public void setIcpegdatetime(Date icpegdatetime) {
+        this.icpegdatetime = icpegdatetime;
+    }
+
+    public String getIcperdaydue() {
+        return icperdaydue;
+    }
+
+    public void setIcperdaydue(String icperdaydue) {
+        this.icperdaydue = icperdaydue == null ? null : icperdaydue.trim();
+    }
+
     public BigDecimal getGrosswt() {
         return grosswt;
     }
@@ -300,30 +326,6 @@ public class gatherinfo {
         this.vewt = vewt;
     }
 
-    public String getTrecno() {
-        return trecno;
-    }
-
-    public void setTrecno(String trecno) {
-        this.trecno = trecno == null ? null : trecno.trim();
-    }
-
-    public String getTrname() {
-        return trname;
-    }
-
-    public void setTrname(String trname) {
-        this.trname = trname == null ? null : trname.trim();
-    }
-
-    public BigDecimal getTrwt() {
-        return trwt;
-    }
-
-    public void setTrwt(BigDecimal trwt) {
-        this.trwt = trwt;
-    }
-
     public String getContanum() {
         return contanum;
     }
@@ -388,12 +390,12 @@ public class gatherinfo {
         this.esealid = esealid == null ? null : esealid.trim();
     }
 
-    public String getEsealicno() {
-        return esealicno;
+    public String getSealkey() {
+        return sealkey;
     }
 
-    public void setEsealicno(String esealicno) {
-        this.esealicno = esealicno == null ? null : esealicno.trim();
+    public void setSealkey(String sealkey) {
+        this.sealkey = sealkey == null ? null : sealkey.trim();
     }
 
     public Date getCreatetime() {
@@ -403,4 +405,12 @@ public class gatherinfo {
     public void setCreatetime(Date createtime) {
         this.createtime = createtime;
     }
+
+    public String getOrdernum() {
+        return ordernum;
+    }
+
+    public void setOrdernum(String ordernum) {
+        this.ordernum = ordernum == null ? null : ordernum.trim();
+    }
 }
\ No newline at end of file

@@ -3,197 +3,186 @@ package com.sy.model;
 import java.util.Date;
 
 public class commandInfo {
-
-    private String areaId;
-
-    private String chnlNo;
-
-    private String iEType;
-
     private String seqNo;
 
-    private String executeResult;
+    private String sender;
 
-    private String source;
+    private String receiver;
 
-    private String action;
+    private String seqn;
 
-    private Integer openTimes;
+    private Date sendtime;
 
-    private String esealIcNo;
+    private String btype;
 
-    private String esealId;
+    private String stype;
 
-    private String esealStatehint;
+    private String areaId;
 
-    private String esealStatecode;
+    private String chnlNo;
 
-    private String oldesealId;
+    private String iEType;
 
-    private String newesealId;
+    private String checkResult;
 
-    private String esealKey;
+    private String veName;
 
-    private String actionModel;
+    private String gpsId;
 
-    private String changeCause;
+    private String originCustoms;
 
-    private Date changeTime;
+    private String destCustoms;
 
-    private String operName;
+    private String esealId;
 
-    private String opHint;
+    private String sealKey;
 
-    public String getAreaId() {
-        return areaId;
-    }
+    private String formId;
 
-    public void setAreaId(String areaId) {
-        this.areaId = areaId == null ? null : areaId.trim();
-    }
+    private String opHint;
 
-    public String getChnlNo() {
-        return chnlNo;
+    public String getSeqNo() {
+        return seqNo;
     }
 
-    public void setChnlNo(String chnlNo) {
-        this.chnlNo = chnlNo == null ? null : chnlNo.trim();
+    public void setSeqNo(String seqNo) {
+        this.seqNo = seqNo == null ? null : seqNo.trim();
     }
 
-    public String getiEType() {
-        return iEType;
+    public String getSender() {
+        return sender;
     }
 
-    public void setiEType(String iEType) {
-        this.iEType = iEType == null ? null : iEType.trim();
+    public void setSender(String sender) {
+        this.sender = sender == null ? null : sender.trim();
     }
 
-    public String getSeqNo() {
-        return seqNo;
+    public String getReceiver() {
+        return receiver;
     }
 
-    public void setSeqNo(String seqNo) {
-        this.seqNo = seqNo == null ? null : seqNo.trim();
+    public void setReceiver(String receiver) {
+        this.receiver = receiver == null ? null : receiver.trim();
     }
 
-    public String getExecuteResult() {
-        return executeResult;
+    public String getSeqn() {
+        return seqn;
     }
 
-    public void setExecuteResult(String executeResult) {
-        this.executeResult = executeResult == null ? null : executeResult.trim();
+    public void setSeqn(String seqn) {
+        this.seqn = seqn == null ? null : seqn.trim();
     }
 
-    public String getSource() {
-        return source;
+    public Date getSendtime() {
+        return sendtime;
     }
 
-    public void setSource(String source) {
-        this.source = source == null ? null : source.trim();
+    public void setSendtime(Date sendtime) {
+        this.sendtime = sendtime;
     }
 
-    public String getAction() {
-        return action;
+    public String getBtype() {
+        return btype;
     }
 
-    public void setAction(String action) {
-        this.action = action == null ? null : action.trim();
+    public void setBtype(String btype) {
+        this.btype = btype == null ? null : btype.trim();
     }
 
-    public Integer getOpenTimes() {
-        return openTimes;
+    public String getStype() {
+        return stype;
     }
 
-    public void setOpenTimes(Integer openTimes) {
-        this.openTimes = openTimes;
+    public void setStype(String stype) {
+        this.stype = stype == null ? null : stype.trim();
     }
 
-    public String getEsealIcNo() {
-        return esealIcNo;
+    public String getAreaId() {
+        return areaId;
     }
 
-    public void setEsealIcNo(String esealIcNo) {
-        this.esealIcNo = esealIcNo == null ? null : esealIcNo.trim();
+    public void setAreaId(String areaId) {
+        this.areaId = areaId == null ? null : areaId.trim();
     }
 
-    public String getEsealId() {
-        return esealId;
+    public String getChnlNo() {
+        return chnlNo;
     }
 
-    public void setEsealId(String esealId) {
-        this.esealId = esealId == null ? null : esealId.trim();
+    public void setChnlNo(String chnlNo) {
+        this.chnlNo = chnlNo == null ? null : chnlNo.trim();
     }
 
-    public String getEsealStatehint() {
-        return esealStatehint;
+    public String getiEType() {
+        return iEType;
     }
 
-    public void setEsealStatehint(String esealStatehint) {
-        this.esealStatehint = esealStatehint == null ? null : esealStatehint.trim();
+    public void setiEType(String iEType) {
+        this.iEType = iEType == null ? null : iEType.trim();
     }
 
-    public String getEsealStatecode() {
-        return esealStatecode;
+    public String getCheckResult() {
+        return checkResult;
     }
 
-    public void setEsealStatecode(String esealStatecode) {
-        this.esealStatecode = esealStatecode == null ? null : esealStatecode.trim();
+    public void setCheckResult(String checkResult) {
+        this.checkResult = checkResult == null ? null : checkResult.trim();
     }
 
-    public String getOldesealId() {
-        return oldesealId;
+    public String getVeName() {
+        return veName;
     }
 
-    public void setOldesealId(String oldesealId) {
-        this.oldesealId = oldesealId == null ? null : oldesealId.trim();
+    public void setVeName(String veName) {
+        this.veName = veName == null ? null : veName.trim();
     }
 
-    public String getNewesealI() {
-        return newesealId;
+    public String getGpsId() {
+        return gpsId;
     }
 
-    public void setNewesealId(String ewesealId) {
-        this.newesealId = ewesealId == null ? null : ewesealId.trim();
+    public void setGpsId(String gpsId) {
+        this.gpsId = gpsId == null ? null : gpsId.trim();
     }
 
-    public String getEsealKey() {
-        return esealKey;
+    public String getOriginCustoms() {
+        return originCustoms;
     }
 
-    public void setEsealKey(String esealKey) {
-        this.esealKey = esealKey == null ? null : esealKey.trim();
+    public void setOriginCustoms(String originCustoms) {
+        this.originCustoms = originCustoms == null ? null : originCustoms.trim();
     }
 
-    public String getActionModel() {
-        return actionModel;
+    public String getDestCustoms() {
+        return destCustoms;
     }
 
-    public void setActionModel(String actionModel) {
-        this.actionModel = actionModel == null ? null : actionModel.trim();
+    public void setDestCustoms(String destCustoms) {
+        this.destCustoms = destCustoms == null ? null : destCustoms.trim();
     }
 
-    public String getChangeCause() {
-        return changeCause;
+    public String getEsealId() {
+        return esealId;
     }
 
-    public void setChangeCause(String changeCause) {
-        this.changeCause = changeCause == null ? null : changeCause.trim();
+    public void setEsealId(String esealId) {
+        this.esealId = esealId == null ? null : esealId.trim();
     }
 
-    public Date getChangeTime() {
-        return changeTime;
+    public String getSealKey() {
+        return sealKey;
     }
 
-    public void setChangeTime(Date changeTime) {
-        this.changeTime = changeTime;
+    public void setSealKey(String sealKey) {
+        this.sealKey = sealKey == null ? null : sealKey.trim();
     }
 
-    public String getOperName() {
-        return operName;
+    public String getFormId() {
+        return formId;
     }
 
-    public void setOperName(String operName) {
-        this.operName = operName == null ? null : operName.trim();
+    public void setFormId(String formId) {
+        this.formId = formId == null ? null : formId.trim();
     }
 
     public String getOpHint() {

 package com.sy.service;
 
-import com.sy.model.gatherinfo;
+import com.sy.model.GatherInfo;
 
-/**
- * @author zhangfan
- * @web www.sy.com
- * @company 郑州商友科技有限公司
- * @time 2018-11-28 16:40
- */
 public interface GatherInfoService {
 
-    int save(gatherinfo info);
+    int save(GatherInfo info);
 }

@@ -5,7 +5,9 @@ import com.sy.mapper.commandInfoMapper;
 import com.sy.model.commandInfo;
 import com.sy.service.CommandInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
+@Service
 public class CommandInfoImpl implements CommandInfoService {
 
     @Autowired

 package com.sy.service.impl;
 
-import com.sy.mapper.gatherinfoMapper;
-import com.sy.model.gatherinfo;
+import com.sy.mapper.GatherInfoMapper;
+import com.sy.model.GatherInfo;
 import com.sy.service.GatherInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-/**
- * @author zhangfan
- * @web www.sy.com
- * @company 郑州商友科技有限公司
- * @time 2018-11-28 16:52
- */
 @Service
 public class GatherInfoServiceImpl implements GatherInfoService {
 
     @Autowired
-    private gatherinfoMapper infoMapper;
+    private GatherInfoMapper infoMapper;
 
     @Override
-    public int save(gatherinfo info) {
+    public int save(GatherInfo info) {
         int row = 0;
         try {
             row =infoMapper.insert(info);

 #设置访问端口
 server.port=8082
-#thymeleaf配置,这里是可以省略的，因为默认配置已经足够
-#关闭缓存，及时刷新页面,这一点很重要
-#spring.thymeleaf.cache=false
-#注释的部分是Thymeleaf默认的配置，如有其它需求可以自行更改
-#spring.thymeleaf.prefix=classpath:/webapp/WEB-INF/
-#spring.thymeleaf.suffix=.html
-#spring.thymeleaf.mode=HTML5
-#spring.thymeleaf.encoding=UTF-8
-#spring.thymeleaf.servlet.content-type=text/html
-
 #eureka注册中心服务器地址
-eureka.client.service-url.defaultZone=http://10.50.3.82:19527/eureka/
+#eureka.client.service-url.defaultZone=http://10.50.3.82:19527/eureka/
 #服务名
-spring.application.name=AnalysisForStation
+#spring.application.name=AnalysisForStation
 #设置热部署
 #开启热部署
 spring.devtools.restart.enabled=true
@@ -31,8 +21,9 @@ spring.datasource.password=root
 #驱动
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #数据库连接路径
-spring.datasource.url=jdbc:mysql://localhost:3306/bysj
-#连接池类型
+spring.datasource.url=jdbc:mysql://localhost:3306/bysj?useUnicode=true&characterEncoding=utf8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai
+
+#连接池类
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 #连接池配置，因为springboot默认是开启了连接池的，它有默认配置，这一段可以忽略
 # 初始化大小，最小，最大

@@ -62,7 +62,8 @@
                enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>
         <table tableName="vehicle_mainifist_relation" domainObjectName="vehicle_mainifist_relation" enableCountByExample="false" enableUpdateByExample="false"
                enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>-->
-        <table tableName="commandInfo" domainObjectName="commandInfo" enableCountByExample="false" enableUpdateByExample="false"
+        <table tableName="gatherinfo" domainObjectName="GatherInfo" enableCountByExample="false"
+               enableUpdateByExample="false"
                enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>
     </context>
 </generatorConfiguration>
\ No newline at end of file

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sy.mapper.gatherinfoMapper">
-  <resultMap id="BaseResultMap" type="com.sy.model.gatherinfo">
+<mapper namespace="com.sy.mapper.GatherInfoMapper">
+  <resultMap id="BaseResultMap" type="com.sy.model.GatherInfo">
     <id column="SeqNo" jdbcType="VARCHAR" property="seqno" />
     <result column="sender" jdbcType="VARCHAR" property="sender" />
     <result column="receiver" jdbcType="VARCHAR" property="receiver" />
@@ -16,6 +16,7 @@
     <result column="IcDrCustomsNo" jdbcType="VARCHAR" property="icdrcustomsno" />
     <result column="IcCoCustomsNo" jdbcType="VARCHAR" property="iccocustomsno" />
     <result column="IcBillNo" jdbcType="VARCHAR" property="icbillno" />
+    <result column="IcFromType" jdbcType="VARCHAR" property="icfromtype" />
     <result column="IcGrossWt" jdbcType="DECIMAL" property="icgrosswt" />
     <result column="IcVeCustomsNo" jdbcType="VARCHAR" property="icvecustomsno" />
     <result column="IcVeName" jdbcType="VARCHAR" property="icvename" />
@@ -23,15 +24,14 @@
     <result column="IcEsealId" jdbcType="VARCHAR" property="icesealid" />
     <result column="IcBussType" jdbcType="VARCHAR" property="icbusstype" />
     <result column="IcExData" jdbcType="VARCHAR" property="icexdata" />
+    <result column="IcPegDatetime" jdbcType="TIMESTAMP" property="icpegdatetime" />
+    <result column="IcPerDayDue" jdbcType="VARCHAR" property="icperdaydue" />
     <result column="GrossWt" jdbcType="DECIMAL" property="grosswt" />
     <result column="VeName" jdbcType="VARCHAR" property="vename" />
     <result column="CarEcNo" jdbcType="VARCHAR" property="carecno" />
     <result column="CarEcNo2" jdbcType="VARCHAR" property="carecno2" />
     <result column="VeCustomsNo" jdbcType="VARCHAR" property="vecustomsno" />
     <result column="VeWt" jdbcType="DECIMAL" property="vewt" />
-    <result column="trEcNo" jdbcType="VARCHAR" property="trecno" />
-    <result column="TrName" jdbcType="VARCHAR" property="trname" />
-    <result column="TrWt" jdbcType="DECIMAL" property="trwt" />
     <result column="ContaNum" jdbcType="VARCHAR" property="contanum" />
     <result column="ContaReco" jdbcType="VARCHAR" property="contareco" />
     <result column="ContaIdF" jdbcType="VARCHAR" property="contaidf" />
@@ -40,15 +40,16 @@
     <result column="ContaModelB" jdbcType="VARCHAR" property="contamodelb" />
     <result column="BarCode" jdbcType="VARCHAR" property="barcode" />
     <result column="EsealId" jdbcType="VARCHAR" property="esealid" />
-    <result column="EsealIcNo" jdbcType="VARCHAR" property="esealicno" />
-    <result column="CreateTime" jdbcType="TIMESTAMP" property="createtime" />
+    <result column="SealKey" jdbcType="VARCHAR" property="sealkey" />
+    <result column="CreateTime" jdbcType="DATE" property="createtime" />
+    <result column="OrderNum" jdbcType="VARCHAR" property="ordernum" />
   </resultMap>
   <sql id="Base_Column_List">
     SeqNo, sender, receiver, seqn, sendTime, type, smType, areaId, chnlNo, IEtype, DrIcNo, 
-    IcDrCustomsNo, IcCoCustomsNo, IcBillNo, IcGrossWt, IcVeCustomsNo, IcVeName, IcContaId, 
-    IcEsealId, IcBussType, IcExData, GrossWt, VeName, CarEcNo, CarEcNo2, VeCustomsNo, 
-    VeWt, trEcNo, TrName, TrWt, ContaNum, ContaReco, ContaIdF, ContaIdB, ContaModelF, 
-    ContaModelB, BarCode, EsealId, EsealIcNo,CreateTime
+    IcDrCustomsNo, IcCoCustomsNo, IcBillNo, IcFromType, IcGrossWt, IcVeCustomsNo, IcVeName, 
+    IcContaId, IcEsealId, IcBussType, IcExData, IcPegDatetime, IcPerDayDue, GrossWt, 
+    VeName, CarEcNo, CarEcNo2, VeCustomsNo, VeWt, ContaNum, ContaReco, ContaIdF, ContaIdB, 
+    ContaModelF, ContaModelB, BarCode, EsealId, SealKey, CreateTime, OrderNum
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
@@ -60,38 +61,37 @@
     delete from gatherinfo
     where SeqNo = #{seqno,jdbcType=VARCHAR}
   </delete>
-  <insert id="insert" parameterType="com.sy.model.gatherinfo">
+  <insert id="insert" parameterType="com.sy.model.GatherInfo">
     insert into gatherinfo (SeqNo, sender, receiver, 
       seqn, sendTime, type, 
       smType, areaId, chnlNo, 
       IEtype, DrIcNo, IcDrCustomsNo, 
-      IcCoCustomsNo, IcBillNo, IcGrossWt, 
-      IcVeCustomsNo, IcVeName, IcContaId, 
-      IcEsealId, IcBussType, IcExData, 
+      IcCoCustomsNo, IcBillNo, IcFromType, 
+      IcGrossWt, IcVeCustomsNo, IcVeName, 
+      IcContaId, IcEsealId, IcBussType, 
+      IcExData, IcPegDatetime, IcPerDayDue, 
       GrossWt, VeName, CarEcNo, 
       CarEcNo2, VeCustomsNo, VeWt, 
-      trEcNo, TrName, TrWt, 
       ContaNum, ContaReco, ContaIdF, 
       ContaIdB, ContaModelF, ContaModelB, 
-      BarCode, EsealId, EsealIcNo,CreateTime
-      )
+      BarCode, EsealId, SealKey, 
+      CreateTime, OrderNum)
     values (#{seqno,jdbcType=VARCHAR}, #{sender,jdbcType=VARCHAR}, #{receiver,jdbcType=VARCHAR}, 
       #{seqn,jdbcType=VARCHAR}, #{sendtime,jdbcType=TIMESTAMP}, #{type,jdbcType=VARCHAR}, 
       #{smtype,jdbcType=VARCHAR}, #{areaid,jdbcType=VARCHAR}, #{chnlno,jdbcType=VARCHAR}, 
       #{ietype,jdbcType=VARCHAR}, #{dricno,jdbcType=VARCHAR}, #{icdrcustomsno,jdbcType=VARCHAR}, 
-      #{iccocustomsno,jdbcType=VARCHAR}, #{icbillno,jdbcType=VARCHAR}, #{icgrosswt,jdbcType=DECIMAL},
-      #{icvecustomsno,jdbcType=VARCHAR}, #{icvename,jdbcType=VARCHAR}, #{iccontaid,jdbcType=VARCHAR}, 
-      #{icesealid,jdbcType=VARCHAR}, #{icbusstype,jdbcType=VARCHAR}, #{icexdata,jdbcType=VARCHAR}, 
-      #{grosswt,jdbcType=DECIMAL}, #{vename,jdbcType=VARCHAR}, #{carecno,jdbcType=VARCHAR},
+      #{iccocustomsno,jdbcType=VARCHAR}, #{icbillno,jdbcType=VARCHAR}, #{icfromtype,jdbcType=VARCHAR}, 
+      #{icgrosswt,jdbcType=DECIMAL}, #{icvecustomsno,jdbcType=VARCHAR}, #{icvename,jdbcType=VARCHAR}, 
+      #{iccontaid,jdbcType=VARCHAR}, #{icesealid,jdbcType=VARCHAR}, #{icbusstype,jdbcType=VARCHAR}, 
+      #{icexdata,jdbcType=VARCHAR}, #{icpegdatetime,jdbcType=TIMESTAMP}, #{icperdaydue,jdbcType=VARCHAR}, 
+      #{grosswt,jdbcType=DECIMAL}, #{vename,jdbcType=VARCHAR}, #{carecno,jdbcType=VARCHAR}, 
       #{carecno2,jdbcType=VARCHAR}, #{vecustomsno,jdbcType=VARCHAR}, #{vewt,jdbcType=DECIMAL}, 
-      #{trecno,jdbcType=VARCHAR}, #{trname,jdbcType=VARCHAR}, #{trwt,jdbcType=DECIMAL}, 
       #{contanum,jdbcType=VARCHAR}, #{contareco,jdbcType=VARCHAR}, #{contaidf,jdbcType=VARCHAR}, 
       #{contaidb,jdbcType=VARCHAR}, #{contamodelf,jdbcType=VARCHAR}, #{contamodelb,jdbcType=VARCHAR}, 
-      #{barcode,jdbcType=VARCHAR}, #{esealid,jdbcType=VARCHAR}, #{esealicno,jdbcType=VARCHAR},
-      #{createtime,jdbcType=TIMESTAMP}
-      )
+      #{barcode,jdbcType=VARCHAR}, #{esealid,jdbcType=VARCHAR}, #{sealkey,jdbcType=VARCHAR}, 
+      #{createtime,jdbcType=DATE}, #{ordernum,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.sy.model.gatherinfo">
+  <insert id="insertSelective" parameterType="com.sy.model.GatherInfo">
     insert into gatherinfo
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="seqno != null">
@@ -136,6 +136,9 @@
       <if test="icbillno != null">
         IcBillNo,
       </if>
+      <if test="icfromtype != null">
+        IcFromType,
+      </if>
       <if test="icgrosswt != null">
         IcGrossWt,
       </if>
@@ -157,6 +160,12 @@
       <if test="icexdata != null">
         IcExData,
       </if>
+      <if test="icpegdatetime != null">
+        IcPegDatetime,
+      </if>
+      <if test="icperdaydue != null">
+        IcPerDayDue,
+      </if>
       <if test="grosswt != null">
         GrossWt,
       </if>
@@ -175,15 +184,6 @@
       <if test="vewt != null">
         VeWt,
       </if>
-      <if test="trecno != null">
-        trEcNo,
-      </if>
-      <if test="trname != null">
-        TrName,
-      </if>
-      <if test="trwt != null">
-        TrWt,
-      </if>
       <if test="contanum != null">
         ContaNum,
       </if>
@@ -208,12 +208,15 @@
       <if test="esealid != null">
         EsealId,
       </if>
-      <if test="esealicno != null">
-        EsealIcNo,
+      <if test="sealkey != null">
+        SealKey,
       </if>
       <if test="createtime != null">
         CreateTime,
       </if>
+      <if test="ordernum != null">
+        OrderNum,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="seqno != null">
@@ -258,6 +261,9 @@
       <if test="icbillno != null">
         #{icbillno,jdbcType=VARCHAR},
       </if>
+      <if test="icfromtype != null">
+        #{icfromtype,jdbcType=VARCHAR},
+      </if>
       <if test="icgrosswt != null">
         #{icgrosswt,jdbcType=DECIMAL},
       </if>
@@ -279,6 +285,12 @@
       <if test="icexdata != null">
         #{icexdata,jdbcType=VARCHAR},
       </if>
+      <if test="icpegdatetime != null">
+        #{icpegdatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="icperdaydue != null">
+        #{icperdaydue,jdbcType=VARCHAR},
+      </if>
       <if test="grosswt != null">
         #{grosswt,jdbcType=DECIMAL},
       </if>
@@ -297,15 +309,6 @@
       <if test="vewt != null">
         #{vewt,jdbcType=DECIMAL},
       </if>
-      <if test="trecno != null">
-        #{trecno,jdbcType=VARCHAR},
-      </if>
-      <if test="trname != null">
-        #{trname,jdbcType=VARCHAR},
-      </if>
-      <if test="trwt != null">
-        #{trwt,jdbcType=DECIMAL},
-      </if>
       <if test="contanum != null">
         #{contanum,jdbcType=VARCHAR},
       </if>
@@ -330,15 +333,18 @@
       <if test="esealid != null">
         #{esealid,jdbcType=VARCHAR},
       </if>
-      <if test="esealicno != null">
-        #{esealicno,jdbcType=VARCHAR},
+      <if test="sealkey != null">
+        #{sealkey,jdbcType=VARCHAR},
+      </if>
+      <if test="createtime != null">
+        #{createtime,jdbcType=DATE},
+      </if>
+      <if test="ordernum != null">
+        #{ordernum,jdbcType=VARCHAR},
       </if>
-      <if test="createtime !=null">
-        #{createtime,jdbcType=TIMESTAMP},
-    </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.sy.model.gatherinfo">
+  <update id="updateByPrimaryKeySelective" parameterType="com.sy.model.GatherInfo">
     update gatherinfo
     <set>
       <if test="sender != null">
@@ -380,6 +386,9 @@
       <if test="icbillno != null">
         IcBillNo = #{icbillno,jdbcType=VARCHAR},
       </if>
+      <if test="icfromtype != null">
+        IcFromType = #{icfromtype,jdbcType=VARCHAR},
+      </if>
       <if test="icgrosswt != null">
         IcGrossWt = #{icgrosswt,jdbcType=DECIMAL},
       </if>
@@ -401,6 +410,12 @@
       <if test="icexdata != null">
         IcExData = #{icexdata,jdbcType=VARCHAR},
       </if>
+      <if test="icpegdatetime != null">
+        IcPegDatetime = #{icpegdatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="icperdaydue != null">
+        IcPerDayDue = #{icperdaydue,jdbcType=VARCHAR},
+      </if>
       <if test="grosswt != null">
         GrossWt = #{grosswt,jdbcType=DECIMAL},
       </if>
@@ -419,15 +434,6 @@
       <if test="vewt != null">
         VeWt = #{vewt,jdbcType=DECIMAL},
       </if>
-      <if test="trecno != null">
-        trEcNo = #{trecno,jdbcType=VARCHAR},
-      </if>
-      <if test="trname != null">
-        TrName = #{trname,jdbcType=VARCHAR},
-      </if>
-      <if test="trwt != null">
-        TrWt = #{trwt,jdbcType=DECIMAL},
-      </if>
       <if test="contanum != null">
         ContaNum = #{contanum,jdbcType=VARCHAR},
       </if>
@@ -452,16 +458,19 @@
       <if test="esealid != null">
         EsealId = #{esealid,jdbcType=VARCHAR},
       </if>
-      <if test="esealicno != null">
-        EsealIcNo = #{esealicno,jdbcType=VARCHAR},
+      <if test="sealkey != null">
+        SealKey = #{sealkey,jdbcType=VARCHAR},
+      </if>
+      <if test="createtime != null">
+        CreateTime = #{createtime,jdbcType=DATE},
       </if>
-      <if test="createtime !=null">
-        CreateTime = #{createtime,jdbcType=TIMESTAMP},
+      <if test="ordernum != null">
+        OrderNum = #{ordernum,jdbcType=VARCHAR},
       </if>
     </set>
     where SeqNo = #{seqno,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.sy.model.gatherinfo">
+  <update id="updateByPrimaryKey" parameterType="com.sy.model.GatherInfo">
     update gatherinfo
     set sender = #{sender,jdbcType=VARCHAR},
       receiver = #{receiver,jdbcType=VARCHAR},
@@ -476,6 +485,7 @@
       IcDrCustomsNo = #{icdrcustomsno,jdbcType=VARCHAR},
       IcCoCustomsNo = #{iccocustomsno,jdbcType=VARCHAR},
       IcBillNo = #{icbillno,jdbcType=VARCHAR},
+      IcFromType = #{icfromtype,jdbcType=VARCHAR},
       IcGrossWt = #{icgrosswt,jdbcType=DECIMAL},
       IcVeCustomsNo = #{icvecustomsno,jdbcType=VARCHAR},
       IcVeName = #{icvename,jdbcType=VARCHAR},
@@ -483,15 +493,14 @@
       IcEsealId = #{icesealid,jdbcType=VARCHAR},
       IcBussType = #{icbusstype,jdbcType=VARCHAR},
       IcExData = #{icexdata,jdbcType=VARCHAR},
+      IcPegDatetime = #{icpegdatetime,jdbcType=TIMESTAMP},
+      IcPerDayDue = #{icperdaydue,jdbcType=VARCHAR},
       GrossWt = #{grosswt,jdbcType=DECIMAL},
       VeName = #{vename,jdbcType=VARCHAR},
       CarEcNo = #{carecno,jdbcType=VARCHAR},
       CarEcNo2 = #{carecno2,jdbcType=VARCHAR},
       VeCustomsNo = #{vecustomsno,jdbcType=VARCHAR},
       VeWt = #{vewt,jdbcType=DECIMAL},
-      trEcNo = #{trecno,jdbcType=VARCHAR},
-      TrName = #{trname,jdbcType=VARCHAR},
-      TrWt = #{trwt,jdbcType=DECIMAL},
       ContaNum = #{contanum,jdbcType=VARCHAR},
       ContaReco = #{contareco,jdbcType=VARCHAR},
       ContaIdF = #{contaidf,jdbcType=VARCHAR},
@@ -500,8 +509,9 @@
       ContaModelB = #{contamodelb,jdbcType=VARCHAR},
       BarCode = #{barcode,jdbcType=VARCHAR},
       EsealId = #{esealid,jdbcType=VARCHAR},
-      EsealIcNo = #{esealicno,jdbcType=VARCHAR},
-      CreateTime = #{createtime,jdbcType=TIMESTAMP}
+      SealKey = #{sealkey,jdbcType=VARCHAR},
+      CreateTime = #{createtime,jdbcType=DATE},
+      OrderNum = #{ordernum,jdbcType=VARCHAR}
     where SeqNo = #{seqno,jdbcType=VARCHAR}
   </update>
 </mapper>
\ No newline at end of file

@@ -2,46 +2,81 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sy.mapper.commandInfoMapper">
   <resultMap id="BaseResultMap" type="com.sy.model.commandInfo">
+    <id column="SEQ_NO" jdbcType="VARCHAR" property="seqNo" />
+    <result column="sender" jdbcType="VARCHAR" property="sender" />
+    <result column="receiver" jdbcType="VARCHAR" property="receiver" />
+    <result column="seqn" jdbcType="VARCHAR" property="seqn" />
+    <result column="sendtime" jdbcType="TIMESTAMP" property="sendtime" />
+    <result column="btype" jdbcType="VARCHAR" property="btype" />
+    <result column="stype" jdbcType="VARCHAR" property="stype" />
     <result column="AREA_ID" jdbcType="VARCHAR" property="areaId" />
     <result column="CHNL_NO" jdbcType="VARCHAR" property="chnlNo" />
     <result column="I_E_TYPE" jdbcType="VARCHAR" property="iEType" />
-    <result column="SEQ_NO" jdbcType="VARCHAR" property="seqNo" />
-    <result column="EXECUTE_RESULT" jdbcType="VARCHAR" property="executeResult" />
-    <result column="SOURCE" jdbcType="VARCHAR" property="source" />
-    <result column="ACTION" jdbcType="VARCHAR" property="action" />
-    <result column="OPEN_TIMES" jdbcType="DECIMAL" property="openTimes" />
-    <result column="ESEAL_IC_NO" jdbcType="VARCHAR" property="esealIcNo" />
+    <result column="CHECK_RESULT" jdbcType="VARCHAR" property="checkResult" />
+    <result column="VE_NAME" jdbcType="VARCHAR" property="veName" />
+    <result column="GPS_ID" jdbcType="VARCHAR" property="gpsId" />
+    <result column="ORIGIN_CUSTOMS" jdbcType="VARCHAR" property="originCustoms" />
+    <result column="DEST_CUSTOMS" jdbcType="VARCHAR" property="destCustoms" />
     <result column="ESEAL_ID" jdbcType="VARCHAR" property="esealId" />
-    <result column="ESEAL_STATEHINT" jdbcType="VARCHAR" property="esealStatehint" />
-    <result column="ESEAL_STATECODE" jdbcType="VARCHAR" property="esealStatecode" />
-    <result column="OLDESEAL_ID" jdbcType="VARCHAR" property="oldesealId" />
-    <result column="NEWESEAL_ID" jdbcType="VARCHAR" property="newesealId" />
-    <result column="ESEAL_KEY" jdbcType="VARCHAR" property="esealKey" />
-    <result column="ACTION_MODEL" jdbcType="VARCHAR" property="actionModel" />
-    <result column="CHANGE_CAUSE" jdbcType="VARCHAR" property="changeCause" />
-    <result column="CHANGE_TIME" jdbcType="TIMESTAMP" property="changeTime" />
-    <result column="OPER_NAME" jdbcType="VARCHAR" property="operName" />
+    <result column="SEAL_KEY" jdbcType="VARCHAR" property="sealKey" />
+    <result column="FORM_ID" jdbcType="VARCHAR" property="formId" />
     <result column="OP_HINT" jdbcType="VARCHAR" property="opHint" />
   </resultMap>
+  <sql id="Base_Column_List">
+    SEQ_NO, sender, receiver, seqn, sendtime, btype, stype, AREA_ID, CHNL_NO, I_E_TYPE, 
+    CHECK_RESULT, VE_NAME, GPS_ID, ORIGIN_CUSTOMS, DEST_CUSTOMS, ESEAL_ID, SEAL_KEY, 
+    FORM_ID, OP_HINT
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from commandinfo
+    where SEQ_NO = #{seqNo,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from commandinfo
+    where SEQ_NO = #{seqNo,jdbcType=VARCHAR}
+  </delete>
   <insert id="insert" parameterType="com.sy.model.commandInfo">
-    insert into commandinfo (AREA_ID, CHNL_NO, I_E_TYPE, 
-      SEQ_NO, EXECUTE_RESULT, SOURCE, 
-      ACTION, OPEN_TIMES, ESEAL_IC_NO, 
-      ESEAL_ID, ESEAL_STATEHINT, ESEAL_STATECODE, 
-      OLDESEAL_ID, NEWESEAL_ID, ESEAL_KEY, 
-      ACTION_MODEL, CHANGE_CAUSE, CHANGE_TIME, 
-      OPER_NAME, OP_HINT)
-    values (#{areaId,jdbcType=VARCHAR}, #{chnlNo,jdbcType=VARCHAR}, #{iEType,jdbcType=VARCHAR}, 
-      #{seqNo,jdbcType=VARCHAR}, #{executeResult,jdbcType=VARCHAR}, #{source,jdbcType=VARCHAR}, 
-      #{action,jdbcType=VARCHAR}, #{openTimes,jdbcType=DECIMAL}, #{esealIcNo,jdbcType=VARCHAR}, 
-      #{esealId,jdbcType=VARCHAR}, #{esealStatehint,jdbcType=VARCHAR}, #{esealStatecode,jdbcType=VARCHAR}, 
-      #{oldesealId,jdbcType=VARCHAR}, #{newesealId,jdbcType=VARCHAR}, #{esealKey,jdbcType=VARCHAR}, 
-      #{actionModel,jdbcType=VARCHAR}, #{changeCause,jdbcType=VARCHAR}, #{changeTime,jdbcType=TIMESTAMP}, 
-      #{operName,jdbcType=VARCHAR}, #{opHint,jdbcType=VARCHAR})
+    insert into commandinfo (SEQ_NO, sender, receiver, 
+      seqn, sendtime, btype, 
+      stype, AREA_ID, CHNL_NO, 
+      I_E_TYPE, CHECK_RESULT, VE_NAME, 
+      GPS_ID, ORIGIN_CUSTOMS, DEST_CUSTOMS, 
+      ESEAL_ID, SEAL_KEY, FORM_ID, 
+      OP_HINT)
+    values (#{seqNo,jdbcType=VARCHAR}, #{sender,jdbcType=VARCHAR}, #{receiver,jdbcType=VARCHAR}, 
+      #{seqn,jdbcType=VARCHAR}, #{sendtime,jdbcType=TIMESTAMP}, #{btype,jdbcType=VARCHAR}, 
+      #{stype,jdbcType=VARCHAR}, #{areaId,jdbcType=VARCHAR}, #{chnlNo,jdbcType=VARCHAR}, 
+      #{iEType,jdbcType=VARCHAR}, #{checkResult,jdbcType=VARCHAR}, #{veName,jdbcType=VARCHAR}, 
+      #{gpsId,jdbcType=VARCHAR}, #{originCustoms,jdbcType=VARCHAR}, #{destCustoms,jdbcType=VARCHAR}, 
+      #{esealId,jdbcType=VARCHAR}, #{sealKey,jdbcType=VARCHAR}, #{formId,jdbcType=VARCHAR}, 
+      #{opHint,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.sy.model.commandInfo">
     insert into commandinfo
     <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="seqNo != null">
+        SEQ_NO,
+      </if>
+      <if test="sender != null">
+        sender,
+      </if>
+      <if test="receiver != null">
+        receiver,
+      </if>
+      <if test="seqn != null">
+        seqn,
+      </if>
+      <if test="sendtime != null">
+        sendtime,
+      </if>
+      <if test="btype != null">
+        btype,
+      </if>
+      <if test="stype != null">
+        stype,
+      </if>
       <if test="areaId != null">
         AREA_ID,
       </if>
@@ -51,59 +86,56 @@
       <if test="iEType != null">
         I_E_TYPE,
       </if>
-      <if test="seqNo != null">
-        SEQ_NO,
-      </if>
-      <if test="executeResult != null">
-        EXECUTE_RESULT,
+      <if test="checkResult != null">
+        CHECK_RESULT,
       </if>
-      <if test="source != null">
-        SOURCE,
+      <if test="veName != null">
+        VE_NAME,
       </if>
-      <if test="action != null">
-        ACTION,
+      <if test="gpsId != null">
+        GPS_ID,
       </if>
-      <if test="openTimes != null">
-        OPEN_TIMES,
+      <if test="originCustoms != null">
+        ORIGIN_CUSTOMS,
       </if>
-      <if test="esealIcNo != null">
-        ESEAL_IC_NO,
+      <if test="destCustoms != null">
+        DEST_CUSTOMS,
       </if>
       <if test="esealId != null">
         ESEAL_ID,
       </if>
-      <if test="esealStatehint != null">
-        ESEAL_STATEHINT,
+      <if test="sealKey != null">
+        SEAL_KEY,
       </if>
-      <if test="esealStatecode != null">
-        ESEAL_STATECODE,
+      <if test="formId != null">
+        FORM_ID,
       </if>
-      <if test="oldesealId != null">
-        OLDESEAL_ID,
+      <if test="opHint != null">
+        OP_HINT,
       </if>
-      <if test="newesealId != null">
-        NEWESEAL_ID,
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="seqNo != null">
+        #{seqNo,jdbcType=VARCHAR},
       </if>
-      <if test="esealKey != null">
-        ESEAL_KEY,
+      <if test="sender != null">
+        #{sender,jdbcType=VARCHAR},
       </if>
-      <if test="actionModel != null">
-        ACTION_MODEL,
+      <if test="receiver != null">
+        #{receiver,jdbcType=VARCHAR},
       </if>
-      <if test="changeCause != null">
-        CHANGE_CAUSE,
+      <if test="seqn != null">
+        #{seqn,jdbcType=VARCHAR},
       </if>
-      <if test="changeTime != null">
-        CHANGE_TIME,
+      <if test="sendtime != null">
+        #{sendtime,jdbcType=TIMESTAMP},
       </if>
-      <if test="operName != null">
-        OPER_NAME,
+      <if test="btype != null">
+        #{btype,jdbcType=VARCHAR},
       </if>
-      <if test="opHint != null">
-        OP_HINT,
+      <if test="stype != null">
+        #{stype,jdbcType=VARCHAR},
       </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="areaId != null">
         #{areaId,jdbcType=VARCHAR},
       </if>
@@ -113,57 +145,115 @@
       <if test="iEType != null">
         #{iEType,jdbcType=VARCHAR},
       </if>
-      <if test="seqNo != null">
-        #{seqNo,jdbcType=VARCHAR},
-      </if>
-      <if test="executeResult != null">
-        #{executeResult,jdbcType=VARCHAR},
+      <if test="checkResult != null">
+        #{checkResult,jdbcType=VARCHAR},
       </if>
-      <if test="source != null">
-        #{source,jdbcType=VARCHAR},
+      <if test="veName != null">
+        #{veName,jdbcType=VARCHAR},
       </if>
-      <if test="action != null">
-        #{action,jdbcType=VARCHAR},
+      <if test="gpsId != null">
+        #{gpsId,jdbcType=VARCHAR},
       </if>
-      <if test="openTimes != null">
-        #{openTimes,jdbcType=DECIMAL},
+      <if test="originCustoms != null">
+        #{originCustoms,jdbcType=VARCHAR},
       </if>
-      <if test="esealIcNo != null">
-        #{esealIcNo,jdbcType=VARCHAR},
+      <if test="destCustoms != null">
+        #{destCustoms,jdbcType=VARCHAR},
       </if>
       <if test="esealId != null">
         #{esealId,jdbcType=VARCHAR},
       </if>
-      <if test="esealStatehint != null">
-        #{esealStatehint,jdbcType=VARCHAR},
+      <if test="sealKey != null">
+        #{sealKey,jdbcType=VARCHAR},
       </if>
-      <if test="esealStatecode != null">
-        #{esealStatecode,jdbcType=VARCHAR},
+      <if test="formId != null">
+        #{formId,jdbcType=VARCHAR},
       </if>
-      <if test="oldesealId != null">
-        #{oldesealId,jdbcType=VARCHAR},
+      <if test="opHint != null">
+        #{opHint,jdbcType=VARCHAR},
       </if>
-      <if test="newesealId != null">
-        #{newesealId,jdbcType=VARCHAR},
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.sy.model.commandInfo">
+    update commandinfo
+    <set>
+      <if test="sender != null">
+        sender = #{sender,jdbcType=VARCHAR},
       </if>
-      <if test="esealKey != null">
-        #{esealKey,jdbcType=VARCHAR},
+      <if test="receiver != null">
+        receiver = #{receiver,jdbcType=VARCHAR},
       </if>
-      <if test="actionModel != null">
-        #{actionModel,jdbcType=VARCHAR},
+      <if test="seqn != null">
+        seqn = #{seqn,jdbcType=VARCHAR},
       </if>
-      <if test="changeCause != null">
-        #{changeCause,jdbcType=VARCHAR},
+      <if test="sendtime != null">
+        sendtime = #{sendtime,jdbcType=TIMESTAMP},
       </if>
-      <if test="changeTime != null">
-        #{changeTime,jdbcType=TIMESTAMP},
+      <if test="btype != null">
+        btype = #{btype,jdbcType=VARCHAR},
       </if>
-      <if test="operName != null">
-        #{operName,jdbcType=VARCHAR},
+      <if test="stype != null">
+        stype = #{stype,jdbcType=VARCHAR},
       </if>
-      <if test="opHint != null">
-        #{opHint,jdbcType=VARCHAR},
+      <if test="areaId != null">
+        AREA_ID = #{areaId,jdbcType=VARCHAR},
       </if>
-    </trim>
-  </insert>
+      <if test="chnlNo != null">
+        CHNL_NO = #{chnlNo,jdbcType=VARCHAR},
+      </if>
+      <if test="iEType != null">
+        I_E_TYPE = #{iEType,jdbcType=VARCHAR},
+      </if>
+      <if test="checkResult != null">
+        CHECK_RESULT = #{checkResult,jdbcType=VARCHAR},
+      </if>
+      <if test="veName != null">
+        VE_NAME = #{veName,jdbcType=VARCHAR},
+      </if>
+      <if test="gpsId != null">
+        GPS_ID = #{gpsId,jdbcType=VARCHAR},
+      </if>
+      <if test="originCustoms != null">
+        ORIGIN_CUSTOMS = #{originCustoms,jdbcType=VARCHAR},
+      </if>
+      <if test="destCustoms != null">
+        DEST_CUSTOMS = #{destCustoms,jdbcType=VARCHAR},
+      </if>
+      <if test="esealId != null">
+        ESEAL_ID = #{esealId,jdbcType=VARCHAR},
+      </if>
+      <if test="sealKey != null">
+        SEAL_KEY = #{sealKey,jdbcType=VARCHAR},
+      </if>
+      <if test="formId != null">
+        FORM_ID = #{formId,jdbcType=VARCHAR},
+      </if>
+      <if test="opHint != null">
+        OP_HINT = #{opHint,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where SEQ_NO = #{seqNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.sy.model.commandInfo">
+    update commandinfo
+    set sender = #{sender,jdbcType=VARCHAR},
+      receiver = #{receiver,jdbcType=VARCHAR},
+      seqn = #{seqn,jdbcType=VARCHAR},
+      sendtime = #{sendtime,jdbcType=TIMESTAMP},
+      btype = #{btype,jdbcType=VARCHAR},
+      stype = #{stype,jdbcType=VARCHAR},
+      AREA_ID = #{areaId,jdbcType=VARCHAR},
+      CHNL_NO = #{chnlNo,jdbcType=VARCHAR},
+      I_E_TYPE = #{iEType,jdbcType=VARCHAR},
+      CHECK_RESULT = #{checkResult,jdbcType=VARCHAR},
+      VE_NAME = #{veName,jdbcType=VARCHAR},
+      GPS_ID = #{gpsId,jdbcType=VARCHAR},
+      ORIGIN_CUSTOMS = #{originCustoms,jdbcType=VARCHAR},
+      DEST_CUSTOMS = #{destCustoms,jdbcType=VARCHAR},
+      ESEAL_ID = #{esealId,jdbcType=VARCHAR},
+      SEAL_KEY = #{sealKey,jdbcType=VARCHAR},
+      FORM_ID = #{formId,jdbcType=VARCHAR},
+      OP_HINT = #{opHint,jdbcType=VARCHAR}
+    where SEQ_NO = #{seqNo,jdbcType=VARCHAR}
+  </update>
 </mapper>
\ No newline at end of file