朱兆平 / agent · 提交

转到一个项目

作者 Kevin
提交 1ed279b17841246d8e8bc9ce27363c400204ea4b 1 个父辈 1b0489ab

修改预配界面的相关bug，添加sli和fhl的报文生成和发送功能。

内嵌 并排对比
正在显示 41 个修改的文件 包含 2528 行增加 和 1502 行删除

要显示太多修改。
重新载入完整差异 差异文件 邮件补丁

为保证性能只显示 41 of 41+ 个文件。

不能预览此文件类型
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<classpath>
  3 + <classpathentry kind="src" output="target/classes" path="src/main/java">
  4 + <attributes>
  5 + <attribute name="optional" value="true"/>
  6 + <attribute name="maven.pomderived" value="true"/>
  7 + </attributes>
  8 + </classpathentry>
  9 + <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
  10 + <attributes>
  11 + <attribute name="maven.pomderived" value="true"/>
  12 + </attributes>
  13 + </classpathentry>
  14 + <classpathentry kind="src" output="target/test-classes" path="src/test/java">
  15 + <attributes>
  16 + <attribute name="optional" value="true"/>
  17 + <attribute name="maven.pomderived" value="true"/>
  18 + </attributes>
  19 + </classpathentry>
  20 + <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
  21 + <attributes>
  22 + <attribute name="maven.pomderived" value="true"/>
  23 + </attributes>
  24 + </classpathentry>
  25 + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
  26 + <attributes>
  27 + <attribute name="module" value="true"/>
  28 + <attribute name="maven.pomderived" value="true"/>
  29 + </attributes>
  30 + </classpathentry>
  31 + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
  32 + <attributes>
  33 + <attribute name="maven.pomderived" value="true"/>
  34 + <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
  35 + </attributes>
  36 + </classpathentry>
  37 + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
  38 + <classpathentry kind="output" path="target/classes"/>
  39 +</classpath>
  1 +/target/
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<projectDescription>
  3 + <name>agent</name>
  4 + <comment></comment>
  5 + <projects>
  6 + </projects>
  7 + <buildSpec>
  8 + <buildCommand>
  9 + <name>org.eclipse.jdt.core.javabuilder</name>
  10 + <arguments>
  11 + </arguments>
  12 + </buildCommand>
  13 + <buildCommand>
  14 + <name>org.eclipse.wst.common.project.facet.core.builder</name>
  15 + <arguments>
  16 + </arguments>
  17 + </buildCommand>
  18 + <buildCommand>
  19 + <name>org.eclipse.wst.validation.validationbuilder</name>
  20 + <arguments>
  21 + </arguments>
  22 + </buildCommand>
  23 + <buildCommand>
  24 + <name>org.eclipse.m2e.core.maven2Builder</name>
  25 + <arguments>
  26 + </arguments>
  27 + </buildCommand>
  28 + </buildSpec>
  29 + <natures>
  30 + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
  31 + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
  32 + <nature>org.eclipse.jdt.core.javanature</nature>
  33 + <nature>org.eclipse.m2e.core.maven2Nature</nature>
  34 + <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
  35 + <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
  36 + </natures>
  37 +</projectDescription>
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<classpath>
  3 + <classpathentry excluding="**/bower_components/*|**/node_modules/*|**/*.min.js" kind="src" path="src/main/webapp"/>
  4 + <classpathentry kind="src" path="target/m2e-wtp/web-resources"/>
  5 + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
  6 + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
  7 + <attributes>
  8 + <attribute name="hide" value="true"/>
  9 + </attributes>
  10 + </classpathentry>
  11 + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
  12 + <classpathentry kind="output" path=""/>
  13 +</classpath>
  1 +eclipse.preferences.version=1
  2 +encoding//src/main/java=UTF-8
  3 +encoding//src/main/resources=UTF-8
  4 +encoding//src/test/java=UTF-8
  5 +encoding//src/test/resources=UTF-8
  6 +encoding/<project>=UTF-8
  1 +eclipse.preferences.version=1
  2 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
  3 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
  4 +org.eclipse.jdt.core.compiler.compliance=1.7
  5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
  6 +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
  7 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
  8 +org.eclipse.jdt.core.compiler.source=1.7
  1 +activeProfiles=
  2 +eclipse.preferences.version=1
  3 +resolveWorkspaceProjects=true
  4 +version=1
  1 +<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
  2 + <wb-module deploy-name="ROOT">
  3 + <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
  4 + <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
  5 + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
  6 + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
  7 + <property name="context-root" value="ROOT"/>
  8 + <property name="java-output-path" value="/agent/target/classes"/>
  9 + </wb-module>
  10 +</project-modules>
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<faceted-project>
  3 + <fixed facet="wst.jsdt.web"/>
  4 + <installed facet="java" version="1.7"/>
  5 + <installed facet="jst.web" version="3.0"/>
  6 + <installed facet="wst.jsdt.web" version="1.0"/>
  7 +</faceted-project>
  1 +org.eclipse.wst.jsdt.launching.baseBrowserLibrary
  1 +disabled=06target
  2 +eclipse.preferences.version=1
1 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">  
2 - <modelVersion>4.0.0</modelVersion>  
3 - <groupId>com.airport</groupId>  
4 - <artifactId>agent</artifactId>  
5 - <version>0.0.1-SNAPSHOT</version>  
6 - <url>http://maven.apache.org</url>  
7 - <packaging>war</packaging>  
8 - <!-- 设定除中央仓库 (repo1.maven.org/maven2/)外的其他仓库,按设定顺序进行查询，如有Nexus私服, 取消注释并指向正确的服务器地址 -->  
9 - <repositories> 1 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  2 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  3 + <modelVersion>4.0.0</modelVersion>
  4 + <groupId>com.airport</groupId>
  5 + <artifactId>agent</artifactId>
  6 + <version>0.0.1-SNAPSHOT</version>
  7 + <url>http://maven.apache.org</url>
  8 + <packaging>war</packaging>
  9 + <!-- 设定除中央仓库 (repo1.maven.org/maven2/)外的其他仓库,按设定顺序进行查询，如有Nexus私服, 取消注释并指向正确的服务器地址 -->
  10 + <!-- <repositories>
10 <repository> 11 <repository>
11 <id>public</id> 12 <id>public</id>
12 - <name>Public Repositories</name>  
13 - <url>http://maven.aliyun.com/nexus/content/groups/public</url> 13 + <name>Public Repositories</name>
  14 + <url>http://maven.aliyun.com/nexus/content/groups/public</url>
14 15
15 </repository> 16 </repository>
16 - </repositories>  
17 -  
18 - <!-- 主要依赖库版本定义 -->  
19 - <properties>  
20 - <servlet.version>3.0.1</servlet.version>  
21 - <jstl.version>1.2</jstl.version>  
22 - <jetty.version>6.1.10</jetty.version>  
23 - <junit.version>4.12</junit.version>  
24 - <spring.version>4.2.4.RELEASE</spring.version>  
25 - <spring-datajpa.version>1.9.2.RELEASE</spring-datajpa.version>  
26 - <hibernate.version>5.0.6.Final</hibernate.version>  
27 - <guava.version>19.0</guava.version>  
28 - <mysql-jdbc.version>5.1.38</mysql-jdbc.version>  
29 - <druid.version>1.0.16</druid.version>  
30 - <ehcache.version>2.6.8</ehcache.version>  
31 - <slf4j.version>1.7.13</slf4j.version>  
32 - <log4j.version>2.5</log4j.version>  
33 - <jackson.version>2.6.4</jackson.version>  
34 - <commons-lang3.version>3.4</commons-lang3.version>  
35 - <commons-fileupload.version>1.3.1</commons-fileupload.version>  
36 - <commons-codec.version>1.10</commons-codec.version>  
37 - <shiro.version>1.2.3</shiro.version>  
38 - <cxf.version>2.7.5</cxf.version>  
39 - <patchca.version>0.5.0</patchca.version>  
40 - <jxl.version>2.6.12</jxl.version>  
41 - <poi.version>3.14</poi.version>  
42 - <velocity.version>1.7</velocity.version>  
43 -  
44 - <!-- Plugin的属性定义 --> 17 + </repositories> -->
  18 +
  19 + <!-- 主要依赖库版本定义 -->
  20 + <properties>
  21 + <servlet.version>3.0.1</servlet.version>
  22 + <jstl.version>1.2</jstl.version>
  23 + <jetty.version>6.1.10</jetty.version>
  24 + <junit.version>4.12</junit.version>
  25 + <spring.version>4.2.4.RELEASE</spring.version>
  26 + <spring-datajpa.version>1.9.2.RELEASE</spring-datajpa.version>
  27 + <hibernate.version>5.0.6.Final</hibernate.version>
  28 + <guava.version>19.0</guava.version>
  29 + <mysql-jdbc.version>5.1.38</mysql-jdbc.version>
  30 + <druid.version>1.0.16</druid.version>
  31 + <ehcache.version>2.6.8</ehcache.version>
  32 + <slf4j.version>1.7.13</slf4j.version>
  33 + <log4j.version>2.5</log4j.version>
  34 + <jackson.version>2.6.4</jackson.version>
  35 + <commons-lang3.version>3.4</commons-lang3.version>
  36 + <commons-fileupload.version>1.3.1</commons-fileupload.version>
  37 + <commons-codec.version>1.10</commons-codec.version>
  38 + <shiro.version>1.2.3</shiro.version>
  39 + <cxf.version>2.7.5</cxf.version>
  40 + <patchca.version>0.5.0</patchca.version>
  41 + <jxl.version>2.6.12</jxl.version>
  42 + <poi.version>3.14</poi.version>
  43 + <velocity.version>1.7</velocity.version>
  44 +
  45 + <!-- Plugin的属性定义 -->
45 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 46 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
46 <jdk.version>1.7</jdk.version> 47 <jdk.version>1.7</jdk.version>
47 - </properties>  
48 -  
49 -  
50 -  
51 - <dependencies>  
52 -  
53 - <!-- Apache CXF -->  
54 - <dependency>  
55 - <groupId>org.apache.cxf</groupId>  
56 - <artifactId>cxf-rt-frontend-jaxws</artifactId>  
57 - <version>${cxf.version}</version>  
58 - </dependency>  
59 - <dependency>  
60 - <groupId>org.apache.cxf</groupId>  
61 - <artifactId>cxf-rt-transports-http</artifactId>  
62 - <version>${cxf.version}</version>  
63 - </dependency>  
64 - <dependency>  
65 - <groupId>org.apache.cxf</groupId>  
66 - <artifactId>cxf-rt-ws-security</artifactId>  
67 - <version>${cxf.version}</version>  
68 - </dependency>  
69 -  
70 - <!-- Servlet Runtime -->  
71 - <dependency> 48 + </properties>
  49 +
  50 +
  51 +
  52 + <dependencies>
  53 +
  54 + <!-- Apache CXF -->
  55 + <dependency>
  56 + <groupId>org.apache.cxf</groupId>
  57 + <artifactId>cxf-rt-frontend-jaxws</artifactId>
  58 + <version>${cxf.version}</version>
  59 + </dependency>
  60 + <dependency>
  61 + <groupId>org.apache.cxf</groupId>
  62 + <artifactId>cxf-rt-transports-http</artifactId>
  63 + <version>${cxf.version}</version>
  64 + </dependency>
  65 + <dependency>
  66 + <groupId>org.apache.cxf</groupId>
  67 + <artifactId>cxf-rt-ws-security</artifactId>
  68 + <version>${cxf.version}</version>
  69 + </dependency>
  70 +
  71 + <!-- Servlet Runtime -->
  72 + <dependency>
72 <groupId>javax.servlet</groupId> 73 <groupId>javax.servlet</groupId>
73 <artifactId>javax.servlet-api</artifactId> 74 <artifactId>javax.servlet-api</artifactId>
74 <version>${servlet.version}</version> 75 <version>${servlet.version}</version>
75 <scope>provided</scope> 76 <scope>provided</scope>
76 </dependency> 77 </dependency>
77 - 78 +
78 <dependency> 79 <dependency>
79 <groupId>javax.transaction</groupId> 80 <groupId>javax.transaction</groupId>
80 <artifactId>jta</artifactId> 81 <artifactId>jta</artifactId>
81 <version>1.1</version> 82 <version>1.1</version>
82 </dependency> 83 </dependency>
83 - 84 +
84 <dependency> 85 <dependency>
85 <groupId>jstl</groupId> 86 <groupId>jstl</groupId>
86 <artifactId>jstl</artifactId> 87 <artifactId>jstl</artifactId>
87 <version>${jstl.version}</version> 88 <version>${jstl.version}</version>
88 </dependency> 89 </dependency>
89 - 90 +
90 <dependency> 91 <dependency>
91 - <groupId>com.alibaba</groupId>  
92 - <artifactId>fastjson</artifactId>  
93 - <version>1.2.16</version> 92 + <groupId>com.alibaba</groupId>
  93 + <artifactId>fastjson</artifactId>
  94 + <version>1.2.16</version>
94 </dependency> 95 </dependency>
95 -  
96 - <!--<dependency>-->  
97 - <!--<groupId>org.apache</groupId>-->  
98 - <!--<artifactId>ant-zip</artifactId>-->  
99 - <!--<version>4.0</version>-->  
100 - <!--</dependency>-->  
101 -  
102 - <!-- junit --> 96 +
  97 + <!-- https://mvnrepository.com/artifact/org.jdom/jdom -->
  98 + <dependency>
  99 + <groupId>org.jdom</groupId>
  100 + <artifactId>jdom</artifactId>
  101 + <version>1.1.3</version>
  102 + </dependency>
  103 +
  104 + <!-- junit -->
103 <dependency> 105 <dependency>
104 <groupId>junit</groupId> 106 <groupId>junit</groupId>
105 <artifactId>junit</artifactId> 107 <artifactId>junit</artifactId>
106 <version>${junit.version}</version> 108 <version>${junit.version}</version>
107 </dependency> 109 </dependency>
108 - 110 +
109 <!-- commons-codec --> 111 <!-- commons-codec -->
110 <dependency> 112 <dependency>
111 <groupId>commons-codec</groupId> 113 <groupId>commons-codec</groupId>
112 <artifactId>commons-codec</artifactId> 114 <artifactId>commons-codec</artifactId>
113 <version>${commons-codec.version}</version> 115 <version>${commons-codec.version}</version>
114 </dependency> 116 </dependency>
115 - 117 +
116 <!-- guava --> 118 <!-- guava -->
117 <dependency> 119 <dependency>
118 <groupId>com.google.guava</groupId> 120 <groupId>com.google.guava</groupId>
119 <artifactId>guava</artifactId> 121 <artifactId>guava</artifactId>
120 <version>${guava.version}</version> 122 <version>${guava.version}</version>
121 </dependency> 123 </dependency>
122 - 124 +
123 <!-- log --> 125 <!-- log -->
124 <dependency> 126 <dependency>
125 <groupId>org.slf4j</groupId> 127 <groupId>org.slf4j</groupId>
126 <artifactId>slf4j-api</artifactId> 128 <artifactId>slf4j-api</artifactId>
127 <version>${slf4j.version}</version> 129 <version>${slf4j.version}</version>
128 </dependency> 130 </dependency>
129 -  
130 - <dependency>  
131 - <groupId>org.apache.logging.log4j</groupId>  
132 - <artifactId>log4j-api</artifactId>  
133 - <version>${log4j.version}</version>  
134 - </dependency>  
135 -  
136 - <dependency>  
137 - <groupId>org.apache.logging.log4j</groupId>  
138 - <artifactId>log4j-core</artifactId>  
139 - <version>${log4j.version}</version>  
140 - </dependency>  
141 -  
142 - <dependency>  
143 - <groupId>org.apache.logging.log4j</groupId>  
144 - <artifactId>log4j-slf4j-impl</artifactId>  
145 - <version>${log4j.version}</version>  
146 - </dependency>  
147 -  
148 -  
149 -  
150 -  
151 - <!-- spring framework -->  
152 - <dependency>  
153 - <groupId>org.springframework</groupId>  
154 - <artifactId>spring-context</artifactId>  
155 - <version>${spring.version}</version>  
156 - </dependency>  
157 -  
158 - <dependency>  
159 - <groupId>org.springframework</groupId>  
160 - <artifactId>spring-context-support</artifactId>  
161 - <version>${spring.version}</version>  
162 - </dependency>  
163 -  
164 - <dependency> 131 +
  132 + <dependency>
  133 + <groupId>org.apache.logging.log4j</groupId>
  134 + <artifactId>log4j-api</artifactId>
  135 + <version>${log4j.version}</version>
  136 + </dependency>
  137 +
  138 + <dependency>
  139 + <groupId>org.apache.logging.log4j</groupId>
  140 + <artifactId>log4j-core</artifactId>
  141 + <version>${log4j.version}</version>
  142 + </dependency>
  143 +
  144 + <dependency>
  145 + <groupId>org.apache.logging.log4j</groupId>
  146 + <artifactId>log4j-slf4j-impl</artifactId>
  147 + <version>${log4j.version}</version>
  148 + </dependency>
  149 +
  150 + <dependency>
  151 + <groupId>javax.annotation</groupId>
  152 + <artifactId>jsr250-api</artifactId>
  153 + <version>1.0</version>
  154 + </dependency>
  155 +
  156 +
  157 + <!-- spring framework -->
  158 + <dependency>
  159 + <groupId>org.springframework</groupId>
  160 + <artifactId>spring-context</artifactId>
  161 + <version>${spring.version}</version>
  162 + </dependency>
  163 +
  164 + <dependency>
  165 + <groupId>org.springframework</groupId>
  166 + <artifactId>spring-context-support</artifactId>
  167 + <version>${spring.version}</version>
  168 + </dependency>
  169 +
  170 + <dependency>
165 <groupId>org.springframework</groupId> 171 <groupId>org.springframework</groupId>
166 <artifactId>spring-aop</artifactId> 172 <artifactId>spring-aop</artifactId>
167 <version>${spring.version}</version> 173 <version>${spring.version}</version>
168 </dependency> 174 </dependency>
169 -  
170 - <dependency> 175 +
  176 + <dependency>
171 <groupId>org.springframework</groupId> 177 <groupId>org.springframework</groupId>
172 <artifactId>spring-aspects</artifactId> 178 <artifactId>spring-aspects</artifactId>
173 <version>${spring.version}</version> 179 <version>${spring.version}</version>
174 </dependency> 180 </dependency>
175 -  
176 - <dependency>  
177 - <groupId>org.springframework</groupId>  
178 - <artifactId>spring-tx</artifactId>  
179 - <version>${spring.version}</version>  
180 - </dependency>  
181 - <!-- spring webmvc -->  
182 - <dependency>  
183 - <groupId>org.springframework</groupId>  
184 - <artifactId>spring-web</artifactId>  
185 - <version>${spring.version}</version>  
186 - </dependency>  
187 -  
188 - <dependency>  
189 - <groupId>org.springframework</groupId>  
190 - <artifactId>spring-webmvc</artifactId>  
191 - <version>${spring.version}</version>  
192 - </dependency>  
193 -  
194 - <dependency>  
195 - <groupId>commons-httpclient</groupId>  
196 - <artifactId>commons-httpclient</artifactId>  
197 - <version>3.0</version>  
198 - </dependency>  
199 - <!-- spring data jpa -->  
200 - <dependency>  
201 - <groupId>org.springframework.data</groupId>  
202 - <artifactId>spring-data-jpa</artifactId>  
203 - <version>${spring-datajpa.version}</version>  
204 - </dependency>  
205 -  
206 - <!-- spring test -->  
207 - <dependency>  
208 - <groupId>org.springframework</groupId>  
209 - <artifactId>spring-test</artifactId>  
210 - <version>${spring.version}</version>  
211 - <scope>test</scope>  
212 - </dependency>  
213 -  
214 - <!-- jpa implements hibernate -->  
215 - <dependency> 181 +
  182 + <dependency>
  183 + <groupId>org.springframework</groupId>
  184 + <artifactId>spring-tx</artifactId>
  185 + <version>${spring.version}</version>
  186 + </dependency>
  187 + <!-- spring webmvc -->
  188 + <dependency>
  189 + <groupId>org.springframework</groupId>
  190 + <artifactId>spring-web</artifactId>
  191 + <version>${spring.version}</version>
  192 + </dependency>
  193 +
  194 + <dependency>
  195 + <groupId>org.springframework</groupId>
  196 + <artifactId>spring-webmvc</artifactId>
  197 + <version>${spring.version}</version>
  198 + </dependency>
  199 +
  200 + <dependency>
  201 + <groupId>commons-httpclient</groupId>
  202 + <artifactId>commons-httpclient</artifactId>
  203 + <version>3.0</version>
  204 + </dependency>
  205 + <!-- spring data jpa -->
  206 + <dependency>
  207 + <groupId>org.springframework.data</groupId>
  208 + <artifactId>spring-data-jpa</artifactId>
  209 + <version>${spring-datajpa.version}</version>
  210 + </dependency>
  211 +
  212 + <!-- spring test -->
  213 + <dependency>
  214 + <groupId>org.springframework</groupId>
  215 + <artifactId>spring-test</artifactId>
  216 + <version>${spring.version}</version>
  217 + <scope>test</scope>
  218 + </dependency>
  219 +
  220 + <!-- jpa implements hibernate -->
  221 + <dependency>
