船舶动态表数据

.idea/workspace.xml

@@ -24,6 +24,7 @@
   <component name="ChangeListManager">
     <list default="true" id="de9b1cef-bcce-4b24-a294-70008dd01a64" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -129,6 +130,7 @@
       <workItem from="1636682548627" duration="2585000" />
       <workItem from="1636685226129" duration="4073000" />
       <workItem from="1636700814042" duration="442000" />
+      <workItem from="1636702370148" duration="3223000" />
     </task>
     <servers />
   </component>
@@ -152,54 +154,54 @@
       <screen x="0" y="0" width="1366" height="728" />
     </state>
     <state x="395" y="182" key="FileChooserDialogImpl/0.0.1366.728@0.0.1366.728" timestamp="1636700847996" />
-    <state width="1323" height="225" key="GridCell.Tab.0.bottom" timestamp="1636701266732">
+    <state width="1323" height="225" key="GridCell.Tab.0.bottom" timestamp="1636702435075">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1323" height="225" key="GridCell.Tab.0.bottom/0.0.1366.728@0.0.1366.728" timestamp="1636701266732" />
-    <state width="1323" height="225" key="GridCell.Tab.0.center" timestamp="1636701266732">
+    <state width="1323" height="225" key="GridCell.Tab.0.bottom/0.0.1366.728@0.0.1366.728" timestamp="1636702435075" />
+    <state width="1323" height="225" key="GridCell.Tab.0.center" timestamp="1636702435075">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1323" height="225" key="GridCell.Tab.0.center/0.0.1366.728@0.0.1366.728" timestamp="1636701266732" />
-    <state width="1323" height="225" key="GridCell.Tab.0.left" timestamp="1636701266732">
+    <state width="1323" height="225" key="GridCell.Tab.0.center/0.0.1366.728@0.0.1366.728" timestamp="1636702435075" />
+    <state width="1323" height="225" key="GridCell.Tab.0.left" timestamp="1636702435075">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1323" height="225" key="GridCell.Tab.0.left/0.0.1366.728@0.0.1366.728" timestamp="1636701266732" />
-    <state width="1323" height="225" key="GridCell.Tab.0.right" timestamp="1636701266732">
+    <state width="1323" height="225" key="GridCell.Tab.0.left/0.0.1366.728@0.0.1366.728" timestamp="1636702435075" />
+    <state width="1323" height="225" key="GridCell.Tab.0.right" timestamp="1636702435075">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1323" height="225" key="GridCell.Tab.0.right/0.0.1366.728@0.0.1366.728" timestamp="1636701266732" />
-    <state width="1323" height="225" key="GridCell.Tab.1.bottom" timestamp="1636701266732">
+    <state width="1323" height="225" key="GridCell.Tab.0.right/0.0.1366.728@0.0.1366.728" timestamp="1636702435075" />
+    <state width="1323" height="225" key="GridCell.Tab.1.bottom" timestamp="1636702435075">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1323" height="225" key="GridCell.Tab.1.bottom/0.0.1366.728@0.0.1366.728" timestamp="1636701266732" />
-    <state width="1323" height="225" key="GridCell.Tab.1.center" timestamp="1636701266732">
+    <state width="1323" height="225" key="GridCell.Tab.1.bottom/0.0.1366.728@0.0.1366.728" timestamp="1636702435075" />
+    <state width="1323" height="225" key="GridCell.Tab.1.center" timestamp="1636702435075">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1323" height="225" key="GridCell.Tab.1.center/0.0.1366.728@0.0.1366.728" timestamp="1636701266732" />
-    <state width="1323" height="225" key="GridCell.Tab.1.left" timestamp="1636701266732">
+    <state width="1323" height="225" key="GridCell.Tab.1.center/0.0.1366.728@0.0.1366.728" timestamp="1636702435075" />
+    <state width="1323" height="225" key="GridCell.Tab.1.left" timestamp="1636702435075">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1323" height="225" key="GridCell.Tab.1.left/0.0.1366.728@0.0.1366.728" timestamp="1636701266732" />
-    <state width="1323" height="225" key="GridCell.Tab.1.right" timestamp="1636701266732">
+    <state width="1323" height="225" key="GridCell.Tab.1.left/0.0.1366.728@0.0.1366.728" timestamp="1636702435075" />
+    <state width="1323" height="225" key="GridCell.Tab.1.right" timestamp="1636702435075">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1323" height="225" key="GridCell.Tab.1.right/0.0.1366.728@0.0.1366.728" timestamp="1636701266732" />
-    <state width="1323" height="225" key="GridCell.Tab.2.bottom" timestamp="1636701266732">
+    <state width="1323" height="225" key="GridCell.Tab.1.right/0.0.1366.728@0.0.1366.728" timestamp="1636702435075" />
+    <state width="1323" height="225" key="GridCell.Tab.2.bottom" timestamp="1636702435075">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1323" height="225" key="GridCell.Tab.2.bottom/0.0.1366.728@0.0.1366.728" timestamp="1636701266732" />
-    <state width="1323" height="225" key="GridCell.Tab.2.center" timestamp="1636701266732">
+    <state width="1323" height="225" key="GridCell.Tab.2.bottom/0.0.1366.728@0.0.1366.728" timestamp="1636702435075" />
+    <state width="1323" height="225" key="GridCell.Tab.2.center" timestamp="1636702435075">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1323" height="225" key="GridCell.Tab.2.center/0.0.1366.728@0.0.1366.728" timestamp="1636701266732" />
-    <state width="1323" height="225" key="GridCell.Tab.2.left" timestamp="1636701266732">
+    <state width="1323" height="225" key="GridCell.Tab.2.center/0.0.1366.728@0.0.1366.728" timestamp="1636702435075" />
+    <state width="1323" height="225" key="GridCell.Tab.2.left" timestamp="1636702435075">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1323" height="225" key="GridCell.Tab.2.left/0.0.1366.728@0.0.1366.728" timestamp="1636701266732" />
-    <state width="1323" height="225" key="GridCell.Tab.2.right" timestamp="1636701266732">
+    <state width="1323" height="225" key="GridCell.Tab.2.left/0.0.1366.728@0.0.1366.728" timestamp="1636702435075" />
+    <state width="1323" height="225" key="GridCell.Tab.2.right" timestamp="1636702435075">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1323" height="225" key="GridCell.Tab.2.right/0.0.1366.728@0.0.1366.728" timestamp="1636701266732" />
+    <state width="1323" height="225" key="GridCell.Tab.2.right/0.0.1366.728@0.0.1366.728" timestamp="1636702435075" />
     <state x="184" y="8" key="SettingsEditor" timestamp="1636700851196">
       <screen x="0" y="0" width="1366" height="728" />
     </state>

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

@@ -15,7 +15,7 @@
                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
+        from SHIP_DYNAMICS sd where sd.LOCATION_VALUE is not null order by sd.BATCH_ID
     </select>
     <select id="selectByshipName" resultType="java.util.Map" parameterType="java.util.Map">
         select sd.GM_TONNAGE as "tonnage",