修改新增江船船名

.gitignore

@@ -0,0 +1,8 @@
+target/
+*.iml
+.idea/
+rebel.xml
+.rebel.xml.bak
+out/artifacts/
+dil-api.iml
+src/test

.idea/encodings.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
   </component>
 </project>

.idea/workspace.xml

@@ -23,6 +23,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="de9b1cef-bcce-4b24-a294-70008dd01a64" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/util/DataChange.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/util/DataChange.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" afterDir="false" />
@@ -259,17 +262,30 @@
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/DilBatchController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/DilBatchController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/ShipDynamicsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/ShipDynamicsController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/TmsshipShipLocationController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/TmsshipShipLocationController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/feign/ESFeign.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/feign/ESFeign.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/DilBatchMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/DilBatchMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IDilBatchService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IDilBatchService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/ITmsshipShipLocationService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/ITmsshipShipLocationService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/DilBatchServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/DilBatchServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/TmsshipShipLocationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/TmsshipShipLocationServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bootstrap.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/DilBatchMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/DilBatchMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/ShipDynamicsMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/ShipDynamicsMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/TmsshipShipLocationMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/TmsshipShipLocationMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/bootstrap.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/DilBatchController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/DilBatchController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/ShipDynamicsController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/ShipDynamicsController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/TmsshipShipLocationController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/TmsshipShipLocationController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/feign/ESFeign.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/feign/ESFeign.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/DilBatchMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/DilBatchMapper.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/DilBatchMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/DilBatchMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/ShipDynamicsMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/ShipDynamicsMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/TmsshipShipLocationMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/TmsshipShipLocationMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IDilBatchService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IDilBatchService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/ITmsshipShipLocationService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/ITmsshipShipLocationService.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/DilBatchServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/DilBatchServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/TmsshipShipLocationServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/TmsshipShipLocationServiceImpl.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/dil-tms-1.0-SNAPSHOT.jar" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/target/dil-tms-1.0-SNAPSHOT.jar.original" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/target/maven-archiver/pom.properties" beforeDir="false" />
@@ -283,20 +299,6 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -311,9 +313,9 @@
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
-        <option name="localRepository" value="C:\Maven\cangku" />
-        <option name="mavenHome" value="$PROJECT_DIR$/../../../Maven/apache-maven-3.5.0" />
-        <option name="userSettingsFile" value="C:\Maven\apache-maven-3.5.0\conf\settings.xml" />
+        <option name="localRepository" value="D:\project\cangku" />
+        <option name="mavenHome" value="$PROJECT_DIR$/../../project/apache-maven-3.5.0" />
+        <option name="userSettingsFile" value="D:\project\apache-maven-3.5.0\conf\settings.xml" />
       </MavenGeneralSettings>
     </option>
   </component>
@@ -338,7 +340,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="full.screen.before.presentation.mode" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../newworkspace/DAL-DAZHOU-API" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -351,17 +353,18 @@
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
     <property name="settings.editor.splitter.proportion" value="0.3058104" />
+    <property name="vue.rearranger.settings.migration" value="true" />
   </component>
   <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\0-湖南视拓\测试\20211112\DAL-DAZHOU-TMSSHIP-API\src\main\resources\com\steerinfo\dil\mapper" />
+    </key>
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.steerinfo.dil.util" />
       <recent name="com.steerinfo.dil.service" />
       <recent name="com.steerinfo.dil.service.impl" />
       <recent name="com.steerinfo.dil.mapper" />
       <recent name="com.steerinfo.dil.controller" />
-      <recent name="com.steerinfo.dil.util" />
-    </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\0-湖南视拓\测试\20211112\DAL-DAZHOU-TMSSHIP-API\src\main\resources\com\steerinfo\dil\mapper" />
     </key>
   </component>
   <component name="RunManager">
@@ -411,6 +414,8 @@
       <workItem from="1638879743061" duration="4527000" />
       <workItem from="1638924203240" duration="4209000" />
       <workItem from="1639136958217" duration="22644000" />
+      <workItem from="1639136974680" duration="13884000" />
+      <workItem from="1639186339530" duration="1399000" />
     </task>
     <servers />
   </component>
@@ -438,54 +443,58 @@
       <screen x="0" y="0" width="1280" height="680" />
     </state>
     <state x="421" y="95" key="FileChooserDialogImpl/0.0.1280.680@0.0.1280.680" timestamp="1639138028546" />