216 <groupId>org.hibernate</groupId> 222 <groupId>org.hibernate</groupId>
217 <artifactId>hibernate-core</artifactId> 223 <artifactId>hibernate-core</artifactId>
218 <version>${hibernate.version}</version> 224 <version>${hibernate.version}</version>
219 </dependency> 225 </dependency>
220 - 226 +
221 <dependency> 227 <dependency>
222 <groupId>org.hibernate</groupId> 228 <groupId>org.hibernate</groupId>
223 <artifactId>hibernate-entitymanager</artifactId> 229 <artifactId>hibernate-entitymanager</artifactId>
224 <version>${hibernate.version}</version> 230 <version>${hibernate.version}</version>
225 </dependency> 231 </dependency>
226 - 232 +
227 <dependency> 233 <dependency>
228 <groupId>org.hibernate</groupId> 234 <groupId>org.hibernate</groupId>
229 <artifactId>hibernate-ehcache</artifactId> 235 <artifactId>hibernate-ehcache</artifactId>
230 <version>${hibernate.version}</version> 236 <version>${hibernate.version}</version>
231 </dependency> 237 </dependency>
232 - 238 +
233 <!-- mysql-connector --> 239 <!-- mysql-connector -->
234 <dependency> 240 <dependency>
235 <groupId>mysql</groupId> 241 <groupId>mysql</groupId>
236 <artifactId>mysql-connector-java</artifactId> 242 <artifactId>mysql-connector-java</artifactId>
237 <version>${mysql-jdbc.version}</version> 243 <version>${mysql-jdbc.version}</version>
238 </dependency> 244 </dependency>
239 -  
240 -  
241 - <!-- druid connection pool -->  
242 - <dependency> 245 +
  246 +
  247 + <!-- druid connection pool -->
  248 + <dependency>
243 <groupId>com.alibaba</groupId> 249 <groupId>com.alibaba</groupId>
244 <artifactId>druid</artifactId> 250 <artifactId>druid</artifactId>
245 <version>${druid.version}</version> 251 <version>${druid.version}</version>
246 </dependency> 252 </dependency>
247 -  
248 - <!-- jackson -->  
249 - <dependency> 253 +
  254 + <!-- jackson -->
  255 + <dependency>
250 <groupId>com.fasterxml.jackson.core</groupId> 256 <groupId>com.fasterxml.jackson.core</groupId>
251 <artifactId>jackson-databind</artifactId> 257 <artifactId>jackson-databind</artifactId>
252 <version>${jackson.version}</version> 258 <version>${jackson.version}</version>
@@ -262,43 +268,43 @@ @@ -262,43 +268,43 @@
262 <version>${jackson.version}</version> 268 <version>${jackson.version}</version>
263 </dependency> 269 </dependency>
264 <dependency> 270 <dependency>
265 - <groupId>org.codehaus.jackson</groupId>  
266 - <artifactId>jackson-mapper-asl</artifactId>  
267 - <version>1.9.13</version> 271 + <groupId>org.codehaus.jackson</groupId>
  272 + <artifactId>jackson-mapper-asl</artifactId>
  273 + <version>1.9.13</version>
268 </dependency> 274 </dependency>
269 -  
270 - <!-- commons --> 275 +
  276 + <!-- commons -->
271 <dependency> 277 <dependency>
272 <groupId>org.apache.commons</groupId> 278 <groupId>org.apache.commons</groupId>
273 <artifactId>commons-lang3</artifactId> 279 <artifactId>commons-lang3</artifactId>
274 - <version>${commons-lang3.version}</version> 280 + <version>${commons-lang3.version}</version>
275 </dependency> 281 </dependency>
276 - 282 +
277 <dependency> 283 <dependency>
278 <groupId>commons-fileupload</groupId> 284 <groupId>commons-fileupload</groupId>
279 <artifactId>commons-fileupload</artifactId> 285 <artifactId>commons-fileupload</artifactId>
280 <version>${commons-fileupload.version}</version> 286 <version>${commons-fileupload.version}</version>
281 </dependency> 287 </dependency>
282 -  
283 - 288 +
  289 +
284 <!-- ehcache --> 290 <!-- ehcache -->
285 <dependency> 291 <dependency>
286 <groupId>net.sf.ehcache</groupId> 292 <groupId>net.sf.ehcache</groupId>
287 - <artifactId>ehcache-core</artifactId> 293 + <artifactId>ehcache-core</artifactId>
288 <version>${ehcache.version}</version> 294 <version>${ehcache.version}</version>
289 </dependency> 295 </dependency>
290 - 296 +
291 <!-- shiro --> 297 <!-- shiro -->
292 - <dependency>  
293 - <groupId>org.apache.shiro</groupId>  
294 - <artifactId>shiro-core</artifactId>  
295 - <version>${shiro.version}</version>  
296 - </dependency>  
297 - <dependency>  
298 - <groupId>org.apache.shiro</groupId>  
299 - <artifactId>shiro-web</artifactId>  
300 - <version>${shiro.version}</version>  
301 - </dependency> 298 + <dependency>
  299 + <groupId>org.apache.shiro</groupId>
  300 + <artifactId>shiro-core</artifactId>
  301 + <version>${shiro.version}</version>
  302 + </dependency>
  303 + <dependency>
  304 + <groupId>org.apache.shiro</groupId>
  305 + <artifactId>shiro-web</artifactId>
  306 + <version>${shiro.version}</version>
  307 + </dependency>
302 <dependency> 308 <dependency>
303 <groupId>org.apache.shiro</groupId> 309 <groupId>org.apache.shiro</groupId>
304 <artifactId>shiro-spring</artifactId> 310 <artifactId>shiro-spring</artifactId>
@@ -310,183 +316,168 @@ @@ -310,183 +316,168 @@
310 <version>${shiro.version}</version> 316 <version>${shiro.version}</version>
311 </dependency> 317 </dependency>
312 <dependency> 318 <dependency>
313 - <groupId>org.apache.shiro</groupId>  
314 - <artifactId>shiro-quartz</artifactId>  
315 - <version>${shiro.version}</version>  
316 - </dependency>  
317 -  
318 - <!-- shiro cas 单点登录 -->  
319 - <dependency>  
320 - <groupId>org.apache.shiro</groupId>  
321 - <artifactId>shiro-cas</artifactId>  
322 - <version>1.2.3</version>  
323 - </dependency>  
324 -  
325 - <!-- 验证码 -->  
326 - <dependency>  
327 - <groupId>net.pusuo</groupId>  
328 - <artifactId>patchca</artifactId>  
329 - <version>${patchca.version}</version>  
330 - </dependency>  
331 - 319 + <groupId>org.apache.shiro</groupId>
  320 + <artifactId>shiro-quartz</artifactId>
  321 + <version>${shiro.version}</version>
  322 + </dependency>
  323 +
  324 + <!-- shiro cas 单点登录 -->
  325 + <dependency>
  326 + <groupId>org.apache.shiro</groupId>
  327 + <artifactId>shiro-cas</artifactId>
  328 + <version>1.2.3</version>
  329 + </dependency>
  330 +
  331 + <!-- 验证码 -->
  332 + <dependency>
  333 + <groupId>net.pusuo</groupId>
  334 + <artifactId>patchca</artifactId>
  335 + <version>${patchca.version}</version>
  336 + </dependency>
  337 +
332 <!-- oracle jdbc 驱动 --> 338 <!-- oracle jdbc 驱动 -->
333 - <dependency>  
334 - <groupId>com.oracle</groupId>  
335 - <artifactId>ojdbc6</artifactId>  
336 - <version>11.2.0.4.0-atlassian-hosted</version>  
337 - </dependency>  
338 -  
339 - <dependency>  
340 - <groupId>net.sourceforge.jexcelapi</groupId>  
341 - <artifactId>jxl</artifactId>  
342 - <version>${jxl.version}</version>  
343 - </dependency>  
344 -  
345 - <dependency>  
346 - <groupId>org.apache.poi</groupId>  
347 - <artifactId>poi</artifactId>  
348 - <version>${poi.version}</version>  
349 - </dependency>  
350 -  
351 - <!-- https://mvnrepository.com/artifact/javax.mail/mail -->  
352 - <dependency>  
353 - <groupId>javax.mail</groupId>  
354 - <artifactId>mail</artifactId>  
355 - <version>1.4</version>  
356 - </dependency>  
357 -  
358 - <!-- https://mvnrepository.com/artifact/javax.activation/activation -->  
359 - <dependency>  
360 - <groupId>javax.activation</groupId>  
361 - <artifactId>activation</artifactId>  
362 - <version>1.1</version>  
363 - </dependency>  
364 - <!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->  
365 - <dependency>  
366 - <groupId>org.apache.poi</groupId>  
367 - <artifactId>poi-ooxml</artifactId>  
368 - <version>3.14</version>  
369 - </dependency>  
370 -  
371 - <dependency>  
372 - <groupId>commons-collections</groupId>  
373 - <artifactId>commons-collections</artifactId>  
374 - <version>3.2.1</version>  
375 - </dependency>  
376 -  
377 - <!-- velocity 模板 -->  
378 - <dependency>  
379 - <groupId>org.apache.velocity</groupId>  
380 - <artifactId>velocity</artifactId>  
381 - <version>${velocity.version}</version>  
382 - </dependency>  
383 -  
384 - <dependency>  
385 - <groupId>org.apache.velocity</groupId>  
386 - <artifactId>velocity-tools</artifactId>  
387 - <version>2.0</version>  
388 - <exclusions>  
389 - <exclusion>  
390 - <groupId>javax.servlet</groupId>  
391 - <artifactId>servlet-api</artifactId>  
392 - </exclusion>  
393 - </exclusions>  
394 - </dependency>  
395 - <!-- https://mvnrepository.com/artifact/org.apache.cxf/cxf-rt-frontend-jaxws -->  
396 - <dependency>  
397 - <groupId>org.apache.cxf</groupId>  
398 - <artifactId>cxf-rt-frontend-jaxws</artifactId>  
399 - <version>2.7.11</version>  
400 - </dependency>  
401 -  
402 - <dependency>  
403 - <groupId>redis.clients</groupId>  
404 - <artifactId>jedis</artifactId>  
405 - <version>2.1.0</version>  
406 - </dependency>  
407 -  
408 - </dependencies>  
409 -  
410 - <!-- 配置文件 -->  
411 - <profiles>  
412 - <!-- 本地开发环境 -->  
413 - <profile>  
414 - <id>dev</id>  
415 - <properties>  
416 - <package.environment>dev</package.environment>  
417 - </properties>  
418 - <activation>  
419 - <activeByDefault>true</activeByDefault>  
420 - </activation>  
421 - </profile>  
422 -  
423 - <!-- 测试环境 -->  
424 - <profile>  
425 - <id>test</id>  
426 - <properties>  
427 - <package.environment>test</package.environment>  
428 - </properties>  
429 - </profile>  
430 -  
431 - <!-- 生产环境 -->  
432 - <profile>  
433 - <id>product</id>  
434 - <properties>  
435 - <package.environment>product</package.environment>  
436 - </properties>  
437 - </profile>  
438 - </profiles>  
439 -  
440 - <build>  
441 - <finalName>ROOT</finalName>  
442 - <plugins>  
443 - <!-- 编译插件 -->  
444 - <plugin>  
445 - <groupId>org.apache.maven.plugins</groupId>  
446 - <artifactId>maven-compiler-plugin</artifactId>  
447 - <version>3.1</version>  
448 - <configuration>  
449 - <encoding>${project.build.sourceEncoding}</encoding>  
450 - <source>${jdk.version}</source>  
451 - <target>${jdk.version}</target>  
452 - </configuration>  
453 - </plugin>  
454 -  
455 - <!-- Jetty 插件配置测试环境 -->  
456 - <plugin>  
457 - <groupId>org.eclipse.jetty</groupId>  
458 - <artifactId>jetty-maven-plugin</artifactId>  
459 - <version>9.2.8.v20150217</version>  
460 - <configuration>  
461 - <httpConnector>  
462 - <port>8081</port>  
463 - </httpConnector>  
464 - <scanIntervalSeconds>0</scanIntervalSeconds>  
465 - </configuration>  
466 - </plugin>  
467 -  
468 - <!-- Maven 打包插件  
469 - <plugin>  
470 - <groupId>org.apache.maven.plugins</groupId>  
471 - <artifactId>maven-war-plugin</artifactId>  
472 - <version>3.1.0</version>  
473 - <configuration>  
474 - <archive>  
475 - <addMavenDescriptor>false</addMavenDescriptor>  
476 - </archive>  
477 - <webResources>  
478 - <resource>  
479 - <directory>src/main/resoreces/conf/${package.environment}</directory>  
480 - <targetPath>WEB-INF/classes</targetPath>  
481 - <filtering>true</filtering>  
482 - </resource>  
483 - </webResources>  
484 - </configuration>  
485 - </plugin>-->  
486 -  
487 - </plugins>  
488 - </build>  
489 - <modules>  
490 - <module>?</module>  
491 - </modules> 339 + <dependency>
  340 + <groupId>com.oracle</groupId>
  341 + <artifactId>ojdbc6</artifactId>
  342 + <version>11.2.0.4.0-atlassian-hosted</version>
  343 + </dependency>
  344 +
  345 + <dependency>
  346 + <groupId>net.sourceforge.jexcelapi</groupId>
  347 + <artifactId>jxl</artifactId>
  348 + <version>${jxl.version}</version>
  349 + </dependency>
  350 +
  351 + <dependency>
  352 + <groupId>org.apache.poi</groupId>
  353 + <artifactId>poi</artifactId>
  354 + <version>${poi.version}</version>
  355 + </dependency>
  356 +
  357 + <!-- https://mvnrepository.com/artifact/javax.mail/mail -->
  358 + <dependency>
  359 + <groupId>javax.mail</groupId>
  360 + <artifactId>mail</artifactId>
  361 + <version>1.4</version>
  362 + </dependency>
  363 +
  364 + <!-- https://mvnrepository.com/artifact/javax.activation/activation -->
  365 + <dependency>
  366 + <groupId>javax.activation</groupId>
  367 + <artifactId>activation</artifactId>
  368 + <version>1.1</version>
  369 + </dependency>
  370 + <!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
  371 + <dependency>
  372 + <groupId>org.apache.poi</groupId>
  373 + <artifactId>poi-ooxml</artifactId>
  374 + <version>3.14</version>
  375 + </dependency>
  376 +
  377 + <dependency>
  378 + <groupId>commons-collections</groupId>
  379 + <artifactId>commons-collections</artifactId>
  380 + <version>3.2.1</version>
  381 + </dependency>
  382 +
  383 + <!-- velocity 模板 -->
  384 + <!-- <dependency>
  385 + <groupId>org.apache.velocity</groupId>
  386 + <artifactId>velocity</artifactId>
  387 + <version>${velocity.version}</version>
  388 + </dependency> -->
  389 +
  390 + <dependency>
  391 + <groupId>org.apache.velocity</groupId>
  392 + <artifactId>velocity-tools</artifactId>
  393 + <version>2.0</version>
  394 + <exclusions>
  395 + <exclusion>
  396 + <groupId>javax.servlet</groupId>
  397 + <artifactId>servlet-api</artifactId>
  398 + </exclusion>
  399 + </exclusions>
  400 + </dependency>
  401 +
  402 + <dependency>
  403 + <groupId>redis.clients</groupId>
  404 + <artifactId>jedis</artifactId>
  405 + <version>2.1.0</version>
  406 + </dependency>
  407 +
  408 + <dependency>
  409 + <groupId>org.apache.ant</groupId>
  410 + <artifactId>ant</artifactId>
  411 + <version>1.9.7</version>
  412 + </dependency>
  413 +
  414 + </dependencies>
  415 +
  416 + <!-- 配置文件 -->
  417 + <profiles>
  418 + <!-- 本地开发环境 -->
  419 + <profile>
  420 + <id>dev</id>
  421 + <properties>
  422 + <package.environment>dev</package.environment>
  423 + </properties>
  424 + <activation>
  425 + <activeByDefault>true</activeByDefault>
  426 + </activation>
  427 + </profile>
  428 +
  429 + <!-- 测试环境 -->
  430 + <profile>
  431 + <id>test</id>
  432 + <properties>
  433 + <package.environment>test</package.environment>
  434 + </properties>
  435 + </profile>
  436 +
  437 + <!-- 生产环境 -->
  438 + <profile>
  439 + <id>product</id>
  440 + <properties>
  441 + <package.environment>product</package.environment>
  442 + </properties>
  443 + </profile>
  444 + </profiles>
  445 +
  446 + <build>
  447 + <finalName>ROOT</finalName>
  448 + <plugins>
  449 + <!-- 编译插件 -->
  450 + <plugin>
  451 + <groupId>org.apache.maven.plugins</groupId>
  452 + <artifactId>maven-compiler-plugin</artifactId>
  453 + <version>3.1</version>
  454 + <configuration>
  455 + <encoding>${project.build.sourceEncoding}</encoding>
  456 + <source>${jdk.version}</source>
  457 + <target>${jdk.version}</target>
  458 + </configuration>
  459 + </plugin>
  460 +
  461 + <!-- Jetty 插件配置测试环境 -->
  462 + <plugin>
  463 + <groupId>org.eclipse.jetty</groupId>
  464 + <artifactId>jetty-maven-plugin</artifactId>
  465 + <version>9.2.8.v20150217</version>
  466 + <configuration>
  467 + <httpConnector>
  468 + <port>8081</port>
  469 + </httpConnector>
  470 + <scanIntervalSeconds>0</scanIntervalSeconds>
  471 + </configuration>
  472 + </plugin>
  473 +
  474 + <!-- Maven 打包插件 <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId>
  475 + <version>3.1.0</version> <configuration> <archive> <addMavenDescriptor>false</addMavenDescriptor>
  476 + </archive> <webResources> <resource> <directory>src/main/resoreces/conf/${package.environment}</directory>
  477 + <targetPath>WEB-INF/classes</targetPath> <filtering>true</filtering> </resource>
  478 + </webResources> </configuration> </plugin> -->
  479 +
  480 + </plugins>
  481 + </build>
  482 + <!-- <modules> <module>?</module> </modules> -->
492 </project> 483 </project>
不能预览此文件类型
不能预览此文件类型
@@ -8,15 +8,25 @@ import java.util.List; @@ -8,15 +8,25 @@ import java.util.List;
8 import javax.annotation.Resource; 8 import javax.annotation.Resource;
9 import javax.servlet.http.HttpServletRequest; 9 import javax.servlet.http.HttpServletRequest;
10 10
11 -import com.agent.entity.agent.BasicAgentEntity; 11 +import org.springframework.stereotype.Controller;
  12 +import org.springframework.ui.Model;
  13 +import org.springframework.web.bind.annotation.RequestMapping;
  14 +import org.springframework.web.bind.annotation.RequestMethod;
  15 +import org.springframework.web.bind.annotation.ResponseBody;
  16 +
  17 +import com.agent.controller.BasicController;
12 import com.agent.entity.agent.BillCheckEntity; 18 import com.agent.entity.agent.BillCheckEntity;
13 import com.agent.entity.agent.MakeHawbEntity; 19 import com.agent.entity.agent.MakeHawbEntity;
14 import com.agent.entity.agent.MakeMawbEntity; 20 import com.agent.entity.agent.MakeMawbEntity;
15 -import com.agent.service.agent.*; 21 +import com.agent.entity.agent.PubStationEntity;
  22 +import com.agent.service.agent.BasicAgentService;
  23 +import com.agent.service.agent.BillCheckService;
  24 +import com.agent.service.agent.MakeHawbService;
  25 +import com.agent.service.agent.MakeMawbService;
  26 +import com.agent.service.agent.PubStationService;
