定位

songhua-admin/src/main/java/com/songhua/web/controller/ship/CruiseShipMappingController.java

@@ -1,9 +1,7 @@
 package com.songhua.web.controller.ship;
 
 import java.util.List;
-import java.util.Map;
 
-import com.songhua.system.service.IBasicCruiseShipService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,8 +30,6 @@ public class CruiseShipMappingController extends BaseController
     @Autowired
     private ICruiseShipMappingService cruiseShipMappingService;
 
-    @Autowired
-    private IBasicCruiseShipService basicCruiseShipService;
 
     /**
      * 查询列表
@@ -99,4 +95,5 @@ public class CruiseShipMappingController extends BaseController
     public AjaxResult getGpsByDid(@PathVariable Long did) {
         return success(cruiseShipMappingService.getGpsByDid(did));
     }
+
 }

songhua-system/src/main/java/com/songhua/system/domain/HistoryGpsData.java

@@ -0,0 +1,46 @@
+package com.songhua.system.domain;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class HistoryGpsData {
+
+    /**
+     * 原始经度
+     */
+    private double lon;
+    /**
+     * 原始纬度
+     */
+    private double lat;
+    /**
+     * 百度修正经度
+     */
+    private double _lon;
+    /**
+     * 百度修正纬度
+     */
+    private double _lat;
+
+    /**
+     * 速度（单位：km/h）
+     */
+    private int speed;
+    /**
+     * 方向（正北为 0）
+     */
+    private int direct;
+
+    /**
+     * 定位时间
+     */
+    private Date gpsTime;
+    /**
+     * 接收时间
+     */
+    private Date rcvTime;
+
+    private double did;
+}

songhua-system/src/main/java/com/songhua/system/mapper/BasicCruiseShipMapper.java

@@ -58,4 +58,6 @@ public interface BasicCruiseShipMapper
      * @return 结果
      */
     public int deleteBasicCruiseShipByIds(Long[] ids);
+
+    public List<Long> selectDidList();
 }

songhua-system/src/main/java/com/songhua/system/mapper/CruiseShipMappingMapper.java

@@ -45,4 +45,6 @@ public interface CruiseShipMappingMapper {
     List<CruiseShipMapping> getShipRouteData(Long did);
 
     void saveCruiseShipMapping(@Param("list") List list);
+
+//    void saveEquipmentHistoryLocation(@Param("list") List list);
 }

songhua-system/src/main/java/com/songhua/system/service/IBasicCruiseShipService.java

@@ -58,4 +58,7 @@ public interface IBasicCruiseShipService
      * @return 结果
      */
     public int deleteBasicCruiseShipById(Long id);
+
+    public List<Long> selectDidList();
+
 }

songhua-system/src/main/java/com/songhua/system/service/ICruiseShipMappingService.java

@@ -49,6 +49,8 @@ public interface ICruiseShipMappingService
 
     void saveCruiseShipMapping(List objectList);
 
+//    void saveEquipmentHistoryLocation(List objectList);
+
     List<Map<String, Object>> getGpsByDid(Long did);
 
 }

songhua-system/src/main/java/com/songhua/system/service/impl/BasicCruiseShipServiceImpl.java

@@ -90,4 +90,10 @@ public class BasicCruiseShipServiceImpl implements IBasicCruiseShipService
     {
         return basicCruiseShipMapper.deleteBasicCruiseShipById(id);
     }
+
+    @Override
+    public List<Long> selectDidList() {
+
+        return basicCruiseShipMapper.selectDidList();
+    }
 }

songhua-system/src/main/java/com/songhua/system/service/impl/CruiseShipMappingServiceImpl.java

@@ -151,4 +151,9 @@ public class CruiseShipMappingServiceImpl implements ICruiseShipMappingService
         }
         return combinedData;
     }
+
+//    @Override
+//    public void saveEquipmentHistoryLocation(List objectList) {
+//        cruiseShipMappingMapper.saveEquipmentHistoryLocation(objectList);
+//    }
 }

songhua-system/src/main/resources/mapper/system/BasicCruiseShipMapper.xml

@@ -81,4 +81,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectDidList" resultType="java.lang.Long">
+        select registration_number from basic_cruise_ship
+    </select>
 </mapper>

songhua-system/src/main/resources/mapper/system/CruiseShipMappingMapper.xml

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="longitude"    column="longitude"    />
         <result property="latitude"    column="latitude"    />
         <result property="shipTime"    column="ship_time"    />
+        <result property="did"    column="did"    />
     </resultMap>
 
     <sql id="selectCruiseShipMappingVo">
@@ -23,7 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         b.ship_name,
         c.longitude,
         c.latitude,
-        c.ship_time
+        c.ship_time,
+        c.did
         FROM
         cruise_ship_mapping c
         left join basic_cruise_ship b ON c.did = b.registration_number
@@ -118,4 +120,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item.status},#{item.alerts},#{item.gpsTime},#{item.rcvTime}, NOW())
         </foreach>
     </insert>
+
+<!--    <insert id="saveEquipmentHistoryLocation" parameterType="List">-->
+<!--        insert into equipment_history_location ( did,-->
+<!--        longitude,latitude,lon,lat,speed,direct,gps_time,rcv_time,ship_time)-->
+<!--        values-->
+<!--        <foreach collection="list" item="item" separator=",">-->
+<!--            (#{item.did}, #{item.longitude}, #{item.latitude}, #{item.lon}, #{item.lat},-->
+<!--             #{item.speed}, #{item.direct},#{item.alerts},#{item.gpsTime},#{item.rcvTime}, NOW())-->
+<!--        </foreach>-->
+<!--    </insert>-->
 </mapper>