-    <state width="1237" height="276" key="GridCell.Tab.0.bottom" timestamp="1639209600397">
+    <state width="1222" height="84" key="GridCell.Tab.0.bottom" timestamp="1639293129984">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state width="1222" height="84" key="GridCell.Tab.0.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639293129984" />
+    <state width="1222" height="84" key="GridCell.Tab.0.center" timestamp="1639293129984">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="276" key="GridCell.Tab.0.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639209600397" />
-    <state width="1237" height="276" key="GridCell.Tab.0.center" timestamp="1639209600397">
+    <state width="1222" height="84" key="GridCell.Tab.0.center/0.0.1280.680@0.0.1280.680" timestamp="1639293129984" />
+    <state width="1222" height="84" key="GridCell.Tab.0.left" timestamp="1639293129984">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="276" key="GridCell.Tab.0.center/0.0.1280.680@0.0.1280.680" timestamp="1639209600397" />
-    <state width="1237" height="276" key="GridCell.Tab.0.left" timestamp="1639209600397">
+    <state width="1222" height="84" key="GridCell.Tab.0.left/0.0.1280.680@0.0.1280.680" timestamp="1639293129984" />
+    <state width="1222" height="84" key="GridCell.Tab.0.right" timestamp="1639293129984">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="276" key="GridCell.Tab.0.left/0.0.1280.680@0.0.1280.680" timestamp="1639209600397" />
-    <state width="1237" height="276" key="GridCell.Tab.0.right" timestamp="1639209600397">
+    <state width="1222" height="84" key="GridCell.Tab.0.right/0.0.1280.680@0.0.1280.680" timestamp="1639293129984" />
+    <state width="1222" height="84" key="GridCell.Tab.1.bottom" timestamp="1639293129985">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="276" key="GridCell.Tab.0.right/0.0.1280.680@0.0.1280.680" timestamp="1639209600397" />
-    <state width="1237" height="276" key="GridCell.Tab.1.bottom" timestamp="1639209599996">
+    <state width="1222" height="84" key="GridCell.Tab.1.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639293129985" />
+    <state width="1222" height="84" key="GridCell.Tab.1.center" timestamp="1639293129985">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="276" key="GridCell.Tab.1.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639209599996" />
-    <state width="1237" height="276" key="GridCell.Tab.1.center" timestamp="1639209599996">
+    <state width="1222" height="84" key="GridCell.Tab.1.center/0.0.1280.680@0.0.1280.680" timestamp="1639293129985" />
+    <state width="1222" height="84" key="GridCell.Tab.1.left" timestamp="1639293129985">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="276" key="GridCell.Tab.1.center/0.0.1280.680@0.0.1280.680" timestamp="1639209599996" />
-    <state width="1237" height="276" key="GridCell.Tab.1.left" timestamp="1639209599996">
+    <state width="1222" height="84" key="GridCell.Tab.1.left/0.0.1280.680@0.0.1280.680" timestamp="1639293129985" />
+    <state width="1222" height="84" key="GridCell.Tab.1.right" timestamp="1639293129985">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="276" key="GridCell.Tab.1.left/0.0.1280.680@0.0.1280.680" timestamp="1639209599996" />
-    <state width="1237" height="276" key="GridCell.Tab.1.right" timestamp="1639209599996">
+    <state width="1222" height="84" key="GridCell.Tab.1.right/0.0.1280.680@0.0.1280.680" timestamp="1639293129985" />
+    <state width="1222" height="84" key="GridCell.Tab.2.bottom" timestamp="1639293129985">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="276" key="GridCell.Tab.1.right/0.0.1280.680@0.0.1280.680" timestamp="1639209599996" />
-    <state width="1237" height="276" key="GridCell.Tab.2.bottom" timestamp="1639209599997">
+    <state width="1222" height="84" key="GridCell.Tab.2.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639293129985" />
+    <state width="1222" height="84" key="GridCell.Tab.2.center" timestamp="1639293129985">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="276" key="GridCell.Tab.2.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639209599997" />
-    <state width="1237" height="276" key="GridCell.Tab.2.center" timestamp="1639209599997">
+    <state width="1222" height="84" key="GridCell.Tab.2.center/0.0.1280.680@0.0.1280.680" timestamp="1639293129985" />
+    <state width="1222" height="84" key="GridCell.Tab.2.left" timestamp="1639293129985">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="276" key="GridCell.Tab.2.center/0.0.1280.680@0.0.1280.680" timestamp="1639209599997" />
-    <state width="1237" height="276" key="GridCell.Tab.2.left" timestamp="1639209599997">
+    <state width="1222" height="84" key="GridCell.Tab.2.left/0.0.1280.680@0.0.1280.680" timestamp="1639293129985" />
+    <state width="1222" height="84" key="GridCell.Tab.2.right" timestamp="1639293129985">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="276" key="GridCell.Tab.2.left/0.0.1280.680@0.0.1280.680" timestamp="1639209599997" />
-    <state width="1237" height="276" key="GridCell.Tab.2.right" timestamp="1639209599997">
+    <state width="1222" height="84" key="GridCell.Tab.2.right/0.0.1280.680@0.0.1280.680" timestamp="1639293129985" />
+    <state width="218" height="477" key="HiddenNamespacesPopup" timestamp="1639293087023">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="276" key="GridCell.Tab.2.right/0.0.1280.680@0.0.1280.680" timestamp="1639209599997" />
+    <state width="218" height="477" key="HiddenNamespacesPopup/0.0.1280.680@0.0.1280.680" timestamp="1639293087023" />
     <state x="142" y="0" key="SettingsEditor" timestamp="1639136984230">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
@@ -520,8 +529,8 @@
         </line-breakpoint>
         <line-breakpoint type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/ShipDynamicsController.java</url>
-          <line>115</line>
-          <option name="timeStamp" value="28" />
+          <line>25</line>
+          <option name="timeStamp" value="26" />
         </line-breakpoint>
         <line-breakpoint type="java-method">
           <url>file://$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/AmsshipCargoTransferResultController.java</url>
@@ -533,6 +542,11 @@
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
+    <watches-manager>
+      <configuration name="SpringBootApplicationConfigurationType">
+        <watch expression="mapList.get(0)" />
+      </configuration>
+    </watches-manager>
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />

dil-tms.iml

@@ -258,5 +258,238 @@
     <orderEntry type="library" name="Maven: io.github.openfeign:feign-httpclient:9.7.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.6" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.10.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
+    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.7" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.7" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.7" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.7" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.7" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.35" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.35" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.35" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.13.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.20" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.7.11" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
+    <orderEntry type="library" name="Maven: com.steerinfo:framework:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.caches:mybatis-ehcache:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j:1.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.15.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.7.11" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.5" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.4" level="project" />
+    <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.7.0" level="project" />
+    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.10" level="project" />
+    <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.16.22" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
+    <orderEntry type="library" name="Maven: cglib:cglib:3.2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:6.0_ALPHA" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.ant:ant:1.9.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.9.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:core:3.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.beust:jcommander:1.48" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jai-imageio:jai-imageio-core:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.10" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.10" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.oracle:ojdbc6:11.2.0.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.60" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-core:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-eureka-client:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.eureka:eureka-client:1.9.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.jettison:jettison:1.3.7" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-eventbus:0.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-infix:0.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-jxpath:commons-jxpath:1.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:antlr-runtime:3.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.commons:commons-math:2.2" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.vlsi.compactmap:compactmap:1.2.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.eureka:eureka-core:1.9.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.4.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.2.5" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.2.5" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.2.5" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.2.5" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-eureka:2.2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.3.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.0.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:9.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:9.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:9.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-java8:9.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-config:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-config-client:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.0.8" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.10" level="project" />
+    <orderEntry type="library" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-hystrix:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.12" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-serialization:1.5.12" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.module:jackson-module-afterburner:2.9.7" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-metrics-event-stream:1.5.12" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.12" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava-reactive-streams:1.2.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.ctrip.framework.apollo:apollo-client:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.ctrip.framework.apollo:apollo-core:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
+    <orderEntry type="library" name="Maven: com.google.inject:guice:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.24.1-GA" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-httpclient:9.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" />
   </component>
 </module>

src/main/java/com/steerinfo/dil/controller/DilBatchController.java

@@ -2,9 +2,9 @@ package com.steerinfo.dil.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.steerinfo.dil.feign.ESFeign;
+import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.PageListAdd;
-import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import com.steerinfo.framework.service.pagehelper.PageList;

src/main/java/com/steerinfo/dil/controller/ShipDynamicsController.java

@@ -9,10 +9,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @RestController
 @RequestMapping("/${api.version}/shipdynamics")