16 import com.agent.util.HttpJsonMsg; 27 import com.agent.util.HttpJsonMsg;
17 import com.agent.vo.ResponseModel; 28 import com.agent.vo.ResponseModel;
18 import com.alibaba.fastjson.JSONObject; 29 import com.alibaba.fastjson.JSONObject;
19 -import com.framework.shiro.SessionUtil;  
20 import com.framework.util.DateFormat; 30 import com.framework.util.DateFormat;
21 31
22 import billcheckservice.BillCheckServiceProxy; 32 import billcheckservice.BillCheckServiceProxy;
@@ -26,19 +36,6 @@ import billcheckservice.ReturnRecode; @@ -26,19 +36,6 @@ import billcheckservice.ReturnRecode;
26 import tools.BillCheckReturnData; 36 import tools.BillCheckReturnData;
27 import tools.DataSerieal; 37 import tools.DataSerieal;
28 38
29 -import org.apache.commons.lang.StringUtils;  
30 -import org.apache.shiro.authz.annotation.RequiresPermissions;  
31 -import org.apache.shiro.authz.annotation.RequiresRoles;  
32 -import org.apache.struts.util.RequestUtils;  
33 -import org.springframework.stereotype.Controller;  
34 -import org.springframework.ui.Model;  
35 -import org.springframework.web.bind.annotation.RequestMapping;  
36 -  
37 -import com.agent.controller.BasicController;  
38 -import com.agent.entity.agent.PubStationEntity;  
39 -import org.springframework.web.bind.annotation.RequestMethod;  
40 -import org.springframework.web.bind.annotation.ResponseBody;  
41 -  
42 /** 39 /**
43 * 账单核审 40 * 账单核审
44 * @author 61004 41 * @author 61004
1 package com.agent.controller.agent; 1 package com.agent.controller.agent;
2 2
  3 +import java.io.IOException;
  4 +import java.text.ParseException;
  5 +import java.util.ArrayList;
  6 +import java.util.Date;
  7 +import java.util.List;
  8 +import java.util.Map;
  9 +
  10 +import javax.annotation.Resource;
  11 +import javax.servlet.http.HttpServletRequest;
  12 +import javax.servlet.http.HttpServletResponse;
  13 +
  14 +import org.apache.commons.collections.CollectionUtils;
  15 +import org.apache.commons.lang.StringUtils;
  16 +import org.slf4j.Logger;
  17 +import org.slf4j.LoggerFactory;
  18 +import org.springframework.stereotype.Controller;
  19 +import org.springframework.ui.Model;
  20 +import org.springframework.web.bind.annotation.RequestMapping;
  21 +import org.springframework.web.bind.annotation.RequestMethod;
  22 +import org.springframework.web.bind.annotation.ResponseBody;
  23 +import org.springframework.web.servlet.ModelAndView;
  24 +
3 import com.agent.controller.BasicController; 25 import com.agent.controller.BasicController;
4 import com.agent.entity.Constant; 26 import com.agent.entity.Constant;
5 -import com.agent.entity.agent.*;  
6 -import com.agent.entity.system.UserEntity;  
7 -import com.agent.service.agent.*; 27 +import com.agent.entity.agent.BasicAgentEntity;
  28 +import com.agent.entity.agent.ConsigneeEntity;
  29 +import com.agent.entity.agent.DeliveryInfoEntity;
  30 +import com.agent.entity.agent.HawbOtherFeeEntity;
  31 +import com.agent.entity.agent.MakeHawbEntity;
  32 +import com.agent.entity.agent.MakeMawbEntity;
  33 +import com.agent.entity.agent.MawbOtherFeeEntity;
  34 +import com.agent.entity.agent.PackageTypeEntity;
  35 +import com.agent.entity.agent.PubStationEntity;
  36 +import com.agent.service.agent.BasicAgentService;
  37 +import com.agent.service.agent.ConsigneeService;
  38 +import com.agent.service.agent.DeliveryInfoService;
  39 +import com.agent.service.agent.HawbOtherFeeService;
  40 +import com.agent.service.agent.MakeHawbService;
  41 +import com.agent.service.agent.MakeMawbService;
  42 +import com.agent.service.agent.MawbOtherFeeService;
  43 +import com.agent.service.agent.PackageSizeService;
  44 +import com.agent.service.agent.PackageTypeService;
  45 +import com.agent.service.agent.PubStationService;
8 import com.agent.util.HttpJsonMsg; 46 import com.agent.util.HttpJsonMsg;
9 import com.agent.vo.ResponseModel; 47 import com.agent.vo.ResponseModel;
10 -import com.agent.xml.bill.*; 48 +import com.agent.xml.bill.ApplicableFreightRateServiceChargeXml;
  49 +import com.agent.xml.bill.ApplicableLogisticsAllowanceChargeXml;
  50 +import com.agent.xml.bill.ApplicableTradeCurrencyExchangeXml;
  51 +import com.agent.xml.bill.AssociatedPartyXml;
  52 +import com.agent.xml.bill.AssociatedUnitLoadTransportEquipmentXml;
  53 +import com.agent.xml.bill.BillHeadXml;
  54 +import com.agent.xml.bill.BillXmlBody;
  55 +import com.agent.xml.bill.ConsignorPartyXml;
  56 +import com.agent.xml.bill.DepartureEventXml;
  57 +import com.agent.xml.bill.DirectTelephoneCommunicationXml;
  58 +import com.agent.xml.bill.EventTimeXml;
  59 +import com.agent.xml.bill.HandlingInstructionsXml;
  60 +import com.agent.xml.bill.IncludedMasterConsignmentItemXml;
  61 +import com.agent.xml.bill.LinearSpatialDimensionXml;
  62 +import com.agent.xml.bill.MasterConsignmentXml;
  63 +import com.agent.xml.bill.NatureIdentificationTransportCargoXml;
  64 +import com.agent.xml.bill.OccurrenceArrivalLocationXml;
  65 +import com.agent.xml.bill.OperatingPartyXml;
  66 +import com.agent.xml.bill.PostalStructuredAddressXml;
  67 +import com.agent.xml.bill.ReportedStatusXml;
  68 +import com.agent.xml.bill.SignatoryCarrierAuthenticationXml;
  69 +import com.agent.xml.bill.SpecifiedLogisticsTransportMovementXml;
  70 +import com.agent.xml.bill.TransportLogisticsPackageXml;
11 import com.agent.xml.common.IDXml; 71 import com.agent.xml.common.IDXml;
12 import com.agent.xml.common.NameXml; 72 import com.agent.xml.common.NameXml;
13 import com.agent.xml.common.XmlUtil; 73 import com.agent.xml.common.XmlUtil;
@@ -20,29 +80,6 @@ import com.plugin.easyui.EasyPage; @@ -20,29 +80,6 @@ import com.plugin.easyui.EasyPage;
20 80
21 import tools.Tools; 81 import tools.Tools;
22 82
23 -import org.apache.commons.collections.CollectionUtils;  
24 -import org.apache.commons.lang.StringUtils;  
25 -import org.apache.shiro.authz.annotation.RequiresPermissions;  
26 -import org.apache.shiro.authz.annotation.RequiresRoles;  
27 -import org.slf4j.Logger;  
28 -import org.slf4j.LoggerFactory;  
29 -import org.springframework.stereotype.Controller;  
30 -import org.springframework.ui.Model;  
31 -import org.springframework.web.bind.annotation.RequestMapping;  
32 -import org.springframework.web.bind.annotation.RequestMethod;  
33 -import org.springframework.web.bind.annotation.ResponseBody;  
34 -import org.springframework.web.servlet.ModelAndView;  
35 -  
36 -import javax.annotation.Resource;  
37 -import javax.servlet.http.HttpServletRequest;  
38 -import javax.servlet.http.HttpServletResponse;  
39 -import java.io.IOException;  
40 -import java.text.ParseException;  
41 -import java.util.ArrayList;  
42 -import java.util.Date;  
43 -import java.util.List;  
44 -import java.util.Map;  
45 -  
46 /** 83 /**
47 * Created by cohesion on 2017/3/29. 84 * Created by cohesion on 2017/3/29.
48 */ 85 */
@@ -52,7 +89,6 @@ public class BillController extends BasicController{ @@ -52,7 +89,6 @@ public class BillController extends BasicController{
52 89
53 private static final Logger logger = LoggerFactory.getLogger(BillController.class); 90 private static final Logger logger = LoggerFactory.getLogger(BillController.class);
54 91
55 -  
56 @Resource 92 @Resource
57 private MakeMawbService makeMawbService; 93 private MakeMawbService makeMawbService;
58 94
1 package com.agent.controller.agent; 1 package com.agent.controller.agent;
2 2
3 -import java.util.ArrayList;  
4 import java.util.List; 3 import java.util.List;
5 import java.util.Map; 4 import java.util.Map;
6 5
@@ -14,9 +13,7 @@ import org.springframework.web.bind.annotation.ResponseBody; @@ -14,9 +13,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
14 13
15 import com.agent.controller.BasicController; 14 import com.agent.controller.BasicController;
16 import com.agent.entity.agent.ConsigneeEntity; 15 import com.agent.entity.agent.ConsigneeEntity;
17 -import com.agent.entity.agent.ConsigneeInfo;  
18 import com.agent.service.agent.ConsigneeService; 16 import com.agent.service.agent.ConsigneeService;
19 -import com.agent.service.agent.PubStationService;  
20 import com.agent.util.HttpJsonMsg; 17 import com.agent.util.HttpJsonMsg;
21 import com.agent.vo.ResponseModel; 18 import com.agent.vo.ResponseModel;
22 import com.framework.core.Servlets; 19 import com.framework.core.Servlets;
  1 +package com.agent.controller.agent;
  2 +
  3 +import java.util.List;
  4 +
  5 +import javax.annotation.Resource;
  6 +import javax.servlet.http.HttpServletRequest;
  7 +
  8 +import org.springframework.stereotype.Controller;
  9 +import org.springframework.web.bind.annotation.RequestMapping;
  10 +import org.springframework.web.bind.annotation.ResponseBody;
  11 +
  12 +import com.agent.controller.BasicController;
  13 +import com.agent.entity.agent.ConsignorEntity;
  14 +import com.agent.service.agent.ConsignorService;
  15 +import com.agent.vo.ResponseModel;
  16 +
  17 +import tools.Tools;
  18 +
  19 +/**
  20 + *
  21 + * Depiction: 发货人控制器
  22 + * <p>
  23 + * Modify:
  24 + * <p>
  25 + * Author: William Lynn
  26 + * <p>
  27 + * Create Date：2018年5月28日 下午2:24:33
  28 + *
  29 + */
  30 +@Controller
  31 +@RequestMapping(value = "/consignor")
  32 +public class ConsignorController extends BasicController {
  33 +
  34 + @Resource
  35 + private ConsignorService service;
  36 +
  37 + @RequestMapping(value = "/getall")
  38 + @ResponseBody
  39 + public ResponseModel getAll(HttpServletRequest request) {
  40 + ResponseModel model = new ResponseModel(200, "", null);
  41 + List<ConsignorEntity> dataList = service.findAllByUserId(Tools.getUserId());
  42 + if (dataList == null || dataList.size() == 0) {
  43 + model = new ResponseModel(404, "", null);
  44 + } else {
  45 + model = new ResponseModel(200, "", null);
  46 + }
  47 + model.setData(dataList);
  48 + return model;
  49 + }
  50 +}
@@ -659,7 +659,6 @@ public class DeliveryInfoController extends BasicController{ @@ -659,7 +659,6 @@ public class DeliveryInfoController extends BasicController{
659 reop.setSpecifiedLocation(spe); 659 reop.setSpecifiedLocation(spe);
660 660
661 mas.setReportedstatus(reop); 661 mas.setReportedstatus(reop);
662 -  
663 662
664 String xml = XmlUtil.convertToXml2(mas, path); 663 String xml = XmlUtil.convertToXml2(mas, path);
665 664
@@ -4,8 +4,6 @@ import org.springframework.stereotype.Controller; @@ -4,8 +4,6 @@ import org.springframework.stereotype.Controller;
4 import org.springframework.web.bind.annotation.RequestMapping; 4 import org.springframework.web.bind.annotation.RequestMapping;
5 import org.springframework.web.bind.annotation.RequestMethod; 5 import org.springframework.web.bind.annotation.RequestMethod;
6 6
7 -import com.agent.imf.agent.IMFServletManifst;  
8 -  
9 @Controller 7 @Controller
10 public class LayoutController { 8 public class LayoutController {
11 9
@@ -20,7 +20,7 @@ public class Constant { @@ -20,7 +20,7 @@ public class Constant {
20 public final static SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 20 public final static SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
21 21
22 //日期格式化 22 //日期格式化
23 - public final static SimpleDateFormat dateTimeFormatnumber = new SimpleDateFormat("yyyyMMddHHmmss"); 23 + public final static SimpleDateFormat dateTimeFormatnumber = new SimpleDateFormat("yyyyMMddHHmmssSSS");
24 24
25 //包装尺寸类型 - 交运 25 //包装尺寸类型 - 交运
26 public final static String packageSizeDelivery = "DELIVERY"; 26 public final static String packageSizeDelivery = "DELIVERY";
@@ -13,59 +13,61 @@ import javax.persistence.Table; @@ -13,59 +13,61 @@ import javax.persistence.Table;
13 */ 13 */
14 @Entity 14 @Entity
15 @Table(name = "PUB_CONSIGNEE") 15 @Table(name = "PUB_CONSIGNEE")
16 -public class ConsigneeEntity extends BasicEntity{  
17 -  
18 - /**  
19 - * 简称  
20 - */  
21 - private String code; 16 +public class ConsigneeEntity extends BasicEntity {
22 17
23 - /**  
24 - * 全称  
25 - */  
26 - private String name; 18 + /**
  19 + * 简称
  20 + */
  21 + private String code;
27 22
28 - /**  
29 - * 地址  
30 - */  
31 - private String address; 23 + /**
  24 + * 全称
  25 + */
  26 + private String name;
32 27
33 - /**  
34 - * 电话  
35 - */  
36 - private String tel; 28 + /**
  29 + * 地址
  30 + */
  31 + private String address;
37 32
  33 + /**
  34 + * 电话
  35 + */
  36 + private String tel;
38 37
39 - @Column(name = "CODE")  
40 - public String getCode() {  
41 - return code;  
42 - } 38 + @Column(name = "CODE")
  39 + public String getCode() {
  40 + return code;
  41 + }
43 42
44 - public void setCode(String code) {  
45 - this.code = code;  
46 - }  
47 - @Column(name = "NAME")  
48 - public String getName() {  
49 - return name;  
50 - } 43 + public void setCode(String code) {
  44 + this.code = code;
  45 + }
51 46
52 - public void setName(String name) {  
53 - this.name = name;  
54 - }  
55 - @Column(name = "ADDRESS")  
56 - public String getAddress() {  
57 - return address;  
58 - } 47 + @Column(name = "NAME")
  48 + public String getName() {
  49 + return name;
  50 + }
59 51
60 - public void setAddress(String address) {  
61 - this.address = address;  
62 - }  
63 - @Column(name = "TEL")  
64 - public String getTel() {  
65 - return tel;  
66 - } 52 + public void setName(String name) {
  53 + this.name = name;
  54 + }
67 55
68 - public void setTel(String tel) {  
69 - this.tel = tel;  
70 - } 56 + @Column(name = "ADDRESS")
  57 + public String getAddress() {
  58 + return address;
  59 + }
  60 +
  61 + public void setAddress(String address) {
  62 + this.address = address;
  63 + }
  64 +
  65 + @Column(name = "TEL")
  66 + public String getTel() {
  67 + return tel;
  68 + }
  69 +
  70 + public void setTel(String tel) {
  71 + this.tel = tel;
  72 + }
71 } 73 }
1 package com.agent.entity.agent; 1 package com.agent.entity.agent;
2 2
3 -public class ConsigneeInfo { 3 +public class ConsigneeInfo {
4 private String id; 4 private String id;
5 - private String sh_company; //公司  
6 - private String sh_address; //地址  
7 - private String sh_zipcode; //邮编  
8 - private String city; //城市  
9 - private String deltaname; //州名  
10 - private String country; //国家代码  
11 - private String telephone; //电话  
12 - private String sh_fax; //传真  
13 - private String sh_name; //收货人姓名  
14 -  
15 - private String sh_provincename; //身份名称  
16 - private String sh_provincecode; //身份代码  
17 -  
18 -  
19 -  
20 - 5 + private String sh_company; // 公司
  6 + private String sh_address; // 地址
  7 + private String sh_zipcode; // 邮编
  8 + private String city; // 城市
  9 + private String deltaname; // 州名
  10 + private String country; // 国家代码
  11 + private String telephone; // 电话
  12 + private String sh_fax; // 传真
  13 + private String sh_name; // 收货人姓名
  14 +
  15 + private String sh_provincename; // 省份名称
  16 + private String sh_provincecode; // 省份代码
  17 +
21 public String getId() { 18 public String getId() {
22 return id; 19 return id;
23 } 20 }
  21 +
24 public void setId(String id) { 22 public void setId(String id) {
25 this.id = id; 23 this.id = id;
26 } 24 }
  25 +
27 public String getSh_company() { 26 public String getSh_company() {
28 return sh_company; 27 return sh_company;
29 } 28 }
  29 +
30 public void setSh_company(String sh_company) { 30 public void setSh_company(String sh_company) {
31 this.sh_company = sh_company; 31 this.sh_company = sh_company;
32 } 32 }
  33 +
33 public String getSh_address() { 34 public String getSh_address() {
34 return sh_address; 35 return sh_address;
35 } 36 }
  37 +
36 public void setSh_address(String sh_address) { 38 public void setSh_address(String sh_address) {
37 this.sh_address = sh_address; 39 this.sh_address = sh_address;
38 } 40 }
  41 +
39 public String getSh_zipcode() { 42 public String getSh_zipcode() {
40 return sh_zipcode; 43 return sh_zipcode;
41 } 44 }
  45 +
42 public void setSh_zipcode(String sh_zipcode) { 46 public void setSh_zipcode(String sh_zipcode) {
43 this.sh_zipcode = sh_zipcode; 47 this.sh_zipcode = sh_zipcode;
44 } 48 }
  49 +
45 public String getCity() { 50 public String getCity() {
46 return city; 51 return city;
47 } 52 }
  53 +
48 public void setCity(String city) { 54 public void setCity(String city) {
49 this.city = city; 55 this.city = city;
50 } 56 }
  57 +
51 public String getDeltaname() { 58 public String getDeltaname() {
52 return deltaname; 59 return deltaname;
53 } 60 }
  61 +
54 public void setDeltaname(String deltaname) { 62 public void setDeltaname(String deltaname) {
55 this.deltaname = deltaname; 63 this.deltaname = deltaname;
56 } 64 }
  65 +
57 public String getCountry() { 66 public String getCountry() {
58 return country; 67 return country;
59 } 68 }
  69 +
60 public void setCountry(String country) { 70 public void setCountry(String country) {
61 this.country = country; 71 this.country = country;
62 } 72 }
  73 +
63 public String getTelephone() { 74 public String getTelephone() {
64 return telephone; 75 return telephone;
65 } 76 }
  77 +
66 public void setTelephone(String telephone) { 78 public void setTelephone(String telephone) {
67 this.telephone = telephone; 79 this.telephone = telephone;
68 } 80 }
  81 +
69 public String getSh_fax() { 82 public String getSh_fax() {
70 return sh_fax; 83 return sh_fax;
71 } 84 }
  85 +
72 public void setSh_fax(String sh_fax) { 86 public void setSh_fax(String sh_fax) {
73 this.sh_fax = sh_fax; 87 this.sh_fax = sh_fax;
74 } 88 }
  89 +
75 public String getSh_name() { 90 public String getSh_name() {
76 return sh_name; 91 return sh_name;
77 } 92 }
  93 +
78 public void setSh_name(String sh_name) { 94 public void setSh_name(String sh_name) {
79 this.sh_name = sh_name; 95 this.sh_name = sh_name;
80 } 96 }
  97 +
81 public String getSh_provincename() { 98 public String getSh_provincename() {
82 return sh_provincename; 99 return sh_provincename;
83 } 100 }
  101 +
84 public void setSh_provincename(String sh_provincename) { 102 public void setSh_provincename(String sh_provincename) {
85 this.sh_provincename = sh_provincename; 103 this.sh_provincename = sh_provincename;
86 } 104 }
  105 +
87 public String getSh_provincecode() { 106 public String getSh_provincecode() {
88 return sh_provincecode; 107 return sh_provincecode;
89 } 108 }
  109 +
90 public void setSh_provincecode(String sh_provincecode) { 110 public void setSh_provincecode(String sh_provincecode) {
91 this.sh_provincecode = sh_provincecode; 111 this.sh_provincecode = sh_provincecode;
92 } 112 }
  1 +package com.agent.entity.agent;
  2 +
  3 +import javax.persistence.Entity;
  4 +import javax.persistence.Table;
  5 +
  6 +import com.agent.entity.BasicEntity;
  7 +
  8 +/**
  9 + *
  10 + * Depiction: 发货人表
  11 + * <p>
  12 + * Modify:
  13 + * <p>
  14 + * Author: William Lynn
  15 + * <p>
  16 + * Create Date：2018年5月28日 下午2:05:28
  17 + *
  18 + */
  19 +@Entity
  20 +@Table(name = "CONSIGNOR")
  21 +public class ConsignorEntity extends BasicEntity {
  22 + private String shpcusid;// 发货人代码
  23 + /**
  24 + * 发货人aeo
  25 + */
  26 + private String shpaeo;
  27 + /**
  28 + * 发货人公司
  29 + */
  30 + private String co_company;
  31 + /**
  32 + * 发货人地址
  33 + */
  34 + private String co_address;
  35 + /**
  36 + * 发货人邮编
  37 + */
  38 + private String co_zipcode;
  39 + /**
  40 + * 发货人城市
  41 + */
  42 + private String co_city;
  43 + /**
  44 + * 发货人洲名
  45 + */
  46 + private String co_deltaname;
  47 + /**
  48 + * 发货人国家名字
  49 + */
  50 + private String co_country;
  51 + /**
  52 + * 发货人电话
  53 + */
  54 + private String co_telephone;
  55 + /**
  56 + * 发货人传真
  57 + */
  58 + private String co_fax;
  59 + /**
  60 + * 发货人名字
  61 + */
  62 + private String co_name;
  63 +
  64 + private String co_provincecode;
  65 +
  66 + public String getCo_company() {
  67 + return co_company;
  68 + }
  69 +
  70 + public void setCo_company(String co_company) {
  71 + this.co_company = co_company;
  72 + }
  73 +
  74 + public String getCo_address() {
  75 + return co_address;
  76 + }
  77 +
  78 + public void setCo_address(String co_address) {
  79 + this.co_address = co_address;
  80 + }
  81 +
  82 + public String getCo_zipcode() {
  83 + return co_zipcode;
  84 + }
  85 +
  86 + public void setCo_zipcode(String co_zipcode) {
  87 + this.co_zipcode = co_zipcode;
  88 + }
  89 +
  90 + public String getCo_city() {
  91 + return co_city;
  92 + }
  93 +
  94 + public void setCo_city(String co_city) {
  95 + this.co_city = co_city;
  96 + }
  97 +
  98 + public String getCo_deltaname() {
  99 + return co_deltaname;
  100 + }
  101 +
  102 + public void setCo_deltaname(String co_deltaname) {
  103 + this.co_deltaname = co_deltaname;
  104 + }
  105 +
  106 + public String getCo_country() {
  107 + return co_country;
  108 + }
  109 +
  110 + public void setCo_country(String co_country) {
  111 + this.co_country = co_country;
  112 + }
  113 +
  114 + public String getCo_telephone() {
  115 + return co_telephone;
  116 + }
  117 +
  118 + public void setCo_telephone(String co_telephone) {
  119 + this.co_telephone = co_telephone;
  120 + }
  121 +
  122 + public String getCo_fax() {
  123 + return co_fax;
  124 + }
  125 +
  126 + public void setCo_fax(String co_fax) {
  127 + this.co_fax = co_fax;
  128 + }
  129 +
  130 + public String getCo_name() {
  131 + return co_name;
  132 + }
  133 +
  134 + public void setCo_name(String co_name) {
  135 + this.co_name = co_name;
  136 + }
  137 +
  138 + public String getShpcusid() {
  139 + return shpcusid;
  140 + }
  141 +
  142 + public void setShpcusid(String shpcusid) {
  143 + this.shpcusid = shpcusid;
  144 + }
  145 +
  146 + public String getShpaeo() {
  147 + return shpaeo;
  148 + }
  149 +
  150 + public void setShpaeo(String shpaeo) {
  151 + this.shpaeo = shpaeo;
  152 + }
  153 +
  154 + public String getCo_provincecode() {
  155 + return co_provincecode;
  156 + }
  157 +
  158 + public void setCo_provincecode(String co_provincecode) {
  159 + this.co_provincecode = co_provincecode;
  160 + }
  161 +
  162 + // 该函数主要用于List的contains
  163 + public boolean equals(Object mme) {
  164 + if (mme != null) {
  165 + ConsignorEntity me = (ConsignorEntity) mme;
  166 + if (me.getCo_company().equalsIgnoreCase(this.getCo_company())) {
  167 + return true;
  168 + }
  169 + }
  170 +
  171 + return false;
  172 + }
  173 +}
@@ -228,10 +228,8 @@ @@ -228,10 +228,8 @@
228 // } 228 // }
229 //} 229 //}
230 230
231 -  
232 package com.agent.entity.agent; 231 package com.agent.entity.agent;
233 232
234 -  
235 import java.text.ParseException; 233 import java.text.ParseException;
236 import java.text.SimpleDateFormat; 234 import java.text.SimpleDateFormat;
237 import java.util.Date; 235 import java.util.Date;
@@ -249,816 +247,937 @@ import com.agent.entity.BasicEntity; @@ -249,816 +247,937 @@ import com.agent.entity.BasicEntity;
249 */ 247 */
250 @Entity 248 @Entity
251 @Table(name = "MANIFEST") 249 @Table(name = "MANIFEST")
252 -public class ManifestEntity extends BasicEntity{  
253 - /**  
254 - * 航班号  
255 - */  
256 - private String flightno;  
257 - /**  
258 - * 航班日期  
259 - */  
260 - private Date flightdate;  
261 - /**  
262 - * 起始地  
263 - */  
264 - private String originatingstation;  
265 - /**  
266 - * 目的地  
267 - */  
268 - private String destinationstation;  
269 - /**  
270 - * 主单号  
271 - */  
272 - private String waybillnomaster;  
273 - /**  
274 - * 总重量  
275 - */  
276 - private String totalweight;  
277 - /**  
278 - * 总件数  
279 - */  
280 - private String totalpiece;  
281 - /**  
282 - * 舱单件数  
283 - */  
284 - private String preparetotalpiece;  
285 - /**  
286 - * 舱单重量  
287 - */  
288 - private String preparetotalweight;  
289 - /**  
290 - * 代理人代码  
291 - */  
292 - private String agentcompanycode;  
293 - /**  
294 - * 装载日期  
295 - */  
296 - private Date stowagedate;  
297 - /**  
298 - * 状态  
299 - */  
300 - private Integer status;  
301 - /**  
302 - * 承运人  
303 - */  
304 - private String carrier;  
305 - /**  
306 - * 海关状态  
307 - */  
308 - private String customsstatus;  
309 - /**  
310 - * 付费方式  
311 - */  
312 - private String paymode;  
313 - /**  
314 - * 特货代码  
315 - */  
316 - private String specialgoodscode;  
317 - /**  
318 - * 海关关区  
319 - */  
320 - private String customscode;  
321 - /**  
322 - * 代理人  
323 - */  
324 - private String agentman;  
325 - /**  
326 - * 代理人公司  
327 - */  
328 - private String agentcompany;  
329 - /**  
330 - * 回执信息  
331 - */  
332 - private String receiptinformation;  
333 - /**  
334 - * 创建日期  
335 - */  
336 - private Date createdate;  
337 - /**  
338 - * 货物描述  
339 - */  
340 - private String productname;  
341 - /**  
342 - * UN编号  
343 - */  
344 - private String unnumber;  
345 - /**  
346 - * 危险品类别  
347 - */  
348 - private String category;  
349 - /**  
350 - * 收货人公司  
351 - */  
352 - private String sh_company;  
353 - /**  
354 - * 收货人地址  
355 - */  
356 - private String sh_address;  
357 - /**  
358 - * 收货人邮编  
359 - */  
360 - private String sh_zipcode;  
361 - /**  
362 - * 收货人城市  
363 - */  
364 - private String sh_city;  
365 - /**  
366 - * 收货人洲名  
367 - */  
368 - private String sh_deltaname;  
369 - /**  
370 - * 收货人国家名字  
371 - */  
372 - private String sh_country;  
373 - /**  
374 - * 收货人电话  
375 - */  
376 - private String sh_telephone;  
377 - /**  
378 - * 收货人传真  
379 - */  
380 - private String sh_fax;  
381 - /**  
382 - * 收货人名字  
383 - */  
384 - private String sh_name;  
385 - /**  
386 - * 发货人公司  
387 - */  
388 - private String co_company;  
389 - /**  
390 - * 发货人地址  
391 - */  
392 - private String co_address;  
393 - /**  
394 - * 发货人邮编  
395 - */  
396 - private String co_zipcode;  
397 - /**  
398 - * 发货人城市  
399 - */  
400 - private String co_city;  
401 - /**  
402 - * 发货人洲名  
403 - */  
404 - private String co_deltaname;  
405 - /**  
406 - * 发货人国家名字  
407 - */  
408 - private String co_country;  
409 - /**  
410 - * 发货人电话  
411 - */  
412 - private String co_telephone;  
413 - /**  
414 - * 发货人传真  
415 - */  
416 - private String co_fax;  
417 - /**  
418 - * 发货人名字  
419 - */  
420 - private String co_name;  
421 - /**  
422 - * 到达站  
423 - */  
424 - private String reach_station;  
425 - /**  
426 - * 承运人  
427 - */  
428 - private String carrier1;  
429 - /**  
430 - * 到达站  
431 - */  
432 - private String reach_station1;  
433 - /**  
434 - * 承运人  
435 - */  
436 - private String carrier2;  
437 - /**  
438 - * 到达站  
439 - */  
440 - private String reach_station2;  
441 - /**  
442 - * 货物品名  
443 - */  
444 - private String name_ofgoods;  
445 - /**  
446 - * 交运货站  
447 - */  
448 - private String delivery_station;  
449 - /**  
450 - * 收货人省份代码  
451 - */  
452 - private String sh_provincecode;  
453 - /**  
454 - * 收货人省份  
455 - */  
456 - private String sh_provincename;  
457 - /**  
458 - * 交运件数  
459 - */  
460 - private String de_number;  
461 - /**  
462 - * 交运重量  
463 - */  
464 - private String de_weight;  
465 - /**  
466 - * 交运计费重量  
467 - */  
468 - private String de_chweight;  
469 - /**  
470 - * 交运体尺寸  
471 - */  
472 - private String de_size;  
473 - /**  
474 - * 交运体积  
475 - */  
476 - private String de_volume;  
477 - /**  
478 - * 交运类型  
479 - */  
480 - private String de_type;  
481 - /**  
482 - * 交运中转站  
483 - */  
484 - private String de_trstation;  
485 - /**  
486 - * 交运包装信息  
487 - */  
488 - private String de_packing;  
489 - /**  
490 - * 交运备注  
491 - */  
492 - private String de_remarks;  
493 - /**  
494 - * 交运发送状态 1发送  
495 - */  
496 - private Integer de_ids;  
497 - /*  
498 - * 回执代码  
499 - */  
500 - private String response_code;  
501 - /*  
502 - * 回执状态文本  
503 - */  
504 - private String response_text;  
505 - private Long save_time;  
506 - private Long USER_ID; //报文所属的用户id  
507 -  
508 -  
509 -  
510 -  
511 - public Long getUSER_ID() {  
512 - return USER_ID;  
513 - }  
514 - public void setUSER_ID(Long uSER_ID) {  
515 - USER_ID = uSER_ID;  
516 - }  
517 - @Column(name = "SAVE_TIME")  
518 - public Long getSave_time() {  
519 - return save_time;  
520 - }  
521 - public void setSave_time(Long save_time) {  
522 - this.save_time = save_time;  
523 - }  
524 - @Column(name = "RESPONSE_CODE")  
525 - public String getResponse_code() {  
526 - return response_code;  
527 - }  
528 - public void setResponse_code(String response_code) {  
529 - this.response_code = response_code;  
530 - }  
531 - @Column(name = "RESPONSE_TEXT")  
532 - public String getResponse_text() {  
533 - return response_text;  
534 - }  
535 - public void setResponse_text(String response_text) {  
536 - this.response_text = response_text;  
537 - }  
538 - @Column(name = "DE_IDS")  
539 - public Integer getDe_ids() {  
540 - return de_ids;  
541 - }  
542 - public void setDe_ids(Integer de_ids) {  
543 - this.de_ids = de_ids;  
544 - }  
545 - @Column(name = "DE_NUMBER")  
546 - public String getDe_number() {  
547 - return de_number;  
548 - }  
549 - public void setDe_number(String de_number) {  
550 - this.de_number = de_number;  
551 - }  
552 -  
553 - @Column(name = "DE_WEIGHT")  
554 - public String getDe_weight() {  
555 - return de_weight;  
556 - }  
557 - public void setDe_weight(String de_weight) {  
558 - this.de_weight = de_weight;  
559 - }  
560 -  
561 - @Column(name = "DE_CHWEIGHT")  
562 - public String getDe_chweight() {  
563 - return de_chweight;  
564 - }  
565 - public void setDe_chweight(String de_chweight) {  
566 - this.de_chweight = de_chweight;  
567 - }  
568 -  
569 - @Column(name = "DE_SIZE")  
570 - public String getDe_size() {  
571 - return de_size;  
572 - }  
573 - public void setDe_size(String de_size) {  
574 - this.de_size = de_size;  
575 - }  
576 -  
577 - @Column(name = "DE_VOLUME")  
578 - public String getDe_volume() {  
579 - return de_volume;  
580 - }  
581 - public void setDe_volume(String de_volume) {  
582 - this.de_volume = de_volume;  
583 - }  
584 -  
585 - @Column(name = "DE_TYPE")  
586 - public String getDe_type() {  
587 - return de_type;  
588 - }  
589 - public void setDe_type(String de_type) {  
590 - this.de_type = de_type;  
591 - }  
592 -  
593 - @Column(name = "DE_TRSTATION")  
594 - public String getDe_trstation() {  
595 - return de_trstation;  
596 - }  
597 - public void setDe_trstation(String de_trstation) {  
598 - this.de_trstation = de_trstation;  
599 - }  
600 -  
601 - @Column(name = "DE_PACKING")  
602 - public String getDe_packing() {  
603 - return de_packing;  
604 - }  
605 - public void setDe_packing(String de_packing) {  
606 - this.de_packing = de_packing;  
607 - }  
608 -  
609 - @Column(name = "DE_REMARKS")  
610 - public String getDe_remarks() {  
611 - return de_remarks;  
612 - }  
613 - public void setDe_remarks(String de_remarks) {  
614 - this.de_remarks = de_remarks;  
615 - }  
616 - @Column(name = "SH_PROVINCECODE")  
617 - public String getSh_provincecode() {  
618 - return sh_provincecode;  
619 - }  
620 - public void setSh_provincecode(String sh_provincecode) {  
621 - this.sh_provincecode = sh_provincecode;  
622 - }  
623 - @Column(name = "SH_PROVINCENAME")  
624 - public String getSh_provincename() {  
625 - return sh_provincename;  
626 - }  
627 - public void setSh_provincename(String sh_provincename) {  
628 - this.sh_provincename = sh_provincename;  
629 - }  
630 - @Column(name = "FLIGHTNO")  
631 - public String getFlightno() {  
632 - return flightno;  
633 - }  
634 - public void setFlightno(String flightno) {  
635 - this.flightno = flightno;  
636 - }  
637 -  
638 - @Column(name = "FLIGHTDATE")  
639 - public Date getFlightdate() {  
640 - return flightdate;  
641 - }  
642 - public void setFlightdate(Date flightdate) {  
643 - this.flightdate = flightdate;  
644 - }  
645 -  
646 - @Column(name = "ORIGINATINGSTATION")  
647 - public String getOriginatingstation() {  
648 - return originatingstation;  
649 - }  
650 - public void setOriginatingstation(String originatingstation) {  
651 - this.originatingstation = originatingstation;  
652 - }  
653 -  
654 - @Column(name = "DESTINATIONSTATION")  
655 - public String getDestinationstation() {  
656 - return destinationstation;  
657 - }  
658 - public void setDestinationstation(String destinationstation) {  
659 - this.destinationstation = destinationstation;  
660 - }  
661 -  
662 - @Column(name = "WAYBILLNOMASTER")  
663 - public String getWaybillnomaster() {  
664 - return waybillnomaster;  
665 - }  
666 - public void setWaybillnomaster(String waybillnomaster) {  
667 - this.waybillnomaster = waybillnomaster;  
668 - }  
669 -  
670 - @Column(name = "TOTALWEIGHT")  
671 - public String getTotalweight() {  
672 - return totalweight;  
673 - }  
674 - public void setTotalweight(String totalweight) {  
675 - this.totalweight = totalweight;  
676 - }  
677 -  
678 - @Column(name = "TOTALPIECE")  
679 - public String getTotalpiece() {  
680 - return totalpiece;  
681 - }  
682 - public void setTotalpiece(String totalpiece) {  
683 - this.totalpiece = totalpiece;  
684 - }  
685 -  
686 - @Column(name = "PREPARETOTALPIECE")  
687 - public String getPreparetotalpiece() {  
688 - return preparetotalpiece;  
689 - }  
690 - public void setPreparetotalpiece(String preparetotalpiece) {  
691 - this.preparetotalpiece = preparetotalpiece;  
692 - }  
693 -  
694 - @Column(name = "PREPARETOTALWEIGHT")  
695 - public String getPreparetotalweight() {  
696 - return preparetotalweight;  
697 - }  
698 - public void setPreparetotalweight(String preparetotalweight) {  
699 - this.preparetotalweight = preparetotalweight;  
700 - }  
701 -  
702 - @Column(name = "AGENTCOMPANYCODE")  
703 - public String getAgentcompanycode() {  
704 - return agentcompanycode;  
705 - }  
706 - public void setAgentcompanycode(String agentcompanycode) {  
707 - this.agentcompanycode = agentcompanycode;  
708 - }  
709 -  
710 - @Column(name = "STOWAGEDATE")  
711 - public Date getStowagedate() {  
712 - return stowagedate;  
713 - }  
714 - public void setStowagedate(Date stowagedate) {  
715 - //System.out.println(stowagedate);  
716 -  
717 - this.stowagedate = stowagedate;  
718 - //this.stowagedate = new Date();  
719 - }  
720 - public static Date getStowagedate(String datestr){  
721 - if(datestr == null)  
722 - return null;  
723 - String strFormat = "yyyyMMddHHmmss";  
724 - if(datestr.indexOf(":") < 0){  
725 - strFormat = "yyyy-MM-dd";  
726 - }  
727 - SimpleDateFormat sdf = new SimpleDateFormat(strFormat);  
728 - try {  
729 - return sdf.parse(datestr);  
730 - } catch (ParseException e) {  
731 - // TODO Auto-generated catch block  
732 - e.printStackTrace();  
733 - } 250 +public class ManifestEntity extends BasicEntity {
  251 + private String unlodingcode;// 卸货地代码
  252 + private String cnecusid;// 收货人代码
  253 + private String shpcusid;// 发货人代码
  254 + /**
  255 + * 发货人aeo
  256 + */
  257 + private String shpaeo;
  258 + /**
  259 + * 收货人aeo
  260 + */
  261 + private String cneaeo;
  262 + /**
  263 + * 航班号
  264 + */
  265 + private String flightno;
  266 + /**
  267 + * 航班日期
  268 + */
  269 + private Date flightdate;
  270 + /**
  271 + * 起始地
  272 + */
  273 + private String originatingstation;
  274 + /**
  275 + * 目的地
  276 + */
  277 + private String destinationstation;
  278 + /**
  279 + * 主单号
  280 + */
  281 + private String waybillnomaster;
  282 + /**
  283 + * 总重量
  284 + */
  285 + private String totalweight;
  286 + /**
  287 + * 总件数
  288 + */
  289 + private String totalpiece;
  290 + /**
  291 + * 舱单件数
  292 + */
  293 + private String preparetotalpiece;
  294 + /**
  295 + * 舱单重量
  296 + */
  297 + private String preparetotalweight;
  298 + /**
  299 + * 代理人代码
  300 + */
  301 + private String agentcompanycode;
  302 + /**
  303 + * 装载日期
  304 + */
  305 + private Date stowagedate;
  306 + /**
  307 + * 状态
  308 + */
  309 + private Integer status;
  310 + /**
  311 + * 承运人
  312 + */
  313 + private String carrier;
  314 + /**
  315 + * 海关状态
  316 + */
  317 + private String customsstatus;
  318 + /**
  319 + * 付费方式
  320 + */
  321 + private String paymode;
  322 + /**
  323 + * 特货代码
  324 + */
  325 + private String specialgoodscode;
  326 + /**
  327 + * 海关关区
  328 + */
  329 + private String customscode;
  330 + /**
  331 + * 代理人
  332 + */
  333 + private String agentman;
  334 + /**
  335 + * 代理人公司
  336 + */
  337 + private String agentcompany;
  338 + /**
  339 + * 回执信息
  340 + */
  341 + private String receiptinformation;
  342 + /**
  343 + * 创建日期
  344 + */
  345 + private Date createdate;
  346 + /**
  347 + * 货物描述
  348 + */
  349 + private String productname;
  350 + /**
  351 + * UN编号
  352 + */
  353 + private String unnumber;
  354 + /**
  355 + * 危险品类别
  356 + */
  357 + private String category;
  358 + /**
  359 + * 收货人公司
  360 + */
  361 + private String sh_company;
  362 + /**
  363 + * 收货人地址
  364 + */
  365 + private String sh_address;
  366 + /**
  367 + * 收货人邮编
  368 + */
  369 + private String sh_zipcode;
  370 + /**
  371 + * 收货人城市
  372 + */
  373 + private String sh_city;
  374 + /**
  375 + * 收货人洲名
  376 + */
  377 + private String sh_deltaname;
  378 + /**
  379 + * 收货人国家名字
  380 + */
  381 + private String sh_country;
  382 + /**
  383 + * 收货人电话
  384 + */
  385 + private String sh_telephone;
  386 + /**
  387 + * 收货人传真
  388 + */
  389 + private String sh_fax;
  390 + /**
  391 + * 收货人名字
  392 + */
  393 + private String sh_name;
  394 + /**
  395 + * 发货人公司
  396 + */
  397 + private String co_company;
  398 + /**
  399 + * 发货人地址
  400 + */
  401 + private String co_address;
  402 + /**
  403 + * 发货人邮编
  404 + */
  405 + private String co_zipcode;
  406 + /**
  407 + * 发货人城市
  408 + */
  409 + private String co_city;
  410 + /**
  411 + * 发货人洲名
  412 + */
  413 + private String co_deltaname;
  414 + /**
  415 + * 发货人国家名字
  416 + */
  417 + private String co_country;
  418 + /**
  419 + * 发货人电话
  420 + */
  421 + private String co_telephone;
  422 + /**
  423 + * 发货人传真
  424 + */
  425 + private String co_fax;
  426 + /**
  427 + * 发货人名字
  428 + */
  429 + private String co_name;
  430 + /**
  431 + * 到达站
  432 + */
  433 + private String reach_station;
  434 + /**
  435 + * 承运人
  436 + */
  437 + private String carrier1;
  438 + /**
  439 + * 到达站
  440 + */
  441 + private String reach_station1;
  442 + /**
  443 + * 承运人
  444 + */
  445 + private String carrier2;
  446 + /**
  447 + * 到达站
  448 + */
  449 + private String reach_station2;
  450 + /**
  451 + * 货物品名
  452 + */
  453 + private String name_ofgoods;
  454 + /**
  455 + * 交运货站
  456 + */
  457 + private String delivery_station;
  458 + /**
  459 + * 收货人省份代码
  460 + */
  461 + private String sh_provincecode;
  462 + /**
  463 + * 收货人省份
  464 + */
  465 + private String sh_provincename;
  466 + /**
  467 + * 交运件数
  468 + */
  469 + private String de_number;
  470 + /**
  471 + * 交运重量
  472 + */
  473 + private String de_weight;
  474 + /**
  475 + * 交运计费重量
  476 + */
  477 + private String de_chweight;
  478 + /**
  479 + * 交运体尺寸
  480 + */
  481 + private String de_size;
  482 + /**
  483 + * 交运体积
  484 + */
  485 + private String de_volume;
  486 + /**
  487 + * 交运类型
  488 + */
  489 + private String de_type;
  490 + /**
  491 + * 交运中转站
  492 + */
  493 + private String de_trstation;
  494 + /**
  495 + * 交运包装信息
  496 + */
  497 + private String de_packing;
  498 + /**
  499 + * 交运备注
  500 + */
  501 + private String de_remarks;
  502 + /**
  503 + * 交运发送状态 1发送
  504 + */
  505 + private Integer de_ids;
  506 + /*
  507 + * 回执代码
  508 + */
  509 + private String response_code;
  510 + /*
  511 + * 回执状态文本
  512 + */
  513 + private String response_text;
  514 + private Long save_time;
  515 + private Long USER_ID; // 报文所属的用户id
  516 +
  517 + public String getUnlodingcode() {
  518 + return unlodingcode;
  519 + }
  520 +
  521 + public void setUnlodingcode(String unlodingcode) {
  522 + this.unlodingcode = unlodingcode;
  523 + }
  524 +
  525 + public String getCnecusid() {
  526 + return cnecusid;
  527 + }
  528 +
  529 + public void setCnecusid(String cnecusid) {
  530 + this.cnecusid = cnecusid;
  531 + }
  532 +
  533 + public String getShpcusid() {
  534 + return shpcusid;
  535 + }
  536 +
  537 + public void setShpcusid(String shpcusid) {
  538 + this.shpcusid = shpcusid;
  539 + }
  540 +
  541 + public String getShpaeo() {
  542 + return shpaeo;
  543 + }
  544 +
  545 + public void setShpaeo(String shpaeo) {
  546 + this.shpaeo = shpaeo;
  547 + }
  548 +
  549 + public String getCneaeo() {
  550 + return cneaeo;
  551 + }
  552 +
  553 + public void setCneaeo(String cneaeo) {
  554 + this.cneaeo = cneaeo;
  555 + }
  556 +
  557 + public Long getUSER_ID() {
  558 + return USER_ID;
  559 + }
  560 +
  561 + public void setUSER_ID(Long uSER_ID) {
  562 + USER_ID = uSER_ID;
  563 + }
  564 +
  565 + @Column(name = "SAVE_TIME")
  566 + public Long getSave_time() {
  567 + return save_time;
  568 + }
  569 +
  570 + public void setSave_time(Long save_time) {
  571 + this.save_time = save_time;
  572 + }
  573 +
  574 + @Column(name = "RESPONSE_CODE")
  575 + public String getResponse_code() {
  576 + return response_code;
  577 + }
  578 +
  579 + public void setResponse_code(String response_code) {
  580 + this.response_code = response_code;
  581 + }
  582 +
  583 + @Column(name = "RESPONSE_TEXT")
  584 + public String getResponse_text() {
  585 + return response_text;
  586 + }
  587 +
  588 + public void setResponse_text(String response_text) {
  589 + this.response_text = response_text;
  590 + }
  591 +
  592 + @Column(name = "DE_IDS")
  593 + public Integer getDe_ids() {
  594 + return de_ids;
  595 + }
  596 +
  597 + public void setDe_ids(Integer de_ids) {
  598 + this.de_ids = de_ids;
  599 + }
  600 +
  601 + @Column(name = "DE_NUMBER")
  602 + public String getDe_number() {
  603 + return de_number;
  604 + }
  605 +
  606 + public void setDe_number(String de_number) {
  607 + this.de_number = de_number;
  608 + }
  609 +
  610 + @Column(name = "DE_WEIGHT")
  611 + public String getDe_weight() {
  612 + return de_weight;
  613 + }
  614 +
  615 + public void setDe_weight(String de_weight) {
  616 + this.de_weight = de_weight;
  617 + }
  618 +
  619 + @Column(name = "DE_CHWEIGHT")
  620 + public String getDe_chweight() {
  621 + return de_chweight;
  622 + }
  623 +
  624 + public void setDe_chweight(String de_chweight) {
  625 + this.de_chweight = de_chweight;
  626 + }
  627 +
  628 + @Column(name = "DE_SIZE")
  629 + public String getDe_size() {
  630 + return de_size;
  631 + }
  632 +
  633 + public void setDe_size(String de_size) {
  634 + this.de_size = de_size;
  635 + }
  636 +
  637 + @Column(name = "DE_VOLUME")
  638 + public String getDe_volume() {
  639 + return de_volume;
  640 + }
  641 +
  642 + public void setDe_volume(String de_volume) {
  643 + this.de_volume = de_volume;
  644 + }
  645 +
  646 + @Column(name = "DE_TYPE")
  647 + public String getDe_type() {
  648 + return de_type;
  649 + }
  650 +
  651 + public void setDe_type(String de_type) {
  652 + this.de_type = de_type;
  653 + }
  654 +
  655 + @Column(name = "DE_TRSTATION")
  656 + public String getDe_trstation() {
  657 + return de_trstation;
  658 + }
  659 +
  660 + public void setDe_trstation(String de_trstation) {
  661 + this.de_trstation = de_trstation;
  662 + }
  663 +
  664 + @Column(name = "DE_PACKING")
  665 + public String getDe_packing() {
  666 + return de_packing;
  667 + }
  668 +
  669 + public void setDe_packing(String de_packing) {
  670 + this.de_packing = de_packing;
  671 + }
  672 +
  673 + @Column(name = "DE_REMARKS")
  674 + public String getDe_remarks() {
  675 + return de_remarks;
  676 + }
  677 +
  678 + public void setDe_remarks(String de_remarks) {
  679 + this.de_remarks = de_remarks;
  680 + }
  681 +
  682 + @Column(name = "SH_PROVINCECODE")
  683 + public String getSh_provincecode() {
  684 + return sh_provincecode;
  685 + }
  686 +
  687 + public void setSh_provincecode(String sh_provincecode) {
  688 + this.sh_provincecode = sh_provincecode;
  689 + }
  690 +
  691 + @Column(name = "SH_PROVINCENAME")
  692 + public String getSh_provincename() {
  693 + return sh_provincename;
  694 + }
  695 +
  696 + public void setSh_provincename(String sh_provincename) {
  697 + this.sh_provincename = sh_provincename;
  698 + }
  699 +
  700 + @Column(name = "FLIGHTNO")
  701 + public String getFlightno() {
  702 + return flightno;
  703 + }
  704 +
  705 + public void setFlightno(String flightno) {
  706 + this.flightno = flightno;
  707 + }
  708 +
  709 + @Column(name = "FLIGHTDATE")
  710 + public Date getFlightdate() {
  711 + return flightdate;
  712 + }
  713 +
  714 + public void setFlightdate(Date flightdate) {
  715 + this.flightdate = flightdate;
  716 + }
  717 +
  718 + @Column(name = "ORIGINATINGSTATION")
  719 + public String getOriginatingstation() {
  720 + return originatingstation;
  721 + }
  722 +
  723 + public void setOriginatingstation(String originatingstation) {
  724 + this.originatingstation = originatingstation;
  725 + }
  726 +
  727 + @Column(name = "DESTINATIONSTATION")
  728 + public String getDestinationstation() {
  729 + return destinationstation;
  730 + }
  731 +
  732 + public void setDestinationstation(String destinationstation) {
  733 + this.destinationstation = destinationstation;
  734 + }
  735 +
  736 + @Column(name = "WAYBILLNOMASTER")
  737 + public String getWaybillnomaster() {
  738 + return waybillnomaster;
  739 + }
  740 +
  741 + public void setWaybillnomaster(String waybillnomaster) {
  742 + this.waybillnomaster = waybillnomaster;
  743 + }
  744 +
  745 + @Column(name = "TOTALWEIGHT")
  746 + public String getTotalweight() {
  747 + return totalweight;
  748 + }
  749 +
  750 + public void setTotalweight(String totalweight) {
  751 + this.totalweight = totalweight;
  752 + }
  753 +
  754 + @Column(name = "TOTALPIECE")
  755 + public String getTotalpiece() {
  756 + return totalpiece;
  757 + }
  758 +
  759 + public void setTotalpiece(String totalpiece) {
  760 + this.totalpiece = totalpiece;
  761 + }
  762 +
  763 + @Column(name = "PREPARETOTALPIECE")
  764 + public String getPreparetotalpiece() {
  765 + return preparetotalpiece;
  766 + }
  767 +
  768 + public void setPreparetotalpiece(String preparetotalpiece) {
  769 + this.preparetotalpiece = preparetotalpiece;
  770 + }
  771 +
  772 + @Column(name = "PREPARETOTALWEIGHT")
  773 + public String getPreparetotalweight() {
  774 + return preparetotalweight;
  775 + }
  776 +
  777 + public void setPreparetotalweight(String preparetotalweight) {
  778 + this.preparetotalweight = preparetotalweight;
  779 + }
  780 +
  781 + @Column(name = "AGENTCOMPANYCODE")
  782 + public String getAgentcompanycode() {
  783 + return agentcompanycode;
  784 + }
  785 +
  786 + public void setAgentcompanycode(String agentcompanycode) {
  787 + this.agentcompanycode = agentcompanycode;
  788 + }
  789 +
  790 + @Column(name = "STOWAGEDATE")
  791 + public Date getStowagedate() {
  792 + return stowagedate;
  793 + }
  794 +
  795 + public void setStowagedate(Date stowagedate) {
  796 + // System.out.println(stowagedate);
  797 +
  798 + this.stowagedate = stowagedate;
  799 + // this.stowagedate = new Date();
  800 + }
  801 +
  802 + public static Date getStowagedate(String datestr) {
  803 + if (datestr == null)
734 return null; 804 return null;
735 - }  
736 -  
737 - @Column(name = "STATUS")  
738 - public Integer getStatus() {  
739 - return status;  
740 - }  
741 - public void setStatus(Integer status) {  
742 - this.status = status;  
743 - }  
744 -  
745 - @Column(name = "CARRIER")  
746 - public String getCarrier() {  
747 - return carrier;  
748 - }  
749 - public void setCarrier(String carrier) {  
750 - this.carrier = carrier;  
751 - }  
752 -  
753 - @Column(name = "CUSTOMSSTATUS")  
754 - public String getCustomsstatus() {  
755 - return customsstatus;  
756 - }  
757 - public void setCustomsstatus(String customsstatus) {  
758 - this.customsstatus = customsstatus;  
759 - }  
760 -  
761 - @Column(name = "PAYMODE")  
762 - public String getPaymode() {  
763 - return paymode;  
764 - }  
765 - public void setPaymode(String paymode) {  
766 - this.paymode = paymode;  
767 - }  
768 -  
769 - @Column(name = "SPECIALGOODSCODE")  
770 - public String getSpecialgoodscode() {  
771 - return specialgoodscode;  
772 - }  
773 - public void setSpecialgoodscode(String specialgoodscode) {  
774 - this.specialgoodscode = specialgoodscode;  
775 - }  
776 -  
777 - @Column(name = "CUSTOMSCODE")  
778 - public String getCustomscode() {  
779 - return customscode;  
780 - }  
781 - public void setCustomscode(String customscode) {  
782 - this.customscode = customscode;  
783 - }  
784 -  
785 - @Column(name = "AGENTMAN")  
786 - public String getAgentman() {  
787 - return agentman;  
788 - }  
789 - public void setAgentman(String agentman) {  
790 - this.agentman = agentman;  
791 - }  
792 -  
793 - @Column(name = "AGENTCOMPANY")  
794 - public String getAgentcompany() {  
795 - return agentcompany;  
796 - }  
797 - public void setAgentcompany(String agentcompany) {  
798 - this.agentcompany = agentcompany;  
799 - }  
800 -  
801 - @Column(name = "RECEIPTINFORMATION")  
802 - public String getReceiptinformation() {  
803 - return receiptinformation;  
804 - }  
805 - public void setReceiptinformation(String receiptinformation) {  
806 - this.receiptinformation = receiptinformation;  
807 - }  
808 -  
809 - @Column(name = "CREATEDATE")  
810 - public Date getCreatedate() {  
811 - return createdate;  
812 - }  
813 - public void setCreatedate(Date createdate) {  
814 - this.createdate = createdate;  
815 - }  
816 -  
817 - @Column(name = "PRODUCTNAME")  
818 - public String getProductname() {  
819 - return productname;  
820 - }  
821 - public void setProductname(String productname) {  
822 - this.productname = productname;  
823 - }  
824 - @Column(name = "UNNUMBER")  
825 - public String getUnnumber() {  
826 - return unnumber;  
827 - }  
828 - public void setUnnumber(String unnumber) {  
829 - this.unnumber = unnumber;  
830 - }  
831 -  
832 - @Column(name = "CATEGORY")  
833 - public String getCategory() {  
834 - return category;  
835 - }  
836 - public void setCategory(String category) {  
837 - this.category = category;  
838 - }  
839 -  
840 - @Column(name = "SH_COMPANY")  
841 - public String getSh_company() {  
842 - return sh_company;  
843 - }  
844 - public void setSh_company(String sh_company) {  
845 - this.sh_company = sh_company;  
846 - }  
847 -  
848 - @Column(name = "SH_ADDRESS")  
849 - public String getSh_address() {  
850 - return sh_address;  
851 - }  
852 - public void setSh_address(String sh_address) {  
853 - this.sh_address = sh_address;  
854 - }  
855 -  
856 - @Column(name = "SH_ZIPCODE")  
857 - public String getSh_zipcode() {  
858 - return sh_zipcode;  
859 - }  
860 - public void setSh_zipcode(String sh_zipcode) {  
861 - this.sh_zipcode = sh_zipcode;  
862 - }  
863 -  
864 - @Column(name = "SH_CITY")  
865 - public String getSh_city() {  
866 - return sh_city;  
867 - }  
868 - public void setSh_city(String sh_city) {  
869 - this.sh_city = sh_city;  
870 - }  
871 -  
872 - @Column(name = "SH_DELTANAME")  
873 - public String getSh_deltaname() {  
874 - return sh_deltaname;  
875 - }  
876 - public void setSh_deltaname(String sh_deltaname) {  
877 - this.sh_deltaname = sh_deltaname;  
878 - }  
879 -  
880 - @Column(name = "SH_COUNTRY")  
881 - public String getSh_country() {  
882 - return sh_country;  
883 - }  
884 - public void setSh_country(String sh_country) {  
885 - this.sh_country = sh_country;  
886 - }  
887 -  
888 - @Column(name = "SH_TELEPHONE")  
889 - public String getSh_telephone() {  
890 - return sh_telephone;  
891 - }  
892 - public void setSh_telephone(String sh_telephone) {  
893 - this.sh_telephone = sh_telephone;  
894 - }  
895 -  
896 - @Column(name = "SH_FAX")  
897 - public String getSh_fax() {  
898 - return sh_fax;  
899 - }  
900 - public void setSh_fax(String sh_fax) {  
901 - this.sh_fax = sh_fax;  
902 - }  
903 -  
904 - @Column(name = "SH_NAME")  
905 - public String getSh_name() {  
906 - return sh_name;  
907 - }  
908 - public void setSh_name(String sh_name) {  
909 - this.sh_name = sh_name;  
910 - }  
911 -  
912 - @Column(name = "CO_COMPANY")  
913 - public String getCo_company() {  
914 - return co_company;  
915 - }  
916 - public void setCo_company(String co_company) {  
917 - this.co_company = co_company;  
918 - }  
919 -  
920 - @Column(name = "CO_ADDRESS")  
921 - public String getCo_address() {  
922 - return co_address;  
923 - }  
924 - public void setCo_address(String co_address) {  
925 - this.co_address = co_address;  
926 - }  
927 -  
928 - @Column(name = "CO_ZIPCODE")  
929 - public String getCo_zipcode() {  
930 - return co_zipcode;  
931 - }  
932 - public void setCo_zipcode(String co_zipcode) {  
933 - this.co_zipcode = co_zipcode;  
934 - }  
935 -  
936 - @Column(name = "CO_CITY")  
937 - public String getCo_city() {  
938 - return co_city;  
939 - }  
940 - public void setCo_city(String co_city) {  
941 - this.co_city = co_city;  
942 - }  
943 -  
944 - @Column(name = "CO_DELTANAME")  
945 - public String getCo_deltaname() {  
946 - return co_deltaname;  
947 - }  
948 - public void setCo_deltaname(String co_deltaname) {  
949 - this.co_deltaname = co_deltaname;  
950 - }  
951 -  
952 - @Column(name = "CO_COUNTRY")  
953 - public String getCo_country() {  
954 - return co_country;  
955 - }  
956 - public void setCo_country(String co_country) {  
957 - this.co_country = co_country;  
958 - }  
959 -  
960 - @Column(name = "CO_TELEPHONE")  
961 - public String getCo_telephone() {  
962 - return co_telephone;  
963 - }  
964 - public void setCo_telephone(String co_telephone) {  
965 - this.co_telephone = co_telephone;  
966 - }  
967 -  
968 - @Column(name = "CO_FAX")  
969 - public String getCo_fax() {  
970 - return co_fax;  
971 - }  
972 - public void setCo_fax(String co_fax) {  
973 - this.co_fax = co_fax;  
974 - }  
975 -  
976 - @Column(name = "CO_NAME")  
977 - public String getCo_name() {  
978 - return co_name;  
979 - }  
980 - public void setCo_name(String co_name) {  
981 - this.co_name = co_name;  
982 - }  
983 -  
984 - @Column(name = "REACH_STATION")  
985 - public String getReach_station() {  
986 - return reach_station;  
987 - }  
988 - public void setReach_station(String reach_station) {  
989 - this.reach_station = reach_station;  
990 - }  
991 -  
992 - @Column(name = "CARRIER1")  
993 - public String getCarrier1() {  
994 - return carrier1;  
995 - }  
996 - public void setCarrier1(String carrier1) {  
997 - this.carrier1 = carrier1;  
998 - }  
999 -  
1000 - @Column(name = "REACH_STATION1")  
1001 - public String getReach_station1() {  
1002 - return reach_station1;  
1003 - }  
1004 - public void setReach_station1(String reach_station1) {  
1005 - this.reach_station1 = reach_station1;  
1006 - }  
1007 -  
1008 - @Column(name = "CARRIER2")  
1009 - public String getCarrier2() {  
1010 - return carrier2;  
1011 - }  
1012 - public void setCarrier2(String carrier2) {  
1013 - this.carrier2 = carrier2;  
1014 - }  
1015 -  
1016 - @Column(name = "REACH_STATION2")  
1017 - public String getReach_station2() {  
1018 - return reach_station2;  
1019 - }  
1020 - public void setReach_station2(String reach_station2) {  
1021 - this.reach_station2 = reach_station2;  
1022 - }  
1023 -  
1024 - @Column(name = "NAME_OFGOODS")  
1025 - public String getName_ofgoods() {  
1026 - return name_ofgoods;  
1027 - }  
1028 - public void setName_ofgoods(String name_ofgoods) {  
1029 - this.name_ofgoods = name_ofgoods;  
1030 - }  
1031 -  
1032 - @Column(name = "DELIVERY_STATION")  
1033 - public String getDelivery_station() {  
1034 - return delivery_station;  
1035 - }  
1036 - public void setDelivery_station(String delivery_station) {  
1037 - this.delivery_station = delivery_station;  
1038 - }  
1039 - //该函数主要用于List的contains  
1040 - public boolean equals(Object mme){  
1041 - if(mme == null)  
1042 - return false;  
1043 - ManifestEntity me = (ManifestEntity)mme;  
1044 - if(me.getCo_company() == null && this.getCo_company() == null)  
1045 - return true;  
1046 - else if(this.getCo_company() != null)  
1047 - {  
1048 - //在值相等的情况下，判断时间的大小  
1049 - if(this.getCo_company().equals(me.getCo_company()))  
1050 - {  
1051 - //当前时间为null，直接返回true  
1052 - if(this.getSave_time() == null)  
1053 - return true;  
1054 - //要比较的那个对象为null，直接返回false  
1055 - else if(me.getSave_time() == null)  
1056 - return false;  
1057 - else  
1058 - return this.getSave_time() > me.getSave_time();  
1059 - }  
1060 - } 805 + String strFormat = "yyyyMMddHHmmss";
  806 + if (datestr.indexOf(":") < 0) {
  807 + strFormat = "yyyy-MM-dd";
  808 + }
  809 + SimpleDateFormat sdf = new SimpleDateFormat(strFormat);
  810 + try {
  811 + return sdf.parse(datestr);
  812 + } catch (ParseException e) {
  813 + // TODO Auto-generated catch block
  814 + e.printStackTrace();
  815 + }
  816 + return null;
  817 + }
  818 +
  819 + @Column(name = "STATUS")
  820 + public Integer getStatus() {
  821 + return status;
  822 + }
  823 +
  824 + public void setStatus(Integer status) {
  825 + this.status = status;
  826 + }
  827 +
  828 + @Column(name = "CARRIER")
  829 + public String getCarrier() {
  830 + return carrier;
  831 + }
  832 +
  833 + public void setCarrier(String carrier) {
  834 + this.carrier = carrier;
  835 + }
  836 +
  837 + @Column(name = "CUSTOMSSTATUS")
  838 + public String getCustomsstatus() {
  839 + return customsstatus;
  840 + }
  841 +
  842 + public void setCustomsstatus(String customsstatus) {
  843 + this.customsstatus = customsstatus;
  844 + }
  845 +
  846 + @Column(name = "PAYMODE")
  847 + public String getPaymode() {
  848 + return paymode;
  849 + }
  850 +
  851 + public void setPaymode(String paymode) {
  852 + this.paymode = paymode;
  853 + }
  854 +
  855 + @Column(name = "SPECIALGOODSCODE")
  856 + public String getSpecialgoodscode() {
  857 + return specialgoodscode;
  858 + }
  859 +
  860 + public void setSpecialgoodscode(String specialgoodscode) {
  861 + this.specialgoodscode = specialgoodscode;
  862 + }
  863 +
  864 + @Column(name = "CUSTOMSCODE")
  865 + public String getCustomscode() {
  866 + return customscode;
  867 + }
  868 +
  869 + public void setCustomscode(String customscode) {
  870 + this.customscode = customscode;
  871 + }
  872 +
  873 + @Column(name = "AGENTMAN")
  874 + public String getAgentman() {
  875 + return agentman;
  876 + }
  877 +
  878 + public void setAgentman(String agentman) {
  879 + this.agentman = agentman;
  880 + }
  881 +
  882 + @Column(name = "AGENTCOMPANY")
  883 + public String getAgentcompany() {
  884 + return agentcompany;
  885 + }
  886 +
  887 + public void setAgentcompany(String agentcompany) {
  888 + this.agentcompany = agentcompany;
  889 + }
  890 +
  891 + @Column(name = "RECEIPTINFORMATION")
  892 + public String getReceiptinformation() {
  893 + return receiptinformation;
  894 + }
  895 +
  896 + public void setReceiptinformation(String receiptinformation) {
  897 + this.receiptinformation = receiptinformation;
  898 + }
  899 +
  900 + @Column(name = "CREATEDATE")
  901 + public Date getCreatedate() {
  902 + return createdate;
  903 + }
  904 +
  905 + public void setCreatedate(Date createdate) {
  906 + this.createdate = createdate;
  907 + }
  908 +
  909 + @Column(name = "PRODUCTNAME")
  910 + public String getProductname() {
  911 + return productname;
  912 + }
  913 +
  914 + public void setProductname(String productname) {
  915 + this.productname = productname;
  916 + }
  917 +
  918 + @Column(name = "UNNUMBER")
  919 + public String getUnnumber() {
  920 + return unnumber;
  921 + }
  922 +
  923 + public void setUnnumber(String unnumber) {
  924 + this.unnumber = unnumber;
  925 + }
  926 +
  927 + @Column(name = "CATEGORY")
  928 + public String getCategory() {
  929 + return category;
  930 + }
  931 +
  932 + public void setCategory(String category) {
  933 + this.category = category;
  934 + }
  935 +
  936 + @Column(name = "SH_COMPANY")
  937 + public String getSh_company() {
  938 + return sh_company;
  939 + }
  940 +
  941 + public void setSh_company(String sh_company) {
  942 + this.sh_company = sh_company;
  943 + }
  944 +
  945 + @Column(name = "SH_ADDRESS")
  946 + public String getSh_address() {
  947 + return sh_address;
  948 + }
  949 +
  950 + public void setSh_address(String sh_address) {
  951 + this.sh_address = sh_address;
  952 + }
  953 +
  954 + @Column(name = "SH_ZIPCODE")
  955 + public String getSh_zipcode() {
  956 + return sh_zipcode;
  957 + }
  958 +
  959 + public void setSh_zipcode(String sh_zipcode) {
  960 + this.sh_zipcode = sh_zipcode;
  961 + }
  962 +
  963 + @Column(name = "SH_CITY")
  964 + public String getSh_city() {
  965 + return sh_city;
  966 + }
  967 +
  968 + public void setSh_city(String sh_city) {
  969 + this.sh_city = sh_city;
  970 + }
  971 +
  972 + @Column(name = "SH_DELTANAME")
  973 + public String getSh_deltaname() {
  974 + return sh_deltaname;
  975 + }
  976 +
  977 + public void setSh_deltaname(String sh_deltaname) {
  978 + this.sh_deltaname = sh_deltaname;
  979 + }
  980 +
  981 + @Column(name = "SH_COUNTRY")
  982 + public String getSh_country() {
  983 + return sh_country;
  984 + }
  985 +
  986 + public void setSh_country(String sh_country) {
  987 + this.sh_country = sh_country;
  988 + }
  989 +
  990 + @Column(name = "SH_TELEPHONE")
  991 + public String getSh_telephone() {
  992 + return sh_telephone;
  993 + }
  994 +
  995 + public void setSh_telephone(String sh_telephone) {
  996 + this.sh_telephone = sh_telephone;
  997 + }
  998 +
  999 + @Column(name = "SH_FAX")
  1000 + public String getSh_fax() {
  1001 + return sh_fax;
  1002 + }
  1003 +
  1004 + public void setSh_fax(String sh_fax) {
  1005 + this.sh_fax = sh_fax;
  1006 + }
  1007 +
  1008 + @Column(name = "SH_NAME")
  1009 + public String getSh_name() {
  1010 + return sh_name;
  1011 + }
  1012 +
  1013 + public void setSh_name(String sh_name) {
  1014 + this.sh_name = sh_name;
  1015 + }
  1016 +
  1017 + @Column(name = "CO_COMPANY")
  1018 + public String getCo_company() {
  1019 + return co_company;
  1020 + }
  1021 +
  1022 + public void setCo_company(String co_company) {
  1023 + this.co_company = co_company;
  1024 + }
  1025 +
  1026 + @Column(name = "CO_ADDRESS")
  1027 + public String getCo_address() {
  1028 + return co_address;
  1029 + }
  1030 +
  1031 + public void setCo_address(String co_address) {
  1032 + this.co_address = co_address;
  1033 + }
  1034 +
  1035 + @Column(name = "CO_ZIPCODE")
  1036 + public String getCo_zipcode() {
  1037 + return co_zipcode;
  1038 + }
  1039 +
  1040 + public void setCo_zipcode(String co_zipcode) {
  1041 + this.co_zipcode = co_zipcode;
  1042 + }
  1043 +
  1044 + @Column(name = "CO_CITY")
  1045 + public String getCo_city() {
  1046 + return co_city;
  1047 + }
  1048 +
  1049 + public void setCo_city(String co_city) {
  1050 + this.co_city = co_city;
  1051 + }
  1052 +
  1053 + @Column(name = "CO_DELTANAME")
  1054 + public String getCo_deltaname() {
  1055 + return co_deltaname;
  1056 + }
  1057 +
  1058 + public void setCo_deltaname(String co_deltaname) {
  1059 + this.co_deltaname = co_deltaname;
  1060 + }
  1061 +
  1062 + @Column(name = "CO_COUNTRY")
  1063 + public String getCo_country() {
  1064 + return co_country;
  1065 + }
  1066 +
  1067 + public void setCo_country(String co_country) {
  1068 + this.co_country = co_country;
  1069 + }
  1070 +
  1071 + @Column(name = "CO_TELEPHONE")
  1072 + public String getCo_telephone() {
  1073 + return co_telephone;
  1074 + }
  1075 +
  1076 + public void setCo_telephone(String co_telephone) {
  1077 + this.co_telephone = co_telephone;
  1078 + }
  1079 +
  1080 + @Column(name = "CO_FAX")
  1081 + public String getCo_fax() {
  1082 + return co_fax;
  1083 + }
  1084 +
  1085 + public void setCo_fax(String co_fax) {
  1086 + this.co_fax = co_fax;
  1087 + }
  1088 +
  1089 + @Column(name = "CO_NAME")
  1090 + public String getCo_name() {
  1091 + return co_name;
  1092 + }
  1093 +
  1094 + public void setCo_name(String co_name) {
  1095 + this.co_name = co_name;
  1096 + }
  1097 +
  1098 + @Column(name = "REACH_STATION")
  1099 + public String getReach_station() {
  1100 + return reach_station;
  1101 + }
  1102 +
  1103 + public void setReach_station(String reach_station) {
  1104 + this.reach_station = reach_station;
  1105 + }
  1106 +
  1107 + @Column(name = "CARRIER1")
  1108 + public String getCarrier1() {
  1109 + return carrier1;
  1110 + }
  1111 +
  1112 + public void setCarrier1(String carrier1) {
  1113 + this.carrier1 = carrier1;
  1114 + }
  1115 +
  1116 + @Column(name = "REACH_STATION1")
  1117 + public String getReach_station1() {
  1118 + return reach_station1;
  1119 + }
  1120 +
  1121 + public void setReach_station1(String reach_station1) {
  1122 + this.reach_station1 = reach_station1;
  1123 + }
  1124 +
  1125 + @Column(name = "CARRIER2")
  1126 + public String getCarrier2() {
  1127 + return carrier2;
  1128 + }
  1129 +
  1130 + public void setCarrier2(String carrier2) {
  1131 + this.carrier2 = carrier2;
  1132 + }
  1133 +
  1134 + @Column(name = "REACH_STATION2")
  1135 + public String getReach_station2() {
  1136 + return reach_station2;
  1137 + }
  1138 +
  1139 + public void setReach_station2(String reach_station2) {
  1140 + this.reach_station2 = reach_station2;
  1141 + }
  1142 +
  1143 + @Column(name = "NAME_OFGOODS")
  1144 + public String getName_ofgoods() {
  1145 + return name_ofgoods;
  1146 + }
  1147 +
  1148 + public void setName_ofgoods(String name_ofgoods) {
  1149 + this.name_ofgoods = name_ofgoods;
  1150 + }
  1151 +
  1152 + @Column(name = "DELIVERY_STATION")
  1153 + public String getDelivery_station() {
  1154 + return delivery_station;
  1155 + }
  1156 +
  1157 + public void setDelivery_station(String delivery_station) {
  1158 + this.delivery_station = delivery_station;
  1159 + }
  1160 +
  1161 + // 该函数主要用于List的contains
  1162 + public boolean equals(Object mme) {
  1163 + if (mme == null)
1061 return false; 1164 return false;
  1165 + ManifestEntity me = (ManifestEntity) mme;
  1166 + if (me.getCo_company() == null && this.getCo_company() == null)
  1167 + return true;
  1168 + else if (this.getCo_company() != null) {
  1169 + // 在值相等的情况下，判断时间的大小
  1170 + if (this.getCo_company().equals(me.getCo_company())) {
  1171 + // 当前时间为null，直接返回true
  1172 + if (this.getSave_time() == null)
  1173 + return true;
  1174 + // 要比较的那个对象为null，直接返回false
  1175 + else if (me.getSave_time() == null)
  1176 + return false;
  1177 + else
  1178 + return this.getSave_time() > me.getSave_time();
  1179 + }
1062 } 1180 }
  1181 + return false;
  1182 + }
1063 } 1183 }
1064 -  
@@ -8,7 +8,6 @@ import javax.persistence.Entity; @@ -8,7 +8,6 @@ import javax.persistence.Entity;
8 import javax.persistence.Table; 8 import javax.persistence.Table;
9 9
10 import com.agent.entity.BasicEntity; 10 import com.agent.entity.BasicEntity;
11 -import com.ibm.disthub2.impl.matching.selector.ParseException;  
12 /** 11 /**
13 * Created by cohesion on 2017/8/9. 12 * Created by cohesion on 2017/8/9.
14 * <p/> 13 * <p/>
@@ -17,6 +16,18 @@ import com.ibm.disthub2.impl.matching.selector.ParseException; @@ -17,6 +16,18 @@ import com.ibm.disthub2.impl.matching.selector.ParseException;
17 @Entity 16 @Entity
18 @Table(name = "preparesecondary") 17 @Table(name = "preparesecondary")
19 public class PreparesecondaryEntity extends BasicEntity{ 18 public class PreparesecondaryEntity extends BasicEntity{
  19 + private String unlodingcode;// 卸货地代码
  20 + private String cnecusid;// 收货人代码
  21 + private String shpcusid;// 发货人代码
  22 + /**
  23 + * 发货人aeo
  24 + */
  25 + private String shpaeo;
  26 + /**
  27 + * 收货人aeo
  28 + */
  29 + private String cneaeo;
  30 +
20 /** 31 /**
21 * 32 *
22 */ 33 */
@@ -284,6 +295,36 @@ public class PreparesecondaryEntity extends BasicEntity{ @@ -284,6 +295,36 @@ public class PreparesecondaryEntity extends BasicEntity{
284 295
285 private Long USER_ID; 296 private Long USER_ID;
286 297
  298 + public String getUnlodingcode() {
  299 + return unlodingcode;
  300 + }
  301 + public void setUnlodingcode(String unlodingcode) {
  302 + this.unlodingcode = unlodingcode;
  303 + }
  304 + public String getCnecusid() {
  305 + return cnecusid;
  306 + }
  307 + public void setCnecusid(String cnecusid) {
  308 + this.cnecusid = cnecusid;
  309 + }
  310 + public String getShpcusid() {
  311 + return shpcusid;
  312 + }
  313 + public void setShpcusid(String shpcusid) {
  314 + this.shpcusid = shpcusid;
  315 + }
  316 + public String getShpaeo() {
  317 + return shpaeo;
  318 + }
  319 + public void setShpaeo(String shpaeo) {
  320 + this.shpaeo = shpaeo;
  321 + }
  322 + public String getCneaeo() {
  323 + return cneaeo;
  324 + }
  325 + public void setCneaeo(String cneaeo) {
  326 + this.cneaeo = cneaeo;
  327 + }
287 @Column(name = "USER_ID") 328 @Column(name = "USER_ID")
288 public Long getUSER_ID() { 329 public Long getUSER_ID() {
289 return USER_ID; 330 return USER_ID;
  1 +package com.agent.entity.agent;
  2 +
  3 +import java.util.Date;
  4 +
  5 +import javax.persistence.Entity;
  6 +import javax.persistence.Table;
  7 +
  8 +import com.agent.entity.BasicEntity;
  9 +
  10 +/**
  11 + *
  12 + * Depiction: 运单回执表
  13 + * <p>
  14 + * Modify:
  15 + * <p>
  16 + * Author: William Lynn
  17 + * <p>
  18 + * Create Date：2018年5月28日 下午2:05:28
  19 + *
  20 + */
  21 +@Entity
  22 +@Table(name = "WAYBILL_RECEIPT")
  23 +public class WaybillReceiprtEntity extends BasicEntity {
  24 + private String flightno;
  25 + private Date flightdate;
  26 + private String response_code;
  27 + private String response_text;
  28 + private String waybill_no;
  29 + private String sub_waybill_no;
  30 + private String carrier;
  31 + private String message_type;
  32 + private String sendtime;
  33 + private String piece;
  34 + private String weight;
  35 +
  36 + public String getFlightno() {
  37 + return flightno;
  38 + }
  39 +
  40 + public void setFlightno(String flightno) {
  41 + this.flightno = flightno;
  42 + }
  43 +
  44 + public Date getFlightdate() {
  45 + return flightdate;
  46 + }
  47 +
  48 + public void setFlightdate(Date flightdate) {
  49 + this.flightdate = flightdate;
  50 + }
  51 +
  52 + public String getResponse_code() {
  53 + return response_code;
  54 + }
  55 +
  56 + public void setResponse_code(String response_code) {
  57 + this.response_code = response_code;
  58 + }
  59 +
  60 + public String getResponse_text() {
  61 + return response_text;
  62 + }
  63 +
  64 + public void setResponse_text(String response_text) {
  65 + this.response_text = response_text;
  66 + }
  67 +
  68 + public String getWaybill_no() {
  69 + return waybill_no;
  70 + }
  71 +
  72 + public void setWaybill_no(String waybill_no) {
  73 + this.waybill_no = waybill_no;
  74 + }
  75 +
  76 + public String getSub_waybill_no() {
  77 + return sub_waybill_no;
  78 + }
  79 +
  80 + public void setSub_waybill_no(String sub_waybill_no) {
  81 + this.sub_waybill_no = sub_waybill_no;
  82 + }
  83 +
  84 + public String getCarrier() {
  85 + return carrier;
  86 + }
  87 +
  88 + public void setCarrier(String carrier) {
  89 + this.carrier = carrier;
  90 + }
  91 +
  92 + public String getMessage_type() {
  93 + return message_type;
  94 + }
  95 +
  96 + public void setMessage_type(String message_type) {
  97 + this.message_type = message_type;
  98 + }
  99 +
  100 + public String getSendtime() {
  101 + return sendtime;
  102 + }
  103 +
  104 + public void setSendtime(String sendtime) {
  105 + this.sendtime = sendtime;
  106 + }
  107 +
  108 + public String getPiece() {
  109 + return piece;
  110 + }
  111 +
  112 + public void setPiece(String piece) {
  113 + this.piece = piece;
  114 + }
  115 +
  116 + public String getWeight() {
  117 + return weight;
  118 + }
  119 +
  120 + public void setWeight(String weight) {
  121 + this.weight = weight;
  122 + }
  123 +
  124 + // 该函数主要用于List的contains
  125 + public boolean equals(Object mme) {
  126 + if (mme != null) {
  127 + WaybillReceiprtEntity me = (WaybillReceiprtEntity) mme;
  128 + if (me.getWaybill_no().equalsIgnoreCase(this.getWaybill_no())) {
  129 + return true;
  130 + }
  131 + }
  132 +
  133 + return false;
  134 + }
  135 +}
  1 +package com.agent.entity.agent;
  2 +
  3 +/**
  4 + * Depiction:回执报文类型
  5 + * <p>
  6 + * Modify:
  7 + * <p>
  8 + * Author: Kevin Lynn
  9 + * <p>
  10 + * Create Date：2018年2月13日 上午11:53:15
  11 + *
  12 + */
  13 +public enum WaybillReceiptType {
  14 + APPLY("已发送预配舱单申请报文", 2), UPDATE("已发送预配舱单修改报文", 4), DELETE("已发送预配舱单删除报文", 3);
  15 +
  16 + private String name;
  17 + private int value;
  18 +
  19 + private WaybillReceiptType(String name, int value) {
  20 + this.name = name;
  21 + this.value = value;
  22 + }
  23 +
  24 + public static String getName(int value) {
  25 + for (WaybillReceiptType role : WaybillReceiptType.values()) {
  26 + if (role.getValue() == value) {
  27 + return role.name;
  28 + }
  29 + }
  30 + return null;
  31 + }
  32 +
  33 + public static WaybillReceiptType valueOf(int value) {
  34 + for (WaybillReceiptType role : WaybillReceiptType.values()) {
  35 + if (role.getValue() == value) {
  36 + return role;
  37 + }
  38 + }
  39 + return null;
  40 + }
  41 +
  42 + public String getName() {
  43 + return name;
  44 + }
  45 +
  46 + public void setName(String name) {
  47 + this.name = name;
  48 + }
  49 +
  50 + public int getValue() {
  51 + return value;
  52 + }
  53 +
  54 + public void setValue(int value) {
  55 + this.value = value;
  56 + }
  57 +
  58 + @Override
  59 + public String toString() {
  60 + return "(" + this.value + "," + this.name + ")";
  61 + }
  62 +}
@@ -49,16 +49,16 @@ public class Utils { @@ -49,16 +49,16 @@ public class Utils {
49 49
50 public static boolean createDir(String destDirName) { 50 public static boolean createDir(String destDirName) {
51 File dir = new File(destDirName); 51 File dir = new File(destDirName);
52 - if (dir.exists()) {// �ж�Ŀ¼�Ƿ���� 52 + if (dir.exists()) {
53 return true; 53 return true;
54 }else{ 54 }else{
55 - if (!destDirName.endsWith(File.separator)) {// ��β�Ƿ���"/"���� 55 + if (!destDirName.endsWith(File.separator)) {
56 destDirName = destDirName + File.separator; 56 destDirName = destDirName + File.separator;
57 } 57 }
58 - if (dir.mkdirs()) {// ����Ŀ��Ŀ¼ 58 + if (dir.mkdirs()) {
59 return true; 59 return true;
60 } else { 60 } else {
61 - logger.info("����Ŀ¼ʧ�ܣ� Ŀ¼��ƣ�"+destDirName); 61 + logger.info("创建目录失败-->"+destDirName);
62 return false; 62 return false;
63 } 63 }
64 } 64 }
@@ -10,49 +10,56 @@ import org.jdom.Element; @@ -10,49 +10,56 @@ import org.jdom.Element;
10 import org.jdom.JDOMException; 10 import org.jdom.JDOMException;
11 import org.jdom.input.SAXBuilder; 11 import org.jdom.input.SAXBuilder;
12 import org.xml.sax.InputSource; 12 import org.xml.sax.InputSource;
13 -import org.xml.sax.SAXParseException;  
14 13
15 public class XMPParse { 14 public class XMPParse {
16 - 15 +
17 /* 16 /*
18 * 把XML节点值转成日期类型 17 * 把XML节点值转成日期类型
19 - * @param xmlFile XML文件路径名  
20 - * @param xmlNodePath 节点路径(从根节点算起)  
21 - * @return 如果节点有值，需要把ISO8601的时间字符串转成日期，否则返回null  
22 - * * */  
23 - public static final Date nodeValue2Date(String xmlFile,String xmlNodePath){  
24 - String str = getNodeValue(xmlFile,xmlNodePath);  
25 - if (!"".equals(str)){ 18 + *
  19 + * @param xmlFile XML文件路径名
  20 + *
  21 + * @param xmlNodePath 节点路径(从根节点算起)
  22 + *
  23 + * @return 如果节点有值，需要把ISO8601的时间字符串转成日期，否则返回null *
  24 + */
  25 + public static final Date nodeValue2Date(String xmlFile, String xmlNodePath) {
  26 + String str = getNodeValue(xmlFile, xmlNodePath);
  27 + if (!"".equals(str)) {
26 return Utils.iso8601DateStrToDate(str); 28 return Utils.iso8601DateStrToDate(str);
27 } 29 }
28 return null; 30 return null;
29 } 31 }
30 - 32 +
31 /* 33 /*
32 * 把XML节点值转成日期类型,如果节点值不存在，使用默认值 34 * 把XML节点值转成日期类型,如果节点值不存在，使用默认值
33 - * @param xmlFile XML文件路径名  
34 - * @param xmlNodePath 节点路径(从根节点算起)  
35 - * @return 如果节点有值，需要把ISO8601的时间字符串转成日期，否则返回给定的默认值  
36 - * */  
37 - public static final Date nodeValue2Date(String xmlFile,String xmlNodePath,Date date){  
38 - String str = getNodeValue(xmlFile,xmlNodePath);  
39 - if (!"".equals(str)){ 35 + *
  36 + * @param xmlFile XML文件路径名
  37 + *
  38 + * @param xmlNodePath 节点路径(从根节点算起)
  39 + *
  40 + * @return 如果节点有值，需要把ISO8601的时间字符串转成日期，否则返回给定的默认值
  41 + */
  42 + public static final Date nodeValue2Date(String xmlFile, String xmlNodePath, Date date) {
  43 + String str = getNodeValue(xmlFile, xmlNodePath);
  44 + if (!"".equals(str)) {
40 return Utils.iso8601DateStrToDate(str); 45 return Utils.iso8601DateStrToDate(str);
41 } 46 }
42 return date; 47 return date;
43 } 48 }
44 -  
45 - 49 +
46 /* 50 /*
47 * 把XML节点属性值转成日期类型,如果节点值不存在，使用默认值 51 * 把XML节点属性值转成日期类型,如果节点值不存在，使用默认值
48 - * @param xmlFile XML文件路径名  
49 - * @param xmlNodePath 节点路径(从根节点算起)  
50 - * @return 如果节点属性有值，需要把ISO8601的时间字符串转成日期，否则返回给定的默认值  
51 - * */  
52 -  
53 - public static final Date nodeAttribute2Date(String xmlFile,String xmlNodePath,String attributeName,Date date){  
54 - String str = getNodeAttribute(xmlFile,xmlNodePath,attributeName,"");  
55 - if (!"".equals(str)){ 52 + *
  53 + * @param xmlFile XML文件路径名
  54 + *
  55 + * @param xmlNodePath 节点路径(从根节点算起)
  56 + *
  57 + * @return 如果节点属性有值，需要把ISO8601的时间字符串转成日期，否则返回给定的默认值
  58 + */
  59 +
  60 + public static final Date nodeAttribute2Date(String xmlFile, String xmlNodePath, String attributeName, Date date) {
  61 + String str = getNodeAttribute(xmlFile, xmlNodePath, attributeName, "");
  62 + if (!"".equals(str)) {
56 return Utils.iso8601DateStrToDate(str); 63 return Utils.iso8601DateStrToDate(str);
57 } 64 }
58 return date; 65 return date;
@@ -60,156 +67,139 @@ public class XMPParse { @@ -60,156 +67,139 @@ public class XMPParse {
60 67
61 /* 68 /*
62 * 根据指定的节点路径从XML节点取得节点的值 69 * 根据指定的节点路径从XML节点取得节点的值
63 - * @param xmlNodePath 节点的路径，从根节点开始  
64 - * 如果某个节点不存在那么返回空字符串""  
65 - * */  
66 - public static final String getNodeValue(String xmlFile,String xmlNodePath){  
67 - String[] nodes= xmlNodePath.split("/");  
68 - Document document = new Document();  
69 - SAXBuilder builder = new SAXBuilder();  
70 - Element root = null;  
71 - 70 + *
  71 + * @param xmlNodePath 节点的路径，从根节点开始 如果某个节点不存在那么返回空字符串""
  72 + */
  73 + public static final String getNodeValue(String xmlFile, String xmlNodePath) {
  74 + String[] nodes = xmlNodePath.split("/");
  75 + Document document = new Document();
  76 + SAXBuilder builder = new SAXBuilder();
  77 + Element root = null;
  78 +
72 LinkedList<SubNode> listNode = new LinkedList<SubNode>(); 79 LinkedList<SubNode> listNode = new LinkedList<SubNode>();
73 -  
74 - String value="";  
75 - try {  
76 - // 将解析器与文档关联  
77 -  
78 - document = builder.build(xmlFile);  
79 - //builder.build(systemId);  
80 - for(int i=1; i< nodes.length; i++){  
81 - if(i > 1){  
82 - SubNode s = (SubNode)listNode.getLast();  
83 - List<Element> eList = s.getElement().getChildren(nodes[i]);  
84 - //�ж��Ƿ����ӽڵ�  
85 - if (null != eList && eList.size()>0){  
86 - SubNode s1 = new SubNode(eList.get(0));  
87 - listNode.add(s1);  
88 - }  
89 - }else if (1 == i){  
90 - root = document.getRootElement();  
91 - SubNode snode= new SubNode(root);  
92 - listNode.add(snode);  
93 - }  
94 - }  
95 - SubNode n = listNode.getLast();;  
96 - value = n.getElement().getText();  
97 - n = null;  
98 - } catch (Exception e1) {  
99 - e1.printStackTrace();  
100 - } finally{  
101 - listNode.clear();  
102 - document = null;  
103 - root = null;  
104 - builder = null;  
105 - nodes = null;  
106 - }  
107 - System.out.println("key="+xmlNodePath + " value="+value);  
108 - return value; 80 +
  81 + String value = "";
  82 + try {
  83 + // 将解析器与文档关联
  84 + document = builder.build(xmlFile);
  85 + // builder.build(systemId);
  86 + for (int i = 1; i < nodes.length; i++) {
  87 + if (i > 1) {
  88 + SubNode s = (SubNode) listNode.getLast();
  89 + List<Element> eList = s.getElement().getChildren(nodes[i]);
  90 + if (null != eList && eList.size() > 0) {
  91 + SubNode s1 = new SubNode(eList.get(0));
  92 + listNode.add(s1);
  93 + }
  94 + } else if (1 == i) {
  95 + root = document.getRootElement();
  96 + SubNode snode = new SubNode(root);
  97 + listNode.add(snode);
  98 + }
  99 + }
  100 + SubNode n = listNode.getLast();
  101 + ;
  102 + value = n.getElement().getText();
  103 + n = null;
  104 + } catch (Exception e1) {
  105 + e1.printStackTrace();
  106 + } finally {
  107 + listNode.clear();
  108 + document = null;
  109 + root = null;
  110 + builder = null;
  111 + nodes = null;
  112 + }
  113 + System.out.println("key=" + xmlNodePath + " value=" + value);
  114 + return value;
109 } 115 }
110 -  
111 - /*  
112 - * ���ָ���Ľڵ�·����XML�ڵ�ȡ�ýڵ��ֵ  
113 - * @param xmlNodePath �ڵ��·�����Ӹ�ڵ㿪ʼ  
114 - * ���ij���ڵ㲻������ô���ؿ��ַ�""  
115 - * */  
116 - public static final String getNodeValueFromXmlString(String xmlString,String xmlNodePath) throws Exception{  
117 - String[] nodes= xmlNodePath.split("/");  
118 - Document document = new Document();  
119 - SAXBuilder builder = new SAXBuilder();  
120 - Element root = null;  
121 - 116 +
  117 + public static final String getNodeValueFromXmlString(String xmlString, String xmlNodePath) throws Exception {
  118 + String[] nodes = xmlNodePath.split("/");
  119 + Document document = new Document();
  120 + SAXBuilder builder = new SAXBuilder();
  121 + Element root = null;
  122 +
122 LinkedList<SubNode> listNode = new LinkedList<SubNode>(); 123 LinkedList<SubNode> listNode = new LinkedList<SubNode>();
123 -  
124 - String value="";  
125 - try {  
126 - // �����������ĵ�����  
127 -  
128 - StringReader xmlReader = new StringReader(xmlString);  
129 - InputSource xmlSource = new InputSource(xmlReader);  
130 - document = builder.build(xmlSource);  
131 - for(int i=1; i< nodes.length; i++){  
132 - if(i > 1){  
133 - SubNode s = (SubNode)listNode.getLast();  
134 - List<Element> eList = s.getElement().getChildren(nodes[i]);  
135 - //�ж��Ƿ����ӽڵ�  
136 - if (null != eList && eList.size()>0){  
137 - SubNode s1 = new SubNode(eList.get(0));  
138 - listNode.add(s1);  
139 - }  
140 - }else if (1 == i){  
141 - root = document.getRootElement();  
142 - SubNode snode= new SubNode(root);  
143 - listNode.add(snode);  
144 - }  
145 - }  
146 - SubNode n = listNode.getLast();;  
147 - value = n.getElement().getText();  
148 - n = null;  
149 - } catch (Exception e1) {  
150 - e1.printStackTrace();  
151 - throw e1;  
152 - } finally{  
153 - listNode.clear();  
154 - document = null;  
155 - root = null;  
156 - builder = null;  
157 - nodes = null;  
158 - }  
159 - //System.out.println("key="+xmlNodePath + " value="+value);  
160 - return value; 124 +
  125 + String value = "";
  126 + try {
  127 + StringReader xmlReader = new StringReader(xmlString);
  128 + InputSource xmlSource = new InputSource(xmlReader);
  129 + document = builder.build(xmlSource);
  130 + for (int i = 1; i < nodes.length; i++) {
  131 + if (i > 1) {
  132 + SubNode s = (SubNode) listNode.getLast();
  133 + List<Element> eList = s.getElement().getChildren(nodes[i]);
  134 + if (null != eList && eList.size() > 0) {
  135 + SubNode s1 = new SubNode(eList.get(0));
  136 + listNode.add(s1);
  137 + }
  138 + } else if (1 == i) {
  139 + root = document.getRootElement();
  140 + SubNode snode = new SubNode(root);
  141 + listNode.add(snode);
  142 + }
  143 + }
  144 + SubNode n = listNode.getLast();
  145 + ;
  146 + value = n.getElement().getText();
  147 + n = null;
  148 + } catch (Exception e1) {
  149 + e1.printStackTrace();
  150 + throw e1;
  151 + } finally {
  152 + listNode.clear();
  153 + document = null;
  154 + root = null;
  155 + builder = null;
  156 + nodes = null;
  157 + }
  158 + // System.out.println("key="+xmlNodePath + " value="+value);
  159 + return value;
161 } 160 }
162 -  
163 161
164 - /*  
165 - * ���ָ���Ľڵ�·����XML�ڵ�ȡ�ýڵ������ֵ  
166 - * @param xmlNodePath �ڵ��·�����Ӹ�ڵ㿪ʼ  
167 - * @param attributeName �ڵ���������  
168 - * @defaultValue Ĭ��ֵ  
169 - * ���ij���ڵ㲻���ڣ����߽ڵ㲻����ָ�������ԣ���ô����Ĭ��ֵ  
170 - * */  
171 - public static final String getNodeAttribute(String xmlFile,String xmlNodePath,String attributeName,String defaultValue){  
172 - String[] nodes= xmlNodePath.split("/");  
173 - Document document = new Document();  
174 - SAXBuilder builder = new SAXBuilder();  
175 - Element root = null;  
176 - 162 + public static final String getNodeAttribute(String xmlFile, String xmlNodePath, String attributeName,
  163 + String defaultValue) {
  164 + String[] nodes = xmlNodePath.split("/");
  165 + Document document = new Document();
  166 + SAXBuilder builder = new SAXBuilder();
  167 + Element root = null;
  168 +
177 LinkedList<SubNode> listNode = new LinkedList<SubNode>(); 169 LinkedList<SubNode> listNode = new LinkedList<SubNode>();
178 - String value="";  
179 - try {  
180 - document = builder.build(xmlFile);  
181 - for(int i=1; i< nodes.length; i++){  
182 - if(i > 1){  
183 - SubNode s = (SubNode)listNode.getLast();  
184 - List<Element> eList = s.getElement().getChildren(nodes[i]);  
185 - //�ж��Ƿ����ӽڵ�  
186 - if (null != eList && eList.size()>0){  
187 - SubNode s1 = new SubNode(eList.get(0));  
188 - listNode.add(s1);  
189 - }  
190 - }else if (1 == i){  
191 - root = document.getRootElement();  
192 - SubNode snode= new SubNode(root);  
193 - listNode.add(snode);  
194 - }  
195 - }  
196 - SubNode n = listNode.getLast();  
197 - value = n.getElement().getAttributeValue(attributeName, defaultValue);  
198 - n = null;  
199 - } catch (JDOMException e1) {  
200 - e1.printStackTrace();  
201 - } catch (IOException e1) {  
202 - e1.printStackTrace();  
203 - }finally{  
204 - listNode.clear();  
205 - document = null;  
206 - root = null;  
207 - builder = null;  
208 - nodes = null;  
209 - }  
210 - System.out.println("key="+xmlNodePath + " node attrivte value="+value);  
211 - return value; 170 + String value = "";
  171 + try {
  172 + document = builder.build(xmlFile);
  173 + for (int i = 1; i < nodes.length; i++) {
  174 + if (i > 1) {
  175 + SubNode s = (SubNode) listNode.getLast();
  176 + List<Element> eList = s.getElement().getChildren(nodes[i]);
  177 + if (null != eList && eList.size() > 0) {
  178 + SubNode s1 = new SubNode(eList.get(0));
  179 + listNode.add(s1);
  180 + }
  181 + } else if (1 == i) {
  182 + root = document.getRootElement();
  183 + SubNode snode = new SubNode(root);
  184 + listNode.add(snode);
  185 + }
  186 + }
  187 + SubNode n = listNode.getLast();
  188 + value = n.getElement().getAttributeValue(attributeName, defaultValue);
  189 + n = null;
  190 + } catch (JDOMException e1) {
  191 + e1.printStackTrace();
  192 + } catch (IOException e1) {
  193 + e1.printStackTrace();
  194 + } finally {
  195 + listNode.clear();
  196 + document = null;
  197 + root = null;
  198 + builder = null;
  199 + nodes = null;
  200 + }
  201 + System.out.println("key=" + xmlNodePath + " node attrivte value=" + value);
  202 + return value;
212 } 203 }
213 -  
214 204
215 } 205 }
  1 +package com.agent.listener;
  2 +
  3 +import org.springframework.context.ApplicationListener;
  4 +import org.springframework.context.event.ContextRefreshedEvent;
  5 +
  6 +/**
  7 + * Depiction:服务启动之后初始化一些操作
  8 + * <p>
  9 + * Modify:
  10 + * <p>
  11 + * Author: William Lynn
  12 + * <p>
  13 + * Create Date：2018年6月8日 下午2:49:54
  14 + *
  15 + */
  16 +public class StartupListener implements ApplicationListener<ContextRefreshedEvent> {
  17 + // private final static String DISPLAY_NAME = "Root WebApplicationContext";
  18 + private final static String DISPLAY_NAME = "WebApplicationContext for namespace 'webMvc-servlet'";
  19 +
  20 + @Override
  21 + public void onApplicationEvent(ContextRefreshedEvent event) {
  22 + String displayName = event.getApplicationContext().getDisplayName();
  23 + System.err.println("");
  24 + System.err.println(getClass().getSimpleName() + ":displayName is " + displayName);
  25 + if (DISPLAY_NAME.equalsIgnoreCase(displayName)) {
  26 + System.err.println(getClass().getSimpleName() + ": you can init some");
  27 + }
  28 +
  29 + // if (event.getApplicationContext().getParent() == null) {
  30 + // System.err.println(getClass().getSimpleName() + ": you can init some");
  31 + // IMFCustomReceiptMessageTask task = new IMFCustomReceiptMessageTask();
  32 + // task.start();
  33 + // }
  34 + }
  35 +
  36 +}
  1 +package com.agent.repository.agent;
  2 +
  3 +import java.util.List;
  4 +
  5 +import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
  6 +import org.springframework.data.jpa.repository.Modifying;
  7 +import org.springframework.data.jpa.repository.Query;
  8 +import org.springframework.data.repository.PagingAndSortingRepository;
  9 +import org.springframework.transaction.annotation.Transactional;
  10 +
  11 +import com.agent.entity.agent.ConsignorEntity;
  12 +
  13 +public interface ConsignorRepository
  14 + extends PagingAndSortingRepository<ConsignorEntity, Long>, JpaSpecificationExecutor<ConsignorEntity> {
  15 +
  16 + @Query(value = "SELECT * FROM CONSIGNOR WHERE SHPCUSID = ?1 AND CO_COMPANY = ?2 ORDER BY ID DESC", nativeQuery = true)
  17 + public List<ConsignorEntity> findByCodeAndCompany(String shpcusid, String co_company);
  18 +
  19 + @Query(value = "SELECT * FROM CONSIGNOR WHERE SHPCUSID = ?1 ORDER BY ID DESC", nativeQuery = true)
  20 + public List<ConsignorEntity> findByCode(String code);
  21 +
  22 + @Query(value = "SELECT * FROM CONSIGNOR WHERE CO_COMPANY = ?1 ORDER BY ID DESC", nativeQuery = true)
  23 + public List<ConsignorEntity> findByCompany(String company);
  24 +
  25 + @Query(value = "SELECT * FROM CONSIGNOR WHERE ID = ?1 ORDER BY ID DESC", nativeQuery = true)
  26 + public List<ConsignorEntity> findById(String id);
  27 +
  28 + @Query(value = "SELECT * FROM CONSIGNOR ORDER BY ID DESC", nativeQuery = true)
  29 + public List<ConsignorEntity> getAll();
  30 +
  31 + @Query(value = "SELECT * FROM CONSIGNOR WHERE CREATOR = ?1 ORDER BY ID DESC", nativeQuery = true)
  32 + public List<ConsignorEntity> getAllByUserId(long user_id);
  33 +
  34 + @Modifying
  35 + @Query(value = "DELETE FROM CONSIGNOR WHERE ID = ?1", nativeQuery = true)
  36 + void deleteById(Long id);
  37 +
  38 + // 关于，，，，，，，，，，，
  39 + @Transactional
  40 + @Modifying(clearAutomatically = true)
  41 + @Query(value = "INSERT INTO CONSIGNOR(CO_NAME, CO_TELEPHONE, CO_COMPANY, CO_COUNTRY, CO_DELTANAME, CO_CITY, CO_ADDRESS, CO_ZIPCODE, CO_FAX, SHPAEO,SHPCUSID) VALUES(?1,?2,?3,?4,?5,?6,?7,?8,?9,?10,?11)", nativeQuery = true)
  42 + public int save(String co_name, String co_telephone, String co_company, String co_country,
  43 + String co_deltaname, String co_city, String co_address, String co_zipcode, String co_fax, String shpaeo,
  44 + String shpcusid);
  45 +
  46 + @Query(value = "SELECT * FROM CONSIGNOR WHERE ID=?1", nativeQuery = true)
  47 + public List<ConsignorEntity> queryById(Long id);
  48 +}
@@ -7,7 +7,6 @@ import org.springframework.data.jpa.repository.Modifying; @@ -7,7 +7,6 @@ import org.springframework.data.jpa.repository.Modifying;
7 import org.springframework.data.jpa.repository.Query; 7 import org.springframework.data.jpa.repository.Query;
8 import org.springframework.data.repository.PagingAndSortingRepository; 8 import org.springframework.data.repository.PagingAndSortingRepository;
9 9
10 -import com.agent.entity.agent.ManifestEntity;  
11 import com.agent.entity.agent.PreparesecondaryEntity; 10 import com.agent.entity.agent.PreparesecondaryEntity;
12 11
13 public interface PreparesecondaryRepository extends PagingAndSortingRepository<PreparesecondaryEntity, Long>, 12 public interface PreparesecondaryRepository extends PagingAndSortingRepository<PreparesecondaryEntity, Long>,
@@ -30,6 +29,6 @@ JpaSpecificationExecutor<PreparesecondaryEntity>{ @@ -30,6 +29,6 @@ JpaSpecificationExecutor<PreparesecondaryEntity>{
30 @Modifying 29 @Modifying
31 @Query(value = "SELECT * FROM PREPARESECONDARY ", nativeQuery = true) 30 @Query(value = "SELECT * FROM PREPARESECONDARY ", nativeQuery = true)
32 List<PreparesecondaryEntity> queryAll(); 31 List<PreparesecondaryEntity> queryAll();
33 - @Query(value = "SELECT * FROM PREPARESECONDARY=?1", nativeQuery = true) 32 + @Query(value = "SELECT * FROM PREPARESECONDARY WHERE USER_ID=?1", nativeQuery = true)
34 List<PreparesecondaryEntity> queryByUserId(Long user_id); 33 List<PreparesecondaryEntity> queryByUserId(Long user_id);
35 } 34 }
1 package com.agent.repository.agent; 1 package com.agent.repository.agent;
2 2
3 3
4 -import com.agent.entity.agent.SupervisionEntity; 4 +import java.util.List;
  5 +
5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor; 6 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
6 -import org.springframework.data.jpa.repository.Modifying;  
7 import org.springframework.data.jpa.repository.Query; 7 import org.springframework.data.jpa.repository.Query;
8 import org.springframework.data.repository.PagingAndSortingRepository; 8 import org.springframework.data.repository.PagingAndSortingRepository;
9 9
10 -import java.util.List; 10 +import com.agent.entity.agent.SupervisionEntity;
11 11
12 public interface SupervisionRepository extends PagingAndSortingRepository<SupervisionEntity, Long>, 12 public interface SupervisionRepository extends PagingAndSortingRepository<SupervisionEntity, Long>,
13 JpaSpecificationExecutor<SupervisionEntity> { 13 JpaSpecificationExecutor<SupervisionEntity> {
  1 +package com.agent.repository.agent;
  2 +
  3 +import java.util.List;
  4 +
  5 +import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
  6 +import org.springframework.data.jpa.repository.Modifying;
  7 +import org.springframework.data.jpa.repository.Query;
  8 +import org.springframework.data.repository.PagingAndSortingRepository;
  9 +import org.springframework.transaction.annotation.Transactional;
  10 +
  11 +import com.agent.entity.agent.WaybillReceiprtEntity;
  12 +
  13 +public interface WaybillReceiptRepository
  14 + extends PagingAndSortingRepository<WaybillReceiprtEntity, Long>, JpaSpecificationExecutor<WaybillReceiprtEntity> {
  15 +
  16 + @Query(value = "SELECT * FROM WAYBILL_RECEIPT WHERE WAYBILL_NO = ?1 AND SUB_WAYBILL_NO = ?2 ORDER BY ID DESC", nativeQuery = true)
  17 + public List<WaybillReceiprtEntity> findByWaybillNoAndSub(String waybill_no, String sub_waybill_no);
  18 +
  19 + @Query(value = "SELECT * FROM WAYBILL_RECEIPT WHERE WAYBILL_NO = ?1 ORDER BY ID DESC", nativeQuery = true)
  20 + public List<WaybillReceiprtEntity> findByWaybillNo(String waybill_no);
  21 +
  22 + @Query(value = "SELECT * FROM WAYBILL_RECEIPT WHERE ID = ?1 ORDER BY ID DESC", nativeQuery = true)
  23 + public List<WaybillReceiprtEntity> findById(String id);
  24 +
  25 + @Query(value = "SELECT * FROM WAYBILL_RECEIPT ORDER BY ID DESC", nativeQuery = true)
  26 + public List<WaybillReceiprtEntity> getAll();
  27 +
  28 + @Modifying
  29 + @Query(value = "DELETE FROM WAYBILL_RECEIPT WHERE ID = ?1", nativeQuery = true)
  30 + void deleteById(Long id);
  31 +
  32 + // 关于，，，，，，，，，，，
  33 + @Transactional
  34 + @Modifying(clearAutomatically = true)
  35 + @Query(value = "INSERT INTO WAYBILL_RECEIPT(FLIGHTNO, FLIGHTDATE, RESPONSE_CODE, RESPONSE_TEXT, WAYBILL_NO, SUB_WAYBILL_NO, CARRIER, MESSAGE_TYPE, SENDTIME) VALUES(?1,?2,?3,?4,?5,?6,?7,?8,?9)", nativeQuery = true)
  36 + public int save(String flightno, String flightdate, String response_code, String response_text,
  37 + String waybill_no, String sub_waybill_no, String carrier, String message_type,String sendtime);
  38 +
  39 + @Query(value = "SELECT * FROM WAYBILL_RECEIPT WHERE ID=?1", nativeQuery = true)
  40 + public List<WaybillReceiprtEntity> queryById(Long id);
  41 +}
1 package com.agent.service.agent; 1 package com.agent.service.agent;
2 2
3 3
4 -import com.agent.entity.agent.BasicAgentEntity;  
5 -import com.agent.entity.agent.ConsigneeEntity;  
6 -import com.agent.entity.agent.ConsigneeInfo;  
7 -import com.agent.entity.agent.ManifestEntity;  
8 -import com.agent.repository.agent.ConsigneeRepository;  
9 -import com.agent.service.BasicService;  
10 -import com.alibaba.fastjson.JSONObject;  
11 -import com.framework.util.MD5Tools;  
12 -import com.google.common.base.Splitter;  
13 -import com.plugin.easyui.EasyPage; 4 +import java.util.List;
  5 +
  6 +import javax.annotation.Resource;
14 7
15 import org.apache.commons.collections.CollectionUtils; 8 import org.apache.commons.collections.CollectionUtils;
16 -import org.apache.commons.lang.StringUtils;  
17 import org.springframework.data.domain.Page; 9 import org.springframework.data.domain.Page;
18 import org.springframework.data.domain.PageRequest; 10 import org.springframework.data.domain.PageRequest;
19 -import org.springframework.data.domain.Sort;  
20 -import org.springframework.data.domain.Sort.Direction;  
21 import org.springframework.data.jpa.domain.Specification; 11 import org.springframework.data.jpa.domain.Specification;
22 import org.springframework.stereotype.Service; 12 import org.springframework.stereotype.Service;
23 import org.springframework.transaction.annotation.Transactional; 13 import org.springframework.transaction.annotation.Transactional;
24 14
25 -import javax.annotation.Resource;  
26 -import java.util.List; 15 +import com.agent.entity.agent.ConsigneeEntity;
  16 +import com.agent.repository.agent.ConsigneeRepository;
  17 +import com.agent.service.BasicService;
  18 +import com.google.common.base.Splitter;
  19 +import com.plugin.easyui.EasyPage;
27 20
28 21
29 @Service 22 @Service
  1 +package com.agent.service.agent;
  2 +
  3 +import java.util.Date;
  4 +import java.util.List;
  5 +
  6 +import javax.annotation.Resource;
  7 +
  8 +import org.apache.commons.collections.CollectionUtils;
  9 +import org.apache.commons.lang.StringUtils;
  10 +import org.springframework.stereotype.Service;
  11 +import org.springframework.transaction.annotation.Transactional;
  12 +
  13 +import com.agent.entity.agent.ConsignorEntity;
  14 +import com.agent.entity.agent.ManifestEntity;
  15 +import com.agent.entity.agent.PreparesecondaryEntity;
  16 +import com.agent.repository.agent.ConsignorRepository;
  17 +import com.agent.service.BasicService;
  18 +import com.google.common.base.Splitter;
  19 +
  20 +import tools.Tools;
  21 +
  22 +/**
  23 + *
  24 + * Depiction:发货人数据库操作
  25 + * <p>
  26 + * Modify:
  27 + * <p>
  28 + * Author: William Lynn
  29 + * <p>
  30 + * Create Date：2018年5月28日 下午2:25:53
  31 + *
  32 + */
  33 +@Service
  34 +public class ConsignorService extends BasicService<ConsignorEntity> {
  35 +
  36 + @Resource
  37 + private ConsignorRepository service;
  38 +
  39 + @Transactional
  40 + public void deleteAll(String ids) {
  41 + List<String> list = Splitter.on(",").trimResults().omitEmptyStrings().splitToList(ids);
  42 + for (String id : list) {
  43 + service.delete(Long.valueOf(id));
  44 + }
  45 + }
  46 +
  47 + public ConsignorEntity findByCodeAndName(String code, String company) {
  48 + List<ConsignorEntity> consigns = service.findByCodeAndCompany(code, company);
  49 + if (CollectionUtils.isNotEmpty(consigns)) {
  50 + return consigns.get(0);
  51 + }
  52 + return null;
  53 + }
  54 +
  55 + public ConsignorEntity findByCode(String code) {
  56 + List<ConsignorEntity> consigns = service.findByCode(code);
  57 + if (CollectionUtils.isNotEmpty(consigns)) {
  58 + return consigns.get(0);
  59 + }
  60 + return null;
  61 + }
  62 +
  63 + public ConsignorEntity findByCompany(String company) {
  64 + List<ConsignorEntity> consigns = service.findByCompany(company);
  65 + if (CollectionUtils.isNotEmpty(consigns)) {
  66 + return consigns.get(0);
  67 + }
  68 + return null;
  69 + }
  70 +
  71 + public void save(ConsignorEntity c) {
  72 + if (c != null) {
  73 + if (c.getCreateDate() == null) {
  74 + c.setCreateDate(new Date());
  75 + }
  76 +
  77 + if (c.getModifyDate() == null) {
  78 + c.setModifyDate(new Date());
  79 + }
  80 + service.save(c);
  81 + }
  82 + }
  83 +
  84 + public List<ConsignorEntity> findAll() {
  85 + return service.getAll();
  86 + }
  87 +
  88 + public List<ConsignorEntity> findAllByUserId(long user_id) {
  89 + return service.getAllByUserId(user_id);
  90 + }
  91 +
  92 + public void update(ConsignorEntity c) {
  93 + service.save(c);
  94 + }
  95 +
  96 + public List<ConsignorEntity> findById(String id) {
  97 + return service.findById(id);
  98 + }
  99 +
  100 + public void saveFromManifest(ManifestEntity manifest) {
  101 + if (manifest != null && StringUtils.isNotBlank(manifest.getCo_company())) {
  102 + ConsignorEntity bean = new ConsignorEntity();
  103 + bean.setCo_address(manifest.getCo_address());
  104 + bean.setCo_city(manifest.getCo_city());
  105 + bean.setCo_company(manifest.getCo_company());
  106 + bean.setCo_country(manifest.getCo_country());
  107 + bean.setCo_deltaname(manifest.getCo_deltaname());
  108 + bean.setCo_fax(manifest.getCo_fax());
  109 + bean.setCo_name(manifest.getCo_name());
  110 + bean.setCo_telephone(manifest.getCo_telephone());
  111 + bean.setCo_zipcode(manifest.getCo_zipcode());
  112 + bean.setShpaeo(manifest.getShpaeo());
  113 + bean.setShpcusid(manifest.getShpcusid());
  114 + bean.setModifyDate(new Date());
  115 + bean.setCreateDate(new Date());
  116 + bean.setCreator(Tools.getUserEntity());
  117 + bean.setModifier(Tools.getUserEntity());
  118 +
  119 + ConsignorEntity old = findByCompany(manifest.getCo_company());
  120 + if (old != null) {
  121 + service.delete(old.getId());
  122 + }
  123 + save(bean);
  124 + }
  125 + }
  126 +
  127 + public void saveFromPreparesecondary(PreparesecondaryEntity prepare) {
  128 + if (prepare != null && StringUtils.isNotBlank(prepare.getCo_company())) {
  129 + ConsignorEntity bean = new ConsignorEntity();
  130 + bean.setCo_address(prepare.getCo_address());
  131 + bean.setCo_city(prepare.getCo_city());
  132 + bean.setCo_company(prepare.getCo_company());
  133 + bean.setCo_country(prepare.getCo_country());
  134 + bean.setCo_deltaname(prepare.getCo_deltaname());
  135 + bean.setCo_fax(prepare.getCo_fax());
  136 + bean.setCo_name(prepare.getCo_name());
  137 + bean.setCo_telephone(prepare.getCo_telephone());
  138 + bean.setCo_zipcode(prepare.getCo_zipcode());
  139 + bean.setShpaeo(prepare.getShpaeo());
  140 + bean.setShpcusid(prepare.getShpcusid());
  141 + bean.setModifyDate(new Date());
  142 + bean.setCreateDate(new Date());
  143 + bean.setCreator(Tools.getUserEntity());
  144 + bean.setModifier(Tools.getUserEntity());
  145 +
  146 + ConsignorEntity old = findByCompany(prepare.getCo_company());
  147 + if (old != null) {
  148 + service.delete(old.getId());
  149 + }
  150 + save(bean);
  151 +
  152 + }
  153 + }
  154 +
  155 + // public Page<ConsignorEntity> getPage(EasyPage<ConsigneeEntity> pageForm) {
  156 + // PageRequest pageRequest = buildPageRequest(pageForm);
  157 + // Specification<ConsignorEntity> spec = buildSpecification(pageForm);
  158 + // Page<ConsignorEntity> page = service.findAll(spec, pageRequest);
  159 + // return page;
  160 + // }
  161 +}
1 package com.agent.service.agent; 1 package com.agent.service.agent;
2 2
3 3
4 -import com.agent.entity.Constant;  
5 -import com.agent.entity.agent.*;  
6 -import com.agent.repository.agent.*;  
7 -import com.agent.service.BasicService;  
8 -import com.framework.shiro.SessionUtil;  
9 -import com.google.common.base.Splitter;  
10 -import com.plugin.easyui.EasyPage; 4 +import java.util.Date;
  5 +import java.util.List;
  6 +
  7 +import javax.annotation.Resource;
  8 +
11 import org.apache.commons.collections.CollectionUtils; 9 import org.apache.commons.collections.CollectionUtils;
12 import org.apache.commons.lang.StringUtils; 10 import org.apache.commons.lang.StringUtils;
13 import org.springframework.data.domain.Page; 11 import org.springframework.data.domain.Page;
@@ -16,10 +14,21 @@ import org.springframework.data.jpa.domain.Specification; @@ -16,10 +14,21 @@ import org.springframework.data.jpa.domain.Specification;
16 import org.springframework.stereotype.Service; 14 import org.springframework.stereotype.Service;
17 import org.springframework.transaction.annotation.Transactional; 15 import org.springframework.transaction.annotation.Transactional;
18 16
19 -  
20 -import javax.annotation.Resource;  
21 -import java.util.Date;  
22 -import java.util.List; 17 +import com.agent.entity.Constant;
  18 +import com.agent.entity.agent.ConsigneeEntity;
  19 +import com.agent.entity.agent.HawbOtherFeeEntity;
  20 +import com.agent.entity.agent.MakeHawbEntity;
  21 +import com.agent.entity.agent.PackageSizeEntity;
  22 +import com.agent.entity.agent.PubFhrEntity;
  23 +import com.agent.repository.agent.ConsigneeRepository;
  24 +import com.agent.repository.agent.HawbOtherFeeRepository;
  25 +import com.agent.repository.agent.MakeHawbRepository;
  26 +import com.agent.repository.agent.PackageSizeRepository;
  27 +import com.agent.repository.agent.PubFhrRepository;
  28 +import com.agent.service.BasicService;
  29 +import com.framework.shiro.SessionUtil;
  30 +import com.google.common.base.Splitter;
  31 +import com.plugin.easyui.EasyPage;
23 32
24 33
25 @Service 34 @Service