更改IMF相关包路径

朱兆平
readme.md
src/main/java/com/tianbo/warehouse/imf/IMF_Reader.java
src/main/java/com/tianbo/warehouse/imf/IMF_Sender.java
src/main/java/com/tianbo/warehouse/handle/IMFSaveHandle.java → src/main/java/com/tianbo/warehouse/imf/handle/IMFSaveHandle.java
src/main/java/com/tianbo/warehouse/schedul/IMF_Task.java → src/main/java/com/tianbo/warehouse/imf/schedul/IMF_Task.java
src/test/java/com/tianbo/warehouse/handleTest.java
--- a/readme.md
查看文件 @2e9e02c
+++ b/readme.md
查看文件 @2e9e02c
@@ -4,6 +4,7 @@
 国际货运物流平台开发脚手架
 #集成
 * 已集成IMF，基于IMF的xml报文格式。在master的git主分支上
+    * POM文件包含本地包
     * 接收IMF的消息
     * 报文类型识别
     * 报文分类本地存储
@@ -15,6 +16,7 @@
     * menu与权限关联
 * 已集成mybatis、mybatisGenerator、pageHelper
 * 集成定时任务框架
-    * 目前在IMF框架中使用
+    * 目前在IMF框架中使用，打开IMF_Task里面的定时任务注释就可以启动IMF客户端功能
 * 集成Spring Cloud
+* 集成websocket
--- a/src/main/java/com/tianbo/warehouse/imf/IMF_Reader.java
查看文件 @2e9e02c
+++ b/src/main/java/com/tianbo/warehouse/imf/IMF_Reader.java
查看文件 @2e9e02c
 package com.tianbo.warehouse.imf;
 import com.caac.imf.api.IMFClient;
