Merge branch 'master' of http://47.101.207.123:3000/lag/ghDatashare

ghjg-item-datashare-server/src/main/resources/mapper/CommonMapper.xml

@@ -254,7 +254,7 @@
     from (select T.MMSI                                                                mmsi,
                  T1.DIRECTION                                                          direction,
                  T1.VELOCITY                                                           velocity,
-                 T.LAST_UPDATE_DATE                                                    lastUpdateDate,
+                 T1.GPSTIME                                                            lastUpdateDate,
                  T1.LATITUDE                                                           latitude,
                  T1.LONGITUDE                                                          longtitude,
                  T.SHIP_NAME_EN                                                        shipNameEn,
@@ -275,14 +275,14 @@
           where t1.LATITUDE >= #{minLat}
             and t1.LATITUDE <= #{maxLat}
             and t1.LONGITUDE >= #{minLon}
-            and t1.LONGITUDE <= #{maxLon})
-            and t1.gpstime > sysdate - 30/24/60
+            and t1.LONGITUDE <= #{maxLon}
+            and t1.gpstime > sysdate - 30/24/60 )
     where rn = 1
   </select>
 
   <select id="selectBoatInfoByMmsi" resultType="com.shanghaichengdi.ghjgitem.vo.ShipDataVo">
     select *
-    from (select T.LAST_UPDATE_DATE lastUpdateDate,
+    from (select T1.GPSTIME lastUpdateDate,
     T1.LATITUDE latitude,
     T1.LONGITUDE longtitude,
     T1.DIRECTION direction,