@@ -42,22 +39,24 @@ public class ShipDynamicsController extends BaseRESTfulController {
         Double capacityNumberAllSum4=0.0;
         for (int i = 0; i <= list.size()-1; i++) {
             if(i>0&&!list.get(i).get("batchId").equals(list.get(i-1).get("batchId"))){
-                Map<String,Object> map=new HashMap<>();
+                Map<String,Object> map=new LinkedHashMap<>();
                 map.put("batchId",list.get(i-1).get("batchId"));
                 map.put("pm",list.get(i-1).get("shipName").toString()+
                         list.get(i-1).get("materialName").toString()+
                         list.get(i-1).get("dateOfLoans").toString().substring(0, 10)+"放货"+
                         list.get(i-1).get("numberOfLoans").toString());
                 map.put("tonnage",list.get(i-1).get("tonnage"));
+                map.put("portName", list.get(i-1).get("portName"));
                 tonnageSum+=Double.parseDouble(list.get(i-1).get("tonnage").toString());
                 map.put("capacity1","小计");
                 map.put("capacity2","小计");
-                map.put("capacity3","小计");
+                map.put("capacity3" ,"小计");
                 map.put("capacity4","小计");
                 map.put("capacityNumber1",capacityNumberSum1);
                 map.put("capacityNumber2",capacityNumberSum2);
                 map.put("capacityNumber3",capacityNumberSum3);
                 map.put("capacityNumber4",capacityNumberSum4);
+                map.put("vvvvv", 23);
                 mapList.add(map);
                 Map<String,Object> map2=new HashMap<>();
                 map2.put("batchId",list.get(i-1).get("batchId"));
@@ -66,8 +65,10 @@ public class ShipDynamicsController extends BaseRESTfulController {
                         list.get(i-1).get("dateOfLoans").toString().substring(0, 10)+"放货"+
                         list.get(i-1).get("numberOfLoans").toString());
                 map2.put("tonnage",list.get(i-1).get("tonnage"));
+                map2.put("portName", list.get(i-1).get("portName"));
                 map2.put("capacity1",capacityNumberSum1+capacityNumberSum2+capacityNumberSum3+capacityNumberSum4);
                 map2.put("type",1);
+                map2.put("aaaaa", 2);
                 mapList.add(map2);
                capacityNumberSum1 = 0.0;
                capacityNumberSum2 = 0.0;
@@ -150,6 +151,8 @@ public class ShipDynamicsController extends BaseRESTfulController {
             map.put("capacityNumber4",capacityNumber4);
             map.put("locationValue4",locationValue4);
             map.put("outPortTime4",outPortTime4);
+            map.put("qqqqq", 12);                                                       //连续字母用于辨识数据结构！！！！
+            map.put("portName", list.get(i).get("portName"));
             mapList.add(map);
         }
         Map<String,Object> map=new HashMap<>();
@@ -159,6 +162,7 @@ public class ShipDynamicsController extends BaseRESTfulController {
                 list.get(list.size()-1).get("dateOfLoans").toString().substring(0, 10)+"放货"+
                 list.get(list.size()-1).get("numberOfLoans").toString());
         map.put("tonnage",list.get(list.size()-1).get("tonnage"));
+        map.put("portName", list.get(list.size()-1).get("portName"));
         tonnageSum+=Double.parseDouble(list.get(list.size()-1).get("tonnage").toString());
         map.put("capacity1","小计");
         map.put("capacity2","小计");
@@ -168,6 +172,7 @@ public class ShipDynamicsController extends BaseRESTfulController {
         map.put("capacityNumber2",capacityNumberSum2);
         map.put("capacityNumber3",capacityNumberSum3);
         map.put("capacityNumber4",capacityNumberSum4);
+        map.put("wwwww", 12);
         mapList.add(map);
         Map<String,Object> map2=new HashMap<>();
         map2.put("batchId",list.get(list.size()-1).get("batchId"));
@@ -176,8 +181,10 @@ public class ShipDynamicsController extends BaseRESTfulController {
                 list.get(list.size()-1).get("dateOfLoans").toString().substring(0, 10)+"放货"+
                 list.get(list.size()-1).get("numberOfLoans").toString());
         map2.put("tonnage",list.get(list.size()-1).get("tonnage"));
+        map.put("portName", list.get(list.size()-1).get("portName"));
         map2.put("capacity1",capacityNumberSum1+capacityNumberSum2+capacityNumberSum3+capacityNumberSum4);
         map2.put("type",1);
+        map2.put("eeeeee", 12);
         mapList.add(map2);
 
         //最下方的两行
@@ -190,6 +197,7 @@ public class ShipDynamicsController extends BaseRESTfulController {
         map3.put("capacityNumber2",capacityNumberAllSum2);
         map3.put("capacityNumber3",capacityNumberAllSum3);
         map3.put("capacityNumber4",capacityNumberAllSum4);
+        map3.put("rrrrrr", 12);
         mapList.add(map3);
         //第二行
         Map<String,Object> map4=new HashMap<>();
@@ -198,6 +206,7 @@ public class ShipDynamicsController extends BaseRESTfulController {
         map4.put("pm","合计");
         map4.put("capacity1",capacityNumberAllSum1+capacityNumberAllSum2+capacityNumberAllSum3+capacityNumberAllSum4);
         map4.put("type",1);
+        map4.put("ttttt", 2);
         mapList.add(map4);
         return success(mapList);
     }

src/main/java/com/steerinfo/dil/controller/TmsshipShipLocationController.java

@@ -21,6 +21,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.math.BigDecimal;
 
@@ -76,8 +77,8 @@ public class TmsshipShipLocationController extends BaseRESTfulController {
             @ApiImplicitParam(name = "tmsshipShipLocation",value = "位置作业字段",required = true,paramType = "TmsshipShipLocation")
     })
     @PostMapping("/updateShipLocation")
-    public RESTfulResult updateShipLocation(@RequestBody TmsshipShipLocation tmsshipShipLocation) {
-        int code = tmsshipShipLocationService.updateShipLocation(tmsshipShipLocation);
+    public RESTfulResult updateShipLocation(@RequestBody(required = false) Map<String, Object> map) {
+        int code = tmsshipShipLocationService.updateShipLocation(map);
         return success(code);
     }
 
@@ -129,9 +130,6 @@ public class TmsshipShipLocationController extends BaseRESTfulController {
     /**
      * 展示位置作业信息列表
      * @param mapVal
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
      * @return
      */
     @ApiOperation(value="展示位置作业信息列表", notes="分页查询")
@@ -141,46 +139,23 @@ public class TmsshipShipLocationController extends BaseRESTfulController {
             @ApiImplicitParam(name = "apiId", value = "59", required = false, dataType = "BigDecimal"),
     })
     @PostMapping(value = "/getShipLocationList")
-    public RESTfulResult getShipLocationList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                             Integer pageNum,
-                                             Integer pageSize,
-                                             Integer apiId,
-                                             String con){
-        //框计算
-        if(con != null){
-            if(!"undefined".equals(con)){
-                //设置要查询的索引名称
-                String index="get_ship_location_list";
-                //获取查询结果
-                return success(esFeign.getConResult(mapVal,index,apiId,pageNum,pageSize,con));
-            }
-        }
-        //初始化过滤
-        List<Map<String, Object>> detailListTotal = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (mapVal.size() == 0) {
-            //将查询结果存入索引中
-            detailListTotal = tmsshipShipLocationService.selectShipLocationList(null);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index", "get_ship_location_list");
-            //添加id
-            map.put("indexId", "locationId");
-            detailListTotal.add(map);
-            //新建索引
-            String s = JSON.toJSONString(detailListTotal);
-            esFeign.insertIndex(detailListTotal);
-            //删除
-            detailListTotal.remove(detailListTotal.size() - 1);
-        }
-        if (detailListTotal == null) {
-            detailListTotal = tmsshipShipLocationService.selectShipLocationList(mapVal);
+    public RESTfulResult getShipLocationList(@RequestBody(required = false) Map<String,Object> mapVal){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        //通过时间查询数据
+        Object dayTime = mapVal.get("dayTime");
+        Date date;
+        String timeFormat;
+        if(dayTime != null){
+
+             date = new Date((long) dayTime);
+             timeFormat = sdf.format(date);
+        }else {
+             date = new Date();
+            timeFormat = sdf.format(date);
         }
-        PageHelper.startPage(pageNum, pageSize);
-        //分页查询数据
+        mapVal.put("dayTime", timeFormat);
         List<Map<String, Object>> columnList = tmsshipShipLocationService.selectShipLocationList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, detailListTotal, columnList);
-        return success(data);
+        return success(columnList);
 
     }
 }

src/main/java/com/steerinfo/dil/feign/ESFeign.java

@@ -16,7 +16,7 @@ import java.util.Map;
  */
 
 
-@FeignClient(value = "DIL-ES-DEV",url = "172.16.33.161:8089/api/v1/es")
+@FeignClient(value = "DIL-ES-DEV",url = "172.16.33.166:8089/api/v1/es")
 public interface ESFeign {
     @PostMapping("getConResult")
     PageListAdd getConResult(@RequestBody(required = false) Map<String, Object> mapValue,

src/main/java/com/steerinfo/dil/service/ITmsshipShipLocationService.java

@@ -51,7 +51,7 @@ public interface ITmsshipShipLocationService{
     TmsshipShipLocation selectShipLocation(BigDecimal locationId);
 
 
-    int updateShipLocation(TmsshipShipLocation tmsshipShipLocation);
+    int updateShipLocation(Map<String, Object> map);
 
 
     /**

src/main/java/com/steerinfo/dil/service/impl/TmsshipShipLocationServiceImpl.java

@@ -2,6 +2,7 @@ package com.steerinfo.dil.service.impl;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.steerinfo.dil.model.TmsshipTotalResult;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.dil.model.TmsshipShipLocation;
@@ -103,11 +104,20 @@ public class TmsshipShipLocationServiceImpl implements ITmsshipShipLocationServi
 
     /**
      * 修改位置作业
-     * @param tmsshipShipLocation
+     * @param map
      * @return
      */
     @Override
-    public int updateShipLocation(TmsshipShipLocation tmsshipShipLocation) {
+    public int updateShipLocation(Map<String, Object> map) {
+        TmsshipShipLocation tmsshipShipLocation = new TmsshipShipLocation();
+        //获取主键
+        tmsshipShipLocation.setLocationId(DataChange.dataToBigDecimal(map.get("locationId")));
+        //获取船舶位置
+        tmsshipShipLocation.setLocationValue((String) map.get("shipLocation"));
+        //获取修改船舶日期
+        tmsshipShipLocation.setLocationRouteTime(new Date((long) map.get("locationRouteTime")));
+        //船舶位置状态
+        tmsshipShipLocation.setLocationStatus((String) map.get("locationStatus"));
         tmsshipShipLocation.setUpdateTime(new Date());
         return tmsshipShipLocationMapper.updateByPrimaryKeySelective(tmsshipShipLocation);
     }

src/main/java/com/steerinfo/dil/util/DataChange.java

@@ -0,0 +1,159 @@
+package com.steerinfo.dil.util;
+
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/8/25 11:25
+ */
+
+public class DataChange {
+
+
+    /**
+     * 解析前端传来的日期字符串
+     * @param vueDate
+     * @return
+     */
+    public static Date dataToDate(Object vueDate){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date parseDate = null;
+        if (vueDate != null){
+            try {
+                String date = (String) vueDate;
+                parseDate = sdf.parse(date);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        }
+        return parseDate;
+    }
+
+    /**
+     * 数据转换成BigDecimal
+     * @param data
+     * @return
+     */
+    public static BigDecimal
+    dataToBigDecimal(Object data){
+        if (data != null){
+            if(data instanceof String){
+                String data1 = (String) data;
+                return new BigDecimal(data1);
+            }
+            if(data instanceof Integer){
+                Integer data2 = (Integer) data;
+                return new BigDecimal(data2);
+            }
+            if(data instanceof Double){
+                Double data3 = (Double) data;
+                return new BigDecimal(data3);
+            }
+            if(data instanceof BigDecimal){
+                return (BigDecimal) data;
+            }
+        }
+        return new BigDecimal(0);
+    }
+
+    /**
+     * 将时间截取到天  为字符串类型 用于前端只显示到天
+     * @param date 传入时间
+     * @return
+     */
+    public static String dateToDayDate(Object date){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date changeDate = null;
+        if(date == null)
+            return null;
+        try{
+            changeDate = (Date) date;
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return sdf.format(changeDate);
+    }
+
+    /**
+     * 遍历从数据库中传进来的数据
+     * @param list 从数据库查询出来的list数据列表
+     * @param key map中多个需要转换的date参数
+     */
+    public static void changeDateToDayDate(List<Map<String, Object>> list, String ...key){
+        //遍历List
+        for (Map<String, Object> map : list) {
+            for (String s : key) {
+                //从map中取 date的值 并转换成字符串类型的日期
+                String stringDate = dateToDayDate(map.get(s));
+                map.put(s, stringDate);
+            }
+        }
+    }
+
+    /**
+     * 遍历列表使只显示两位小数
+     * @param list
+     * @param key
+     */
+    public static void dataTo2Number(List<Map<String, Object>> list, String ...key){
+        //遍历List
+        for (Map<String, Object> map : list) {
+            for (String s : key) {
+                //修改数据为带两位小数
+                BigDecimal oldDate = (BigDecimal) map.get(s);
+                DecimalFormat df =  new DecimalFormat("0.00");
+                String resultDeduction = df.format(oldDate.doubleValue());
+                map.put(s, resultDeduction);
+            }
+        }
+    }
+
+    /**
+     * 计算相差时间  日时分秒
+     * @param
+     * @return
+     */
+    public static String calculatedTimeDifference(Date time1, Date time2){
+        long t1 = time1.getTime();
+        long t2 = time2.getTime();
+        if(t1 > t2){
+            long temp = t1;
+            t1 = t2;
+            t2 = temp;
+        }
+        long between = t2 - t1;
+        long day = between / (24 * 60 * 60 * 1000);
+        long hour = (between / (60 * 60 * 1000) - day * 24);
+        long min = ((between / (60 * 1000)) - day * 24 * 60 - hour * 60);
+        long s = (between / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
+        return day + "天"+  + hour+ "时" + min + "分"  + s + "秒";
+    }
+
+    /**
+     * 生成带时间的八位数顺序号
+     * @param start 前缀
+     * @param id 顺序号  主键Id
+     * @return
+     */
+    public static String generateEightDigitsNumber(String start, Integer id){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        StringBuilder sb = new StringBuilder(start + sdf.format(new Date()));
+        sb.append(
+                id < 10
+                        ? "0000000" + id : id < 100
+                        ? "000000" + id : id < 1000
+                        ? "00000" + id : id < 10000
+                        ? "0000" + id : id < 100000
+                        ? "000" + id : id < 1000000
+                        ? "00" + id : id < 10000000
+                        ? "0" + id : id.toString()
+        );
+        return sb.toString();
+    }
+}

src/main/resources/bootstrap.yml

@@ -14,15 +14,15 @@ spring:
 
 openfeign:
   WmshboundFeign:
-    url: ${WMSHBOUNDFEIGN_URL:192.168.1.118:8070}
+    url: ${WMSHBOUNDFEIGN_URL:localhost:8093}
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:192.168.1.118:8083}
+    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
 
 #eureka设置
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8061}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.162}:${EUREKA_PORT:8081}/eureka/
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/

src/main/resources/com/steerinfo/dil/mapper/ShipDynamicsMapper.xml

@@ -3,19 +3,63 @@
 <mapper namespace="com.steerinfo.dil.mapper.ShipDynamicsMapper">
 <!--   获取数据  -->
     <select id="selectAll" resultType="java.util.Map" parameterType="java.util.Map">
-        select sd.BATCH_ID as "batchId",
-               sd.RESULT_FOREIGN_SHIP_NAME as "shipName",
-               sd.MATERIAL_NAME as "materialName",
-               sd.GM_TONNAGE as "tonnage",
-               sd.RESULT_DATE_OF_LOANS as "dateOfLoans",
-               sd.RESULT_NUMBER_OF_LOANS as "numberOfLoans",
-               sd.PORT_NAME as "portName",
-               sd.CAPACITY_NUMBER as "capacity",
-               sd.RESULT_ACTUAL_INSTALLATIONS as "capacityNumber",
-               sd.RESULT_OUT_PORT_TIME as "outPortTime",
-               sd.LOCATION_VALUE as "locationValue",
-               sd.LOCATION_STATUS as "locationStatus"
-        from SHIP_DYNAMICS sd where sd.LOCATION_VALUE is not null order by sd.BATCH_ID
+        select *
+        from (
+                 select db.BATCH_ID                      "batchId",
+                        db.result_foreign_ship_name      "shipName",
+                        rm.material_name                 "materialName",
+                        actr.result_date_of_loans        "tonnage",
+                        actr.RESULT_NUMBER_OF_LOANS      "dateOfLoans",
+                        rp.port_name                     "numberOfLoans",
+                        wgm.gm_tonnage                   "portName",
+                        rc.capacity_number               "capacity",
+                        tlsr.RESULT_ACTUAL_INSTALLATIONS "capacityNumber",
+                        tlsr.RESULT_OUT_PORT_TIME        "outPortTime",
+                        tsl.LOCATION_STATUS              "locationStatus",
+                        tsl.LOCATION_VALUE               "locationValue",
+                        tsl.LOCATION_ROUTE_TIME          "localtionRouteTime"
+                 from DIL_BATCH db
+                          join rms_material rm on db.material_id = rm.material_id
+                          left join AMSSHIP_CARGO_TRANSFER_RESULT actr on db.batch_id = actr.batch_id
+                          left join AMSSHIP_DELIVERY_NOTICE adn on adn.batch_id = db.batch_id
+                          left join rms_port rp on rp.port_id = adn.port_id
+                          left join (select *
+                                     from WMSH_GRID_MATERIAL wgm
+                                     where wgm.GM_ID in
+                                           (SELECT wgm.GM_ID
+                                            FROM (
+                                                     SELECT wgm.GM_ID,
+                                                            wgm.BATCH_ID,
+                                                            wgm.INSERT_TIME,
+                                                            ROW_NUMBER() OVER (
+                                                                PARTITION BY wgm.BATCH_ID
+                                                                ORDER BY wgm.INSERT_TIME DESC
+                                                                ) AS rn
+                                                     FROM WMSH_GRID_MATERIAL wgm
+                                                 ) wgm
+                                            WHERE rn = 1)) wgm on wgm.batch_id = db.batch_id
+                          left join TMSSHIP_LOAD_SHIP_RESULT tlsr on db.batch_id = tlsr.batch_id
+                          left join tmsship_total_result ttr on ttr.result_id = tlsr.TOTAL_RESULT_ID
+                          left join omsship_instructions_capacity oic on ttr.order_id = oic.instructions_capacity_id
+                          left join rms_capacity rc on oic.capacity_id = rc.capacity_id
+                          left join (select *
+                                     from tmsship_ship_location t
+                                     where t.location_id in
+                                           (SELECT t.location_id
+                                            FROM (
+                                                     SELECT t.location_id,
+                                                            t.total_result_id,
+                                                            t.location_route_time,
+                                                            ROW_NUMBER() OVER (
+                                                                PARTITION BY t.total_result_id
+                                                                ORDER BY t.location_route_time DESC
+                                                                ) AS rn
+                                                     FROM tmsship_ship_location t
+                                                 ) t
+                                            WHERE rn = 1)) tsl on tsl.total_result_id = ttr.result_id
+                 where ttr.ship_status = 0
+             )
+        where "locationValue" is not null
     </select>
     <select id="selectByshipName" resultType="java.util.Map" parameterType="java.util.Map">
         select sd.GM_TONNAGE as "tonnage",

src/main/resources/com/steerinfo/dil/mapper/TmsshipShipLocationMapper.xml

@@ -458,112 +458,44 @@
       order by "insertTime" desc
     </if>
   </sql>
-  <select id="selectShipLocationList" resultType="java.util.Map">
-    SELECT * FROM (
-    SELECT DISTINCT ttr.ORDER_ID as "orderId",
-    tsl.INSERT_TIME as "insertTime",
-    tsl.LOCATION_ID as "locationId",
-    rm.MATERIAL_NAME as "materialName",
-    db.RESULT_FOREIGN_SHIP_NAME as "foreignShipName",
-    rc.CAPACITY_NUMBER as "capacityName",
-    rps.PORT_NAME as "startPortName",
-    rpe.PORT_NAME as "arrivePortName",
-    oic.INSTRUCTION_PLANNED_LOADING as "planWeight",
-    tlsr.RESULT_ACTUAL_INSTALLATIONS as "realWeight",
-    tsl.LOCATION_VALUE as "shipLocation",
-    tsl.LOCATION_STATUS as "locationStatus",
-    tsl.LOCATION_ROUTE_TIME as "locationRouteTime",
-    tsl.LOCATION_MEMO as "locationMemo"
+  <select id="selectShipLocationList" parameterType="map" resultType="java.util.Map">
+
+    SELECT DISTINCT
+                    ttr.ORDER_ID                     as "orderId",
+                    tsl.INSERT_TIME                  as "insertTime",
+                    tsl.LOCATION_ID                  as "locationId",
+                    rm.MATERIAL_NAME                 as "materialName",
+                    db.RESULT_FOREIGN_SHIP_NAME      as "foreignShipName",
+                    rc.CAPACITY_NUMBER               as "capacityName",
+                    rps.PORT_NAME                    as "startPortName",
+                    rpe.PORT_NAME                    as "arrivePortName",
+                    oic.INSTRUCTION_PLANNED_LOADING  as "planWeight",
+                    tlsr.RESULT_ACTUAL_INSTALLATIONS as "realWeight",
+                    tsl.LOCATION_VALUE               as "shipLocation",
+                    tsl.LOCATION_STATUS              as "locationStatus",
+                    tsl.LOCATION_ROUTE_TIME          as "locationRouteTime",
+                    tsl.LOCATION_MEMO                as "locationMemo"
     FROM TMSSHIP_SHIP_LOCATION tsl
-    LEFT JOIN TMSSHIP_TOTAL_RESULT ttr
-    ON tsl.TOTAL_RESULT_ID = ttr.RESULT_ID
-    LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY oic
-    ON oic.INSTRUCTIONS_CAPACITY_ID = ttr.ORDER_ID
-    LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
-    ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
-    LEFT JOIN DIL_BATCH db
-    ON osi.BATCH_ID = db.BATCH_ID
-    LEFT JOIN RMS_MATERIAL rm
-    ON db.MATERIAL_ID = rm.MATERIAL_ID
-    LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT tlsr
-    ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
-    LEFT JOIN RMS_PORT rps
-    ON tlsr.LOCATION_START_PORT_ID = rps.PORT_ID
-    LEFT JOIN RMS_PORT rpe
-    ON tlsr.ARRIVAL_PORT_ID = rpe.PORT_ID
-    LEFT JOIN RMS_CAPACITY rc
-    ON rc.CAPACITY_ID = oic.CAPACITY_ID
-    WHERE tsl.DELETED = 0)
-    <where>
+           LEFT JOIN TMSSHIP_TOTAL_RESULT ttr
+                     ON tsl.TOTAL_RESULT_ID = ttr.RESULT_ID
+           LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY oic
+                     ON oic.INSTRUCTIONS_CAPACITY_ID = ttr.ORDER_ID
+           LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
+                     ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
+           LEFT JOIN DIL_BATCH db
+                     ON osi.BATCH_ID = db.BATCH_ID
+           LEFT JOIN RMS_MATERIAL rm
+                     ON db.MATERIAL_ID = rm.MATERIAL_ID
+           LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT tlsr
+                     ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
+           LEFT JOIN RMS_PORT rps
+                     ON tlsr.LOCATION_START_PORT_ID = rps.PORT_ID
+           LEFT JOIN RMS_PORT rpe
+                     ON tlsr.ARRIVAL_PORT_ID = rpe.PORT_ID
+           LEFT JOIN RMS_CAPACITY rc
+                     ON rc.CAPACITY_ID = oic.CAPACITY_ID
+    WHERE tsl.DELETED = 0 and to_char(tsl.LOCATION_ROUTE_TIME, 'yyyy-mm-dd') = #{dayTime}
 
-      <if test="materialName != null">
-        and
-        <foreach collection="materialName" item="item" open="(" separator="," close=")">
-          "materialName" in  #{item}
-        </foreach>
-      </if>
-      <if test="foreignShipName != null">
-        and
-        <foreach collection="foreignShipName" item="item" open="(" separator="," close=")">
-          "foreignShipName" in  #{item}
-        </foreach>
-      </if>
-      <if test="capacityName != null">
-        and
-        <foreach collection="capacityName" item="item" open="(" separator="," close=")">
-          "capacityName" in  #{item}
-        </foreach>
-      </if>
-      <if test="startPortName != null">
-        and
-        <foreach collection="startPortName" item="item" open="(" separator="," close=")">
-          "startPortName" in  #{item}
-        </foreach>
-      </if>
-      <if test="arrivePortName != null">
-        and
-        <foreach collection="arrivePortName" item="item" open="(" separator="," close=")">
-          "arrivePortName" in  #{item}
-        </foreach>
-      </if>
-      <if test="planWeight != null">
-        and
-        <foreach collection="planWeight" item="item" open="(" separator="," close=")">
-          "planWeight" in #{item}
-        </foreach>
-      </if>
-      <if test="realWeight != null">
-        and
-        <foreach collection="realWeight" item="item" open="(" separator="," close=")">
-          "realWeight" in  #{item}
-        </foreach>
-      </if>
-      <if test="shipLocation != null">
-        and
-        <foreach collection="shipLocation" item="item" open="(" separator="," close=")">
-          "shipLocation" in  #{item}
-        </foreach>
-      </if>
-      <if test="locationStatus != null">
-        and
-        <foreach collection="locationStatus" item="item" open="(" separator="," close=")">
-          "locationStatus" in  #{item}
-        </foreach>
-      </if>
-      <if test="locationRouteTime != null">
-        and
-        <foreach collection="locationRouteTime" item="item" open="(" separator="," close=")">
-          "locationRouteTime" in  to_date('${item}','yyyy-mm-dd hh24:mi:ss')
-        </foreach>
-      </if>
-      <if test="locationMemo != null">
-        and
-        <foreach collection="locationMemo" item="item" open="(" separator="," close=")">
-          "locationMemo" in  #{item}
-        </foreach>
-      </if>
-    </where>
-    <include refid="orderByInsertTime"></include>
   </select>
 
   <select id="selectShipLocation" parameterType="DECIMAL" resultType="java.util.Map">

target/classes/bootstrap.yml

@@ -14,15 +14,15 @@ spring:
 
 openfeign:
   WmshboundFeign:
-    url: ${WMSHBOUNDFEIGN_URL:192.168.1.118:8070}
+    url: ${WMSHBOUNDFEIGN_URL:localhost:8093}
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:192.168.1.118:8083}
+    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
 
 #eureka设置
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8061}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.162}:${EUREKA_PORT:8081}/eureka/
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/

target/classes/com/steerinfo/dil/mapper/ShipDynamicsMapper.xml

@@ -3,19 +3,63 @@
 <mapper namespace="com.steerinfo.dil.mapper.ShipDynamicsMapper">
 <!--   获取数据  -->
     <select id="selectAll" resultType="java.util.Map" parameterType="java.util.Map">
-        select sd.BATCH_ID as "batchId",
-               sd.RESULT_FOREIGN_SHIP_NAME as "shipName",
-               sd.MATERIAL_NAME as "materialName",
-               sd.GM_TONNAGE as "tonnage",
-               sd.RESULT_DATE_OF_LOANS as "dateOfLoans",
-               sd.RESULT_NUMBER_OF_LOANS as "numberOfLoans",
-               sd.PORT_NAME as "portName",
-               sd.CAPACITY_NUMBER as "capacity",
-               sd.RESULT_ACTUAL_INSTALLATIONS as "capacityNumber",
-               sd.RESULT_OUT_PORT_TIME as "outPortTime",
-               sd.LOCATION_VALUE as "locationValue",
-               sd.LOCATION_STATUS as "locationStatus"
-        from SHIP_DYNAMICS sd where sd.LOCATION_VALUE is not null order by sd.BATCH_ID
+        select *
+        from (
+                 select db.BATCH_ID                      "batchId",
+                        db.result_foreign_ship_name      "shipName",
+                        rm.material_name                 "materialName",
+                        actr.result_date_of_loans        "tonnage",
+                        actr.RESULT_NUMBER_OF_LOANS      "dateOfLoans",
+                        rp.port_name                     "numberOfLoans",
+                        wgm.gm_tonnage                   "portName",
+                        rc.capacity_number               "capacity",
+                        tlsr.RESULT_ACTUAL_INSTALLATIONS "capacityNumber",
+                        tlsr.RESULT_OUT_PORT_TIME        "outPortTime",
+                        tsl.LOCATION_STATUS              "locationStatus",
+                        tsl.LOCATION_VALUE               "locationValue",
+                        tsl.LOCATION_ROUTE_TIME          "localtionRouteTime"
+                 from DIL_BATCH db
+                          join rms_material rm on db.material_id = rm.material_id
+                          left join AMSSHIP_CARGO_TRANSFER_RESULT actr on db.batch_id = actr.batch_id
+                          left join AMSSHIP_DELIVERY_NOTICE adn on adn.batch_id = db.batch_id
+                          left join rms_port rp on rp.port_id = adn.port_id
+                          left join (select *
+                                     from WMSH_GRID_MATERIAL wgm
+                                     where wgm.GM_ID in
+                                           (SELECT wgm.GM_ID
+                                            FROM (
+                                                     SELECT wgm.GM_ID,
+                                                            wgm.BATCH_ID,
+                                                            wgm.INSERT_TIME,
+                                                            ROW_NUMBER() OVER (
+                                                                PARTITION BY wgm.BATCH_ID
+                                                                ORDER BY wgm.INSERT_TIME DESC
+                                                                ) AS rn
+                                                     FROM WMSH_GRID_MATERIAL wgm
+                                                 ) wgm
+                                            WHERE rn = 1)) wgm on wgm.batch_id = db.batch_id
+                          left join TMSSHIP_LOAD_SHIP_RESULT tlsr on db.batch_id = tlsr.batch_id
+                          left join tmsship_total_result ttr on ttr.result_id = tlsr.TOTAL_RESULT_ID
+                          left join omsship_instructions_capacity oic on ttr.order_id = oic.instructions_capacity_id
+                          left join rms_capacity rc on oic.capacity_id = rc.capacity_id
+                          left join (select *
+                                     from tmsship_ship_location t
+                                     where t.location_id in
+                                           (SELECT t.location_id
+                                            FROM (
+                                                     SELECT t.location_id,
+                                                            t.total_result_id,
+                                                            t.location_route_time,
+                                                            ROW_NUMBER() OVER (
+                                                                PARTITION BY t.total_result_id
+                                                                ORDER BY t.location_route_time DESC
+                                                                ) AS rn
+                                                     FROM tmsship_ship_location t
+                                                 ) t
+                                            WHERE rn = 1)) tsl on tsl.total_result_id = ttr.result_id
+                 where ttr.ship_status = 0
+             )
+        where "locationValue" is not null
     </select>
     <select id="selectByshipName" resultType="java.util.Map" parameterType="java.util.Map">
         select sd.GM_TONNAGE as "tonnage",

target/classes/com/steerinfo/dil/mapper/TmsshipShipLocationMapper.xml

@@ -458,112 +458,44 @@
       order by "insertTime" desc
     </if>
   </sql>
-  <select id="selectShipLocationList" resultType="java.util.Map">
-    SELECT * FROM (
-    SELECT DISTINCT ttr.ORDER_ID as "orderId",
-    tsl.INSERT_TIME as "insertTime",
-    tsl.LOCATION_ID as "locationId",
-    rm.MATERIAL_NAME as "materialName",
-    db.RESULT_FOREIGN_SHIP_NAME as "foreignShipName",
-    rc.CAPACITY_NUMBER as "capacityName",
-    rps.PORT_NAME as "startPortName",
-    rpe.PORT_NAME as "arrivePortName",
-    oic.INSTRUCTION_PLANNED_LOADING as "planWeight",
-    tlsr.RESULT_ACTUAL_INSTALLATIONS as "realWeight",
-    tsl.LOCATION_VALUE as "shipLocation",
-    tsl.LOCATION_STATUS as "locationStatus",
-    tsl.LOCATION_ROUTE_TIME as "locationRouteTime",
-    tsl.LOCATION_MEMO as "locationMemo"
+  <select id="selectShipLocationList" parameterType="map" resultType="java.util.Map">
+
+    SELECT DISTINCT
+                    ttr.ORDER_ID                     as "orderId",
+                    tsl.INSERT_TIME                  as "insertTime",
+                    tsl.LOCATION_ID                  as "locationId",
+                    rm.MATERIAL_NAME                 as "materialName",
+                    db.RESULT_FOREIGN_SHIP_NAME      as "foreignShipName",
+                    rc.CAPACITY_NUMBER               as "capacityName",
+                    rps.PORT_NAME                    as "startPortName",
+                    rpe.PORT_NAME                    as "arrivePortName",
+                    oic.INSTRUCTION_PLANNED_LOADING  as "planWeight",
+                    tlsr.RESULT_ACTUAL_INSTALLATIONS as "realWeight",
+                    tsl.LOCATION_VALUE               as "shipLocation",
+                    tsl.LOCATION_STATUS              as "locationStatus",
+                    tsl.LOCATION_ROUTE_TIME          as "locationRouteTime",
+                    tsl.LOCATION_MEMO                as "locationMemo"
     FROM TMSSHIP_SHIP_LOCATION tsl
-    LEFT JOIN TMSSHIP_TOTAL_RESULT ttr
-    ON tsl.TOTAL_RESULT_ID = ttr.RESULT_ID
-    LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY oic
-    ON oic.INSTRUCTIONS_CAPACITY_ID = ttr.ORDER_ID
-    LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
-    ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
-    LEFT JOIN DIL_BATCH db
-    ON osi.BATCH_ID = db.BATCH_ID
-    LEFT JOIN RMS_MATERIAL rm
-    ON db.MATERIAL_ID = rm.MATERIAL_ID
-    LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT tlsr
-    ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
-    LEFT JOIN RMS_PORT rps
-    ON tlsr.LOCATION_START_PORT_ID = rps.PORT_ID
-    LEFT JOIN RMS_PORT rpe
-    ON tlsr.ARRIVAL_PORT_ID = rpe.PORT_ID
-    LEFT JOIN RMS_CAPACITY rc
-    ON rc.CAPACITY_ID = oic.CAPACITY_ID
-    WHERE tsl.DELETED = 0)
-    <where>
+           LEFT JOIN TMSSHIP_TOTAL_RESULT ttr
+                     ON tsl.TOTAL_RESULT_ID = ttr.RESULT_ID
+           LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY oic
+                     ON oic.INSTRUCTIONS_CAPACITY_ID = ttr.ORDER_ID
+           LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
+                     ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
+           LEFT JOIN DIL_BATCH db
+                     ON osi.BATCH_ID = db.BATCH_ID
+           LEFT JOIN RMS_MATERIAL rm
+                     ON db.MATERIAL_ID = rm.MATERIAL_ID
+           LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT tlsr
+                     ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
+           LEFT JOIN RMS_PORT rps
+                     ON tlsr.LOCATION_START_PORT_ID = rps.PORT_ID
+           LEFT JOIN RMS_PORT rpe
+                     ON tlsr.ARRIVAL_PORT_ID = rpe.PORT_ID
+           LEFT JOIN RMS_CAPACITY rc
+                     ON rc.CAPACITY_ID = oic.CAPACITY_ID
+    WHERE tsl.DELETED = 0 and to_char(tsl.LOCATION_ROUTE_TIME, 'yyyy-mm-dd') = #{dayTime}
 
-      <if test="materialName != null">
-        and
-        <foreach collection="materialName" item="item" open="(" separator="," close=")">
-          "materialName" in  #{item}
-        </foreach>
-      </if>
-      <if test="foreignShipName != null">
-        and
-        <foreach collection="foreignShipName" item="item" open="(" separator="," close=")">
-          "foreignShipName" in  #{item}
-        </foreach>
-      </if>
-      <if test="capacityName != null">
-        and
-        <foreach collection="capacityName" item="item" open="(" separator="," close=")">
-          "capacityName" in  #{item}
-        </foreach>
-      </if>
-      <if test="startPortName != null">
-        and
-        <foreach collection="startPortName" item="item" open="(" separator="," close=")">
-          "startPortName" in  #{item}
-        </foreach>
-      </if>
-      <if test="arrivePortName != null">
-        and
-        <foreach collection="arrivePortName" item="item" open="(" separator="," close=")">
-          "arrivePortName" in  #{item}
-        </foreach>
-      </if>
-      <if test="planWeight != null">
-        and
-        <foreach collection="planWeight" item="item" open="(" separator="," close=")">
-          "planWeight" in #{item}
-        </foreach>
-      </if>
-      <if test="realWeight != null">
-        and
-        <foreach collection="realWeight" item="item" open="(" separator="," close=")">
-          "realWeight" in  #{item}
-        </foreach>
-      </if>
-      <if test="shipLocation != null">
-        and
-        <foreach collection="shipLocation" item="item" open="(" separator="," close=")">
-          "shipLocation" in  #{item}
-        </foreach>
-      </if>
-      <if test="locationStatus != null">
-        and
-        <foreach collection="locationStatus" item="item" open="(" separator="," close=")">
-          "locationStatus" in  #{item}
-        </foreach>
-      </if>
-      <if test="locationRouteTime != null">
-        and
-        <foreach collection="locationRouteTime" item="item" open="(" separator="," close=")">
-          "locationRouteTime" in  to_date('${item}','yyyy-mm-dd hh24:mi:ss')
-        </foreach>
-      </if>
-      <if test="locationMemo != null">
-        and
-        <foreach collection="locationMemo" item="item" open="(" separator="," close=")">
-          "locationMemo" in  #{item}
-        </foreach>
-      </if>
-    </where>
-    <include refid="orderByInsertTime"></include>
   </select>
 
   <select id="selectShipLocation" parameterType="DECIMAL" resultType="java.util.Map">