-import com.tianbo.warehouse.handle.IMFSaveHandle;
-import com.tianbo.warehouse.schedul.IMF_Task;
-import com.tianbo.warehouse.util.IO.FileTool;
+import com.tianbo.warehouse.imf.handle.IMFSaveHandle;
+import com.tianbo.warehouse.imf.schedul.IMF_Task;
 import org.apache.log4j.Logger;
 public class IMF_Reader extends Thread{
--- a/src/main/java/com/tianbo/warehouse/imf/IMF_Sender.java
查看文件 @2e9e02c
+++ b/src/main/java/com/tianbo/warehouse/imf/IMF_Sender.java
查看文件 @2e9e02c
 package com.tianbo.warehouse.imf;
 import com.caac.imf.api.IMFClient;
-import com.tianbo.warehouse.schedul.IMF_Task;
+import com.tianbo.warehouse.imf.schedul.IMF_Task;
 import com.tianbo.warehouse.util.Date.DateUtil;
 import com.tianbo.warehouse.util.IO.FileTool;
 import com.tianbo.warehouse.util.XML.MakeImfMeta;
 import org.apache.commons.io.FileUtils;
 import org.apache.log4j.Logger;
-import org.xml.sax.SAXParseException;
 import java.io.*;
 import java.util.Iterator;
--- a/src/main/java/com/tianbo/warehouse/handle/IMFSaveHandle.java → src/main/java/com/tianbo/warehouse/imf/handle/IMFSaveHandle.java
查看文件 @2e9e02c
+++ b/src/main/java/com/tianbo/warehouse/handle/IMFSaveHandle.java → src/main/java/com/tianbo/warehouse/imf/handle/IMFSaveHandle.java
查看文件 @2e9e02c
-package com.tianbo.warehouse.handle;
+package com.tianbo.warehouse.imf.handle;
 import com.tianbo.warehouse.model.T_ETL_MESSAGE;
 import com.tianbo.warehouse.service.T_ETL_MESSAGEService;
--- a/src/main/java/com/tianbo/warehouse/schedul/IMF_Task.java → src/main/java/com/tianbo/warehouse/imf/schedul/IMF_Task.java
查看文件 @2e9e02c
+++ b/src/main/java/com/tianbo/warehouse/schedul/IMF_Task.java → src/main/java/com/tianbo/warehouse/imf/schedul/IMF_Task.java
查看文件 @2e9e02c
-package com.tianbo.warehouse.schedul;
+package com.tianbo.warehouse.imf.schedul;
 import com.caac.imf.api.IMFClient;
 import com.caac.imf.api.IMFClientFactory;
@@ -7,7 +7,6 @@ import com.tianbo.warehouse.imf.IMF_Sender;
 import com.tianbo.warehouse.util.IO.FileTool;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import java.text.SimpleDateFormat;
--- a/src/test/java/com/tianbo/warehouse/handleTest.java
查看文件 @2e9e02c
+++ b/src/test/java/com/tianbo/warehouse/handleTest.java
查看文件 @2e9e02c
 package com.tianbo.warehouse;
-import com.tianbo.warehouse.handle.IMFSaveHandle;
+import com.tianbo.warehouse.imf.handle.IMFSaveHandle;
 public class handleTest {
     private static String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><Msg>    <META>        <SNDR>NDLR</SNDR>        <RCVR></RCVR>        <SEQN>172-33519102</SEQN>        <DDTM>20181229124530224</DDTM>        <TYPE>HYXX</TYPE>        <STYP>NDLR</STYP>    </META>    <DECLAREPREPAREMASTERXMLBODY>        <Head>            <MessageID>CN_MT2201_1P0_460470678920X_20181229124530224</MessageID>            <FunctionCode>9</FunctionCode>            <MessageType>MT2201MASTER</MessageType>            <SenderID>460470678920X_DXPENT0000460002_20181229124530224</SenderID>            <ReceiverID>4604_20181229124530224</ReceiverID>            <SendTime>20181229124530224</SendTime>            <Version>1.0</Version>        </Head>        <Declaration>            <Carrier>                <ID>CV</ID>            </Carrier>            <ORG>                <ID>CGO</ID>            </ORG>            <DES>                <ID>CDG</ID>            </DES>            <BorderTransportMeans>                <JourneyID>9732/2019-01-01</JourneyID>            </BorderTransportMeans>            <Consignment>                <TransportContractDocument>                    <ID>172-33519102</ID>                </TransportContractDocument>                <LoadingLocation>                    <ID>CGO/4604</ID>                    <LoadingDate>2018-12-29 12:45</LoadingDate>                </LoadingLocation>                <UnloadingLocation>                    <ID>CGO/4604</ID>                </UnloadingLocation>                <TransportSplitIndicator>0</TransportSplitIndicator>                <ConsignmentPackaging>                    <QuantityQuantity>337</QuantityQuantity>                </ConsignmentPackaging>                <TotalGrossMassMeasure>3192</TotalGrossMassMeasure>                <PreQuantityQuantity>337</PreQuantityQuantity>                <PreTotalGrossMassMeasure>3192</PreTotalGrossMassMeasure>                <CustomsStatus>001</CustomsStatus>                <FreightPayment>                    <MethodCode>PP</MethodCode>                </FreightPayment>                <ProductName>IMITATION JEWELRY</ProductName>                <PrepareTime>2018-12-29 12:45</PrepareTime>                <CustomsCode>4604</CustomsCode>                <AgentName>ZRP</AgentName>                <AgentCompany>郑州睿鹏物流有限公司</AgentCompany>                <NameOfgoods>IMITATION JEWELRY</NameOfgoods>                <DeliveryStation>001</DeliveryStation>                <UNnumber></UNnumber>                <Category></Category>                <Consignee>                    <Name>QUALITAIR  SEA INTERNATIONAL</Name>                    <Address>                        <Line>4  RUE DU MEUNIER BP  19622 95724   ROISSY  CDG</Line>                        <CityName>CDG</CityName>                        <CountryCode>FR</CountryCode>                        <ZipCode></ZipCode>                        <PROVINCECODE></PROVINCECODE>                        <PROVINCENAME></PROVINCENAME>                        <Deltaname></Deltaname>                        <TelePhone>33 1 34 38 58 13</TelePhone>                        <Fax></Fax>                        <CNECUSID>EUROPEAN VAT NUMBER+FR93392293635</CNECUSID>                        <CNEAEO></CNEAEO>                        <Unlodingcode>CDG</Unlodingcode>                    </Address>                </Consignee>                <Consignor>                    <name>ON TIME EXPRESS LIMITED</name>                    <Address>                        <Line>ROOM 1102 FINANCIAL STREET HAI LUN CENTER NO 440 HAI LUN ROAD</Line>                        <CountryCode>CN</CountryCode>                        <ZipCode></ZipCode>                        <Deltaname></Deltaname>                        <TelePhone>862163642582</TelePhone>                        <Fax></Fax>                        <SHPAEO></SHPAEO>                        <SHPCUSID>USCI+91310000717852489D</SHPCUSID>                    </Address>                </Consignor>            </Consignment>        </Declaration>    </DECLAREPREPAREMASTERXMLBODY></Msg>";