半成本

src/main/java/com/zy/bms/common/vo/LocationHistoryVo.java

@@ -1,37 +0,0 @@
-package com.zy.bms.common.vo;
-
-import lombok.Data;
-
-/**
- * 设备位置信息 历史记录
- *
- * @author yang xiao kun
- * create on 2021/2/8
- */
-@Data
-public class LocationHistoryVo {
-    /**
-     * 设备ID
-     */
-    private String deviceId;
-
-    /**
-     * 经度
-     */
-    private String lonGcj;
-
-    /**
-     * 纬度
-     */
-    private String latGcj;
-
-    /**
-     * 打点时间
-     */
-    private String dataCreateTime;
-
-    /**
-     * 定位模式
-     */
-    private Integer mode;
-}

src/main/java/com/zy/bms/config/mqtt/MqttCallbackHandler.java

@@ -29,9 +29,7 @@ public class MqttCallbackHandler {
     @Resource
     private SetService setService;
     @Resource
-    private DeviceLocationService deviceLocationService;
-    @Resource
-    private LatestLocationService latestLocationService;
+    private LocationService deviceLocationService;
     @Resource
     private WebSocketServer webSocketServer;
     @Resource
@@ -151,9 +149,6 @@ public class MqttCallbackHandler {
             location.setSpeed(obj.getString("speed"));
             location.setNum(obj.getInt("num"));
             location.setUploadTime(obj.getDate("createtime"));
-            Object cellInfo = obj.getObject("cellInfo");
-            //该数据项可能为空
-            if (cellInfo != null) location.setCellInfo(cellInfo.toString());
             //转换后的坐标
             String[] gcj = CoordTransformUtil.wgs84toGcj02(location.getLon(), location.getLat());
             location.setLonGcj(gcj[0]);

src/main/java/com/zy/bms/controller/pc/PcUserController.java

@@ -25,8 +25,8 @@ public class PcUserController {
     /**
      * 分页查询用户集合
      */
-    @PostMapping("getListPage.do")
-    public ServerResponse getListPage(UserIO io) {
-        return ServerResponse.createBySuccess(userService.getListPage(io));
+    @PostMapping("listPage.do")
+    public ServerResponse listPage(UserIO io) {
+        return ServerResponse.createBySuccess(userService.listPage(io));
     }
 }

src/main/java/com/zy/bms/controller/wx/DeviceController.java

@@ -3,7 +3,7 @@ package com.zy.bms.controller.wx;
 import com.zy.bms.common.controller.BaseController;
 import com.zy.bms.common.ServerResponse;
 import com.zy.bms.service.DeviceService;
-import com.zy.bms.service.RelationService;
+import com.zy.bms.service.DeviceDynamicService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -23,20 +23,7 @@ public class DeviceController extends BaseController {
     @Resource
     private DeviceService deviceService;
     @Resource
-    private RelationService relationService;
+    private DeviceDynamicService relationService;
+
 
-    /**
-     * 更新设备名称
-     *
-     * @param num  设备随机 num
-     * @param name 设备名称
-     */
-    @PostMapping("updateName.do")
-    public ServerResponse updateName(String num, String name) {
-        if (!relationService.checkDeviceIsBelongByNum(getUserId(), num)) {
-            return ServerResponse.createByIllegal();
-        }
-        deviceService.updateName(num, name);
-        return ServerResponse.createBySuccess();
-    }
 }

src/main/java/com/zy/bms/controller/wx/RelationController.java → src/main/java/com/zy/bms/controller/wx/DeviceDynamicController.java

@@ -5,7 +5,7 @@ import com.zy.bms.common.ServerResponse;
 import com.zy.bms.common.controller.BaseController;
 import com.zy.bms.model.DeviceDynamic;
 import com.zy.bms.service.DeviceService;
-import com.zy.bms.service.RelationService;
+import com.zy.bms.service.DeviceDynamicService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,25 +20,38 @@ import javax.annotation.Resource;
  * Create on 2020/8/1
  */
 @RestController
-@RequestMapping("omp/api/wx/relation")
-public class RelationController extends BaseController {
+@RequestMapping("omp/api/wx/deviceDynamic")
+public class DeviceDynamicController extends BaseController {
 
     @Resource
-    private RelationService relationService;
+    private DeviceDynamicService deviceDynamicService;
 
     @Resource
     private DeviceService deviceService;
 
+    /**
+     * 更新设备名称
+     *
+     * @param num  设备随机 num
+     * @param name 设备名称
+     */
+    @PostMapping("updateName.do")
+    public ServerResponse updateName(String num, String name) {
+        deviceDynamicService.updateName(getUserId(), num, name);
+        return ServerResponse.createBySuccess();
+    }
+
     /**
      * 添加绑定关系
      */
     @PostMapping("bind.do")
-    public ServerResponse bind(String deviceNum, String deviceName) {
-        if (deviceService.getByNum(deviceNum) == null)
+    public ServerResponse bind(DeviceDynamic entity) {
+        if (deviceService.getByNum(entity.getDeviceNum()) == null)
             return ServerResponse.createByWarning("无效设备码!");
-        if (relationService.checkDeviceIsBind(deviceNum))
+        if (deviceDynamicService.checkDeviceIsBind(entity.getDeviceNum()))
             return ServerResponse.createByWarning("该设备已经有用户绑定!");
-        relationService.saveEntity(getUserId(), deviceNum, deviceName);
+        entity.setUserId(getUserId());
+        deviceDynamicService.save(entity);
         return ServerResponse.createBySuccess();
     }
 
@@ -47,7 +60,7 @@ public class RelationController extends BaseController {
      */
     @PostMapping("unbind.do")
     public ServerResponse unbind(String deviceNum) {
-        relationService.unbind(deviceNum, getUserId());
+        deviceDynamicService.unbind(deviceNum, getUserId());
         return ServerResponse.createBySuccess();
     }
 
@@ -56,7 +69,7 @@ public class RelationController extends BaseController {
      */
     @GetMapping("getListByUserId.do")
     public ServerResponse getListByUserId() {
-        return ServerResponse.createBySuccess(relationService.getListByUserId(getUserId()));
+        return ServerResponse.createBySuccess(deviceDynamicService.getListByUserId(getUserId()));
     }
 
     /**
@@ -68,10 +81,10 @@ public class RelationController extends BaseController {
     @PostMapping("changeDefault.do")
     public ServerResponse changeDefault(String deviceNum) {
         //删除上一个默认设备
-        relationService.update(Wrappers.<DeviceDynamic>lambdaUpdate().eq(DeviceDynamic::getIsDefault, 1)
+        deviceDynamicService.update(Wrappers.<DeviceDynamic>lambdaUpdate().eq(DeviceDynamic::getIsDefault, 1)
                 .eq(DeviceDynamic::getUserId, getUserId()).set(DeviceDynamic::getIsDefault, 0));
         //添加新的默认设备
-        relationService.update(Wrappers.<DeviceDynamic>lambdaUpdate().eq(DeviceDynamic::getDeviceNum, deviceNum)
+        deviceDynamicService.update(Wrappers.<DeviceDynamic>lambdaUpdate().eq(DeviceDynamic::getDeviceNum, deviceNum)
                 .set(DeviceDynamic::getIsDefault, 1));
         return ServerResponse.createBySuccess();
     }

src/main/java/com/zy/bms/controller/wx/LocationController.java

@@ -1,10 +1,8 @@
 package com.zy.bms.controller.wx;
 
 import com.zy.bms.common.ServerResponse;
-import com.zy.bms.common.controller.BaseController;
 import com.zy.bms.common.io.wechat.DeviceHistoryIO;
-import com.zy.bms.service.DeviceLocationService;
-import com.zy.bms.service.RelationService;
+import com.zy.bms.service.LocationService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,22 +18,17 @@ import javax.annotation.Resource;
  */
 @RestController
 @RequestMapping("omp/api/wx/location")
-public class LocationController extends BaseController {
+public class LocationController {
 
     @Resource
-    private DeviceLocationService locationService;
-    @Resource
-    private RelationService relationService;
+    private LocationService locationService;
 
     /**
      * 通过设备ID获取最新的定位信息
      */
     @GetMapping("getLocation.do")
-    public ServerResponse getLocation(String deviceId) {
-        if (!relationService.checkDeviceIsBelongByDeviceId(getUserId(), deviceId)) {
-            return ServerResponse.createByIllegal();
-        }
-        return ServerResponse.createBySuccess(locationService.getLocation(deviceId));
+    public ServerResponse getLatestLocation(String deviceId) {
+        return ServerResponse.createBySuccess(locationService.getLatestLocation(deviceId));
     }
 
     /**

src/main/java/com/zy/bms/controller/wx/SetController.java

@@ -4,7 +4,7 @@ import com.zy.bms.common.Constant;
 import com.zy.bms.common.ServerResponse;
 import com.zy.bms.common.controller.BaseController;
 import com.zy.bms.common.io.wechat.*;
-import com.zy.bms.service.RelationService;
+import com.zy.bms.service.DeviceDynamicService;
 import com.zy.bms.service.SetService;
 import org.springframework.web.bind.annotation.*;
 
@@ -23,13 +23,13 @@ public class SetController extends BaseController {
     @Resource
     private SetService setService;
     @Resource
-    private RelationService relationService;
+    private DeviceDynamicService relationService;
 
     /**
      * 校验设备是否是该用户的设备
      */
     private boolean verify(SetIO io) {
-        boolean flag = relationService.checkDeviceIsBelongByDeviceId(getUserId(), io.getDeviceId());
+        boolean flag = relationService.checkBelong(getUserId(), io.getDeviceId());
         if (!flag) {
             System.out.println("非法请求----" + getUserId() + "-----" + io.getDeviceId());
         }

src/main/java/com/zy/bms/controller/wx/SetInfoController.java

@@ -5,7 +5,6 @@ import com.zy.bms.common.controller.BaseController;
 import com.zy.bms.common.io.CallRecordsIO;
 import com.zy.bms.common.io.NewsIO;
 import com.zy.bms.service.CallRecordsService;
-import com.zy.bms.service.RelationService;
 import com.zy.bms.service.SetBaseService;
 import com.zy.bms.service.SetNewsService;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -30,8 +29,6 @@ public class SetInfoController extends BaseController {
     private CallRecordsService callRecordsService;
     @Resource
     private SetNewsService setNewsService;
-    @Resource
-    private RelationService relationService;
 
     /**
      * 查询设备的音量设置
@@ -41,9 +38,6 @@ public class SetInfoController extends BaseController {
      */
     @GetMapping("volume.do")
     public ServerResponse volume(String deviceId) {
-        if (!relationService.checkDeviceIsBelongByDeviceId(getUserId(), deviceId)) {
-            return ServerResponse.createByIllegal();
-        }
         return ServerResponse.createBySuccess(setBaseService.getVolumeSet(deviceId));
     }
 
@@ -55,9 +49,6 @@ public class SetInfoController extends BaseController {
      */
     @GetMapping("other.do")
     public ServerResponse other(String deviceId) {
-        if (!relationService.checkDeviceIsBelongByDeviceId(getUserId(), deviceId)) {
-            return ServerResponse.createByIllegal();
-        }
         return ServerResponse.createBySuccess(setBaseService.getOtherSet(deviceId));
     }
 
@@ -68,9 +59,6 @@ public class SetInfoController extends BaseController {
      */
     @GetMapping("sos.do")
     public ServerResponse sos(String deviceId) {
-        if (!relationService.checkDeviceIsBelongByDeviceId(getUserId(), deviceId)) {
-            return ServerResponse.createByIllegal();
-        }
         return ServerResponse.createBySuccess(setBaseService.getSosSet(deviceId));
     }
 
@@ -79,9 +67,6 @@ public class SetInfoController extends BaseController {
      */
     @GetMapping("callRecords.do")
     public ServerResponse callRecords(CallRecordsIO io) {
-        if (!relationService.checkDeviceIsBelongByDeviceId(getUserId(), io.getDeviceId())) {
-            return ServerResponse.createByIllegal();
-        }
         return ServerResponse.createBySuccess(callRecordsService.getListPage(io));
     }
 
@@ -90,9 +75,6 @@ public class SetInfoController extends BaseController {
      */
     @GetMapping("news.do")
     public ServerResponse news(NewsIO io) {
-        if (!relationService.checkDeviceIsBelongByDeviceId(getUserId(), io.getDeviceId())) {
-            return ServerResponse.createByIllegal();
-        }
         return ServerResponse.createBySuccess(setNewsService.getListPage(io));
     }
 }

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

@@ -33,19 +33,11 @@ public interface DeviceDynamicMapper extends BaseMapper<DeviceDynamic> {
      */
     int checkDeviceIsBind(@Param("deviceNum") String deviceNum);
 
-    /**
-     * 查询设备是否属于某用户
-     *
-     * @param userId    用户ID
-     * @param deviceNum 设备号
-     */
-    int checkDeviceIsBelongByNum(@Param("userId") String userId, @Param("deviceNum") String deviceNum);
-
     /**
      * 查询设备是否属于某用户
      *
      * @param userId   用户ID
      * @param deviceId 设备ID
      */
-    int checkBelongByDeviceId(@Param("userId") String userId, @Param("deviceId") String deviceId);
+    int checkBelong(@Param("userId") String userId, @Param("deviceId") String deviceId);
 }

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

@@ -1,28 +0,0 @@
-package com.zy.bms.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zy.bms.common.io.wechat.DeviceHistoryIO;
-import com.zy.bms.common.vo.LocationHistoryVo;
-import com.zy.bms.model.Location;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * 设备位置信息
- *
- * @author chenyi
- * Create on 2020/4/10
- */
-@Mapper
-@Repository
-public interface DeviceLocationMapper extends BaseMapper<Location> {
-
-    /**
-     * 查看设备历史轨迹
-     *
-     * @param io 查询入参
-     */
-    List<LocationHistoryVo> getHistory(DeviceHistoryIO io);
-}

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

@@ -0,0 +1,17 @@
+package com.zy.bms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zy.bms.model.Location;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 设备位置信息
+ *
+ * @author chenyi
+ * Create on 2020/4/10
+ */
+@Mapper
+@Repository
+public interface LocationMapper extends BaseMapper<Location> {
+}

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

@@ -23,5 +23,5 @@ public interface UserMapper extends BaseMapper<User> {
      * @param page 分页条件
      * @param io   查询条件
      */
-    IPage<User> getListPage(IPage<User> page, @Param("io") UserIO io);
+    IPage<User> listPage(IPage<User> page, @Param("io") UserIO io);
 }

src/main/java/com/zy/bms/model/DeviceDynamic.java

@@ -25,6 +25,11 @@ public class DeviceDynamic {
      */
     private String userId;
 
+    /**
+     * 设备ID
+     */
+    private String deviceId;
+
     /**
      * 设备随机码
      */

src/main/java/com/zy/bms/model/News.java

@@ -25,17 +25,20 @@ public class News {
     private String deviceId;
 
     /**
-     * 星期几的几点几分播报，星期之间逗号间隔，星期与时间空格间隔 1,2,3,4,5 13:23
+     * 星期几的几点几分播报
+     * 星期之间逗号间隔
+     * 星期与时间空格间隔 1,2,3,4,5 13:23
      */
     private String newsTime;
 
     /**
-     * 播报类型，1:实时播报，0:固定时间播报
+     * 播报类型
+     * 1:实时播报，0:固定时间播报
      */
     private Integer newsType;
 
     /**
-     * 服务器下发文字，播报完自动删除
+     * 服务器下发文字
      */
     private String news;
 

src/main/java/com/zy/bms/model/User.java

@@ -21,10 +21,6 @@ import java.time.LocalDateTime;
 public class User {
     @TableId
     private Integer id;
-    /**
-     * 手机号
-     */
-    private String phone;
 
     /**
      * 微信

src/main/java/com/zy/bms/service/RelationService.java → src/main/java/com/zy/bms/service/DeviceDynamicService.java

@@ -1,16 +1,15 @@
 package com.zy.bms.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zy.bms.mapper.DeviceDynamicMapper;
 import com.zy.bms.model.DeviceDynamic;
 import com.zy.bms.common.vo.DeviceRelationVo;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.List;
 
-
 /**
  * 用户设备绑定关系Service
  *
@@ -18,25 +17,7 @@ import java.util.List;
  * Create on 2020/4/10
  */
 @Service
-public class RelationService extends ServiceImpl<DeviceDynamicMapper, DeviceDynamic> {
-
-    @Resource
-    private DeviceService deviceService;
-
-    /**
-     * 添加绑定关系
-     *
-     * @param userId     用户ID
-     * @param deviceNum  设备随机码
-     * @param deviceName 设备名称
-     */
-    public void saveEntity(String userId, String deviceNum, String deviceName) {
-        DeviceDynamic entity = new DeviceDynamic();
-        entity.setUserId(userId);
-        entity.setDeviceNum(deviceNum);
-        baseMapper.insert(entity);
-        deviceService.updateName(deviceNum, deviceName);
-    }
+public class DeviceDynamicService extends ServiceImpl<DeviceDynamicMapper, DeviceDynamic> {
 
     /**
      * 通过设备号删除绑定关系
@@ -74,8 +55,10 @@ public class RelationService extends ServiceImpl<DeviceDynamicMapper, DeviceDyna
      * @param userId    用户ID
      * @param deviceNum 设备码
      */
-    public boolean checkDeviceIsBelongByNum(String userId, String deviceNum) {
-        return baseMapper.checkDeviceIsBelongByNum(userId, deviceNum) > 0;
+    public void updateName(String userId, String deviceNum, String newName) {
+        UpdateWrapper<DeviceDynamic> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("name", newName).eq("userId", userId).eq("deviceNum", deviceNum);
+        update(updateWrapper);
     }
 
     /**
@@ -84,7 +67,7 @@ public class RelationService extends ServiceImpl<DeviceDynamicMapper, DeviceDyna
      * @param userId   用户ID
      * @param deviceId 设备ID
      */
-    public boolean checkDeviceIsBelongByDeviceId(String userId, String deviceId) {
-        return baseMapper.checkDeviceIsBelongByDeviceId(userId, deviceId) > 0;
+    public boolean checkBelong(String userId, String deviceId) {
+        return baseMapper.checkBelong(userId, deviceId) > 0;
     }
 }

src/main/java/com/zy/bms/service/DeviceLocationService.java → src/main/java/com/zy/bms/service/LocationService.java

@@ -3,8 +3,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.io.wechat.DeviceHistoryIO;
-import com.zy.bms.common.vo.LocationHistoryVo;
-import com.zy.bms.mapper.DeviceLocationMapper;
+import com.zy.bms.mapper.LocationMapper;
 import com.zy.bms.model.Location;
 import com.zy.bms.model.LatestLocation;
 import com.zy.bms.utils.BeanUtil;
@@ -20,7 +19,7 @@ import java.util.List;
  * Create on 2020/4/10
  */
 @Service
-public class DeviceLocationService extends ServiceImpl<DeviceLocationMapper, Location> {
+public class LocationService extends ServiceImpl<LocationMapper, Location> {
 
     @Resource
     private LatestLocationService latestLocationService;
@@ -42,7 +41,7 @@ public class DeviceLocationService extends ServiceImpl<DeviceLocationMapper, Loc
      *
      * @param deviceId 设备ID
      */
-    public LatestLocation getLocation(String deviceId) {
+    public LatestLocation getLatestLocation(String deviceId) {
         QueryWrapper<LatestLocation> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("deviceId", deviceId);
         return latestLocationService.getOne(queryWrapper);
@@ -53,8 +52,14 @@ public class DeviceLocationService extends ServiceImpl<DeviceLocationMapper, Loc
      *
      * @param io 查询入参
      */
-    public List<LocationHistoryVo> getHistory(DeviceHistoryIO io) {
-        return baseMapper.getHistory(io);
+    public List<Location> getHistory(DeviceHistoryIO io) {
+        QueryWrapper<Location> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("lonGcj", "latGcj", "uploadTime")
+                .eq("deviceId", io.getDeviceId())
+                .ge("uploadTime", io.getStartTime())
+                .le("uploadTime", io.getEndTime())
+                .orderByDesc("uploadTime");
+        return baseMapper.selectList(queryWrapper);
     }
 
 }

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

@@ -29,9 +29,9 @@ public class UserService extends ServiceImpl<UserMapper, User> {
      *
      * @param io 查询条件
      */
-    public IPage<User> getListPage(UserIO io) {
+    public IPage<User> listPage(UserIO io) {
         Page<User> page = new Page<>(io.getCurrent(), io.getSize());
-        return baseMapper.getListPage(page, io);
+        return baseMapper.listPage(page, io);
     }
 
     /**

src/main/resources/mapper/DeviceDynamicMapping.xml

@@ -19,12 +19,7 @@
         SELECT IFNULL( (SELECT 1 FROM device_dynamic WHERE deviceNum = #{deviceNum} LIMIT 1) ,0)
     </select>
 
-    <select id="checkBelongByNum" resultType="java.lang.Integer">
-        SELECT IFNULL( (SELECT 1 FROM device_dynamic WHERE deviceNum = #{deviceNum} AND userId=#{userId} LIMIT 1),0 )
-    </select>
-
-    <select id="checkBelongByDeviceId" resultType="java.lang.Integer">
-        SELECT IFNULL( (SELECT 1 FROM zy_device t1 INNER JOIN device_dynamic t2 ON t1.num = t2.deviceNum WHERE
-            t1.clientId = #{deviceId} AND t2.userId = #{userId} LIMIT 1),0)
+    <select id="checkBelong" resultType="java.lang.Integer">
+        SELECT IFNULL((SELECT 1 FROM device_dynamic WHERE deviceId = #{deviceId} AND userId = #{userId} LIMIT 1), 0)
     </select>
 </mapper>

src/main/resources/mapper/DeviceLocationMapping.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.bms.mapper.DeviceLocationMapper">
-
-    <select id="getHistory" resultType="com.zy.bms.common.vo.LocationHistoryVo">
-        SELECT
-            deviceId,
-            lonGcj,
-            latGcj,
-            uploadTime,
-            `mode`
-        FROM
-            zy_location
-        WHERE
-            deviceId = #{deviceId} AND uploadTime >= #{startTime} AND uploadTime &lt;= #{endTime}
-        ORDER BY uploadTime DESC
-    </select>
-</mapper>

src/main/resources/mapper/DeviceMapping.xml

@@ -8,9 +8,10 @@
             t1.password,
             t1.createTime,
             t1.status,
-            t1.`name`,
+            t1.name,
+            t1.lastOnlineTime,
             t2.deviceId,
-            t2.`mode`,
+            t2.mode,
             t2.lon,
             t2.lat,
             t2.lonGcj,
@@ -26,7 +27,7 @@
         LEFT JOIN latest_location t2 ON t1.clientId = t2.deviceId
         <where>
             <if test="io.num != null and io.num != ''">
-                AND (t1.num LIKE CONCAT("%",#{io.num},"%") OR t1.clientId LIKE CONCAT("%",#{io.num},"%"))
+                AND (t1.num LIKE CONCAT('%',#{io.num},'%') OR t1.clientId LIKE CONCAT('%',#{io.num},'%'))
             </if>
             <if test="io.status != null and io.status > -1">
                 AND t1.status = #{io.status}

src/main/resources/mapper/LatestLocationMapping.xml

@@ -10,6 +10,6 @@
             t2.*
         FROM
         zy_device t1
-        LEFT JOIN latest_location t2 ON t1.deviceId = t2.deviceId
+        LEFT JOIN latest_location t2 ON t1.clientId = t2.deviceId
     </select>
 </mapper>

src/main/resources/mapper/LocationMapping.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.bms.mapper.LocationMapper">
+</mapper>

src/main/resources/mapper/UserMapping.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zy.bms.mapper.UserMapper">
 
-    <select id="getListPage" resultType="com.zy.bms.model.User">
+    <select id="listPage" resultType="com.zy.bms.model.User">
         SELECT
             id,
             username,