更新最新位置信息存储位置

src/main/java/com/zy/bms/common/vo/DeviceWithLocationVo.java → src/main/java/com/zy/bms/common/vo/DeviceFullDataVo.java

@@ -11,17 +11,36 @@ import java.time.LocalDateTime;
  * create on 2021/5/12
  */
 @Data
-public class DeviceWithLocationVo {
+public class DeviceFullDataVo {
     /**
      * 设备随机码
      */
     private String deviceNum;
-
     /**
      * 设备ID
      */
     private String deviceId;
 
+    /**
+     * 设备MQTT 连接密码
+     */
+    private String password;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 设备状态，1注册完成，0待确认
+     */
+    private Integer status;
+
+    /**
+     * 设备名
+     */
+    private String name;
+
     /**
      * 电量
      */

src/main/java/com/zy/bms/mapper/DeviceMapper.java

@@ -3,6 +3,7 @@ package com.zy.bms.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zy.bms.common.io.pc.DeviceIO;
+import com.zy.bms.common.vo.DeviceFullDataVo;
 import com.zy.bms.model.Device;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -23,7 +24,7 @@ public interface DeviceMapper extends BaseMapper<Device> {
      * @param page 分页条件
      * @param io   查询条件
      */
-    IPage<Device> getListPage(IPage<Device> page, @Param("io") DeviceIO io);
+    IPage<DeviceFullDataVo> getListPage(IPage<DeviceFullDataVo> page, @Param("io") DeviceIO io);
 
     /**
      * 更新设备名称

src/main/java/com/zy/bms/mapper/LatestLocationMapper.java

@@ -1,7 +1,7 @@
 package com.zy.bms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zy.bms.common.vo.DeviceWithLocationVo;
+import com.zy.bms.common.vo.DeviceFullDataVo;
 import com.zy.bms.model.LatestLocation;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
@@ -21,5 +21,5 @@ public interface LatestLocationMapper extends BaseMapper<LatestLocation> {
     /**
      * 获取所有设备最新的位置信息
      */
-    List<DeviceWithLocationVo> getLatestLocation();
+    List<DeviceFullDataVo> getLatestLocation();
 }

src/main/java/com/zy/bms/service/DeviceService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zy.bms.common.io.pc.DeviceIO;
+import com.zy.bms.common.vo.DeviceFullDataVo;
 import com.zy.bms.mapper.DeviceMapper;
 import com.zy.bms.model.Device;
 import org.springframework.stereotype.Service;
@@ -25,8 +26,8 @@ public class DeviceService extends ServiceImpl<DeviceMapper, Device> {
      *
      * @param io 查询条件
      */
-    public IPage<Device> getListPage(DeviceIO io) {
-        Page<Device> page = new Page<>(io.getCurrent(), io.getSize());
+    public IPage<DeviceFullDataVo> getListPage(DeviceIO io) {
+        Page<DeviceFullDataVo> page = new Page<>(io.getCurrent(), io.getSize());
         return baseMapper.getListPage(page, io);
     }
 

src/main/java/com/zy/bms/service/LatestLocationService.java

@@ -2,7 +2,7 @@ package com.zy.bms.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.bms.common.vo.DeviceWithLocationVo;
+import com.zy.bms.common.vo.DeviceFullDataVo;
 import com.zy.bms.mapper.LatestLocationMapper;
 import com.zy.bms.model.DeviceLocation;
 import com.zy.bms.model.LatestLocation;
@@ -33,7 +33,7 @@ public class LatestLocationService extends ServiceImpl<LatestLocationMapper, Lat
     /**
      * 获取所有设备最新的位置信息
      */
-    public List<DeviceWithLocationVo> getLatestLocation() {
+    public List<DeviceFullDataVo> getLatestLocation() {
         return baseMapper.getLatestLocation();
     }
 }

src/main/resources/mapper/CallRecordsMapping.xml

@@ -19,8 +19,6 @@
                 AND `type` = #{io.type}
             </if>
         </where>
-        <if test="io.orderBy != null and io.orderBy !=''">
-            ORDER BY ${io.orderBy} ${io.order}
-        </if>
+            ORDER BY createTime DESC
     </select>
 </mapper>

src/main/resources/mapper/DeviceMapping.xml

@@ -2,10 +2,29 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zy.bms.mapper.DeviceMapper">
 
-    <select id="getListPage" resultType="com.zy.bms.model.Device">
+    <select id="getListPage" resultType="com.zy.bms.common.vo.DeviceFullDataVo">
         SELECT
-        id,num,clientId,password,createTime,tags,status,groupId
-        FROM zy_device
+            t1.num AS deviceNum,
+            t1.password,
+            t1.createTime,
+            t1.status,
+            t1.`name`,
+            t2.deviceId,
+            t2.`mode`,
+            t2.lon,
+            t2.lat,
+            t2.lonGcj,
+            t2.latGcj,
+            t2.site,
+            t2.batteryNum,
+            t2.signalNum,
+            t2.num,
+            t2.speed,
+            t2.uploadTime
+        FROM
+            zy_device t1
+        LEFT JOIN
+            latest_location t2 ON t1.deviceId = t2.deviceId
         <where>
             <if test="io.num != null and io.num != ''">
                 AND (num LIKE CONCAT("%",#{io.num},"%") OR clientId LIKE CONCAT("%",#{io.num},"%"))
@@ -17,12 +36,13 @@
                 AND groupId = #{io.groupId}
             </if>
         </where>
-        ORDER BY createTime DESC
+        ORDER BY
+            t1.createTime DESC
     </select>
 
     <update id="updateName">
         UPDATE
-            zy_device
+        zy_device
         SET name = #{name}
         WHERE num = #{num}
     </update>

src/main/resources/mapper/LatestLocationMapping.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zy.bms.mapper.LatestLocationMapper">
 
-    <select id="getLatestLocation" resultType="com.zy.bms.common.vo.DeviceWithLocationVo">
+    <select id="getLatestLocation" resultType="com.zy.bms.common.vo.DeviceFullDataVo">
         SELECT
             t1.num AS deviceNum,
             t2.*