独立拆出老人机项目

src/main/java/com/zy/bms/common/controller/BaseController.java

@@ -32,13 +32,4 @@ public class BaseController {
         if (userId == null) throw new ApiRuntimeException("未登录");
         return userId;
     }
-
-    /**
-     * 获取token
-     */
-    public String getToken() {
-        String token = request.getHeader("token");
-        if (token == null) throw new ApiRuntimeException("未登录");
-        return token;
-    }
 }

src/main/java/com/zy/bms/common/io/wechat/UserDeviceRelationIO.java

@@ -1,25 +0,0 @@
-package com.zy.bms.common.io.wechat;
-
-import lombok.Data;
-
-/**
- * 设备绑定关系 入参IO
- *
- * @author yang xiao kun
- * create on 2021/1/20
- */
-@Data
-public class UserDeviceRelationIO {
-    /**
-     * 设备ID
-     */
-    private String deviceNum;
-    /**
-     * 用户ID
-     */
-    private String userId;
-    /**
-     * 设备名
-     */
-    private String deviceName;
-}

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

@@ -1,17 +0,0 @@
-package com.zy.bms.common.vo;
-
-import lombok.Data;
-
-/**
- * 设备查询结果表
- *
- * @author chen_yi
- * Create on 2020/8/1
- */
-@Data
-public class DeviceRelationVo {
-    private String num;//设备随机码
-    private String name;//设备名称
-    private String deviceId;//设备ID
-    private Integer isDefault;//是否是默认设备 0:不是 1:是
-}

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

@@ -1,9 +1,13 @@
 package com.zy.bms.controller.wx;
 
-import com.zy.bms.common.controller.BaseController;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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.DeviceDynamicService;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -11,19 +15,81 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 
 /**
- * 设备相关
+ * 用户设备绑定关系
  *
- * @author yang xiao kun
- * create on 2021/1/21
+ * @author chen_yi
+ * Create on 2020/8/1
  */
 @RestController
 @RequestMapping("omp/api/wx/device")
 public class DeviceController extends BaseController {
 
     @Resource
-    private DeviceService deviceService;
+    private DeviceDynamicService deviceDynamicService;
+
     @Resource
-    private DeviceDynamicService relationService;
+    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(DeviceDynamic entity) {
+        if (deviceService.getByNum(entity.getDeviceNum()) == null)
+            return ServerResponse.createByWarning("无效设备码!");
+        if (deviceDynamicService.checkBind(entity.getDeviceNum()))
+            return ServerResponse.createByWarning("该设备已经有用户绑定!");
+        entity.setUserId(getUserId());
+        deviceDynamicService.save(entity);
+        return ServerResponse.createBySuccess();
+    }
+
+    /**
+     * 解除绑定关系
+     */
+    @PostMapping("unbind.do")
+    public ServerResponse unbind(String deviceNum) {
+        deviceDynamicService.unbind(deviceNum, getUserId());
+        return ServerResponse.createBySuccess();
+    }
 
+    /**
+     * 查询用户的所有设备
+     */
+    @GetMapping("getListByUserId.do")
+    public ServerResponse getListByUserId() {
+        QueryWrapper<DeviceDynamic> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("userId", getUserId());
+        queryWrapper.orderByDesc("isDefault");
+        return ServerResponse.createBySuccess(deviceDynamicService.list(queryWrapper));
+    }
 
+    /**
+     * 修改默认设备
+     * 即登陆以后使用那个设备
+     *
+     * @param deviceNum 设备码
+     */
+    @PostMapping("changeDefault.do")
+    public ServerResponse changeDefault(String deviceNum) {
+        //删除上一个默认设备
+        deviceDynamicService.update(Wrappers.<DeviceDynamic>lambdaUpdate().eq(DeviceDynamic::getIsDefault, 1)
+                .eq(DeviceDynamic::getUserId, getUserId()).set(DeviceDynamic::getIsDefault, 0));
+        //添加新的默认设备
+        deviceDynamicService.update(Wrappers.<DeviceDynamic>lambdaUpdate().eq(DeviceDynamic::getDeviceNum, deviceNum)
+                .set(DeviceDynamic::getIsDefault, 1));
+        return ServerResponse.createBySuccess();
+    }
 }

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

@@ -1,91 +0,0 @@
-package com.zy.bms.controller.wx;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-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.DeviceDynamicService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * 用户设备绑定关系
- *
- * @author chen_yi
- * Create on 2020/8/1
- */
-@RestController
-@RequestMapping("omp/api/wx/deviceDynamic")
-public class DeviceDynamicController extends BaseController {
-
-    @Resource
-    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(DeviceDynamic entity) {
-        if (deviceService.getByNum(entity.getDeviceNum()) == null)
-            return ServerResponse.createByWarning("无效设备码!");
-        if (deviceDynamicService.checkDeviceIsBind(entity.getDeviceNum()))
-            return ServerResponse.createByWarning("该设备已经有用户绑定!");
-        entity.setUserId(getUserId());
-        deviceDynamicService.save(entity);
-        return ServerResponse.createBySuccess();
-    }
-
-    /**
-     * 解除绑定关系
-     */
-    @PostMapping("unbind.do")
-    public ServerResponse unbind(String deviceNum) {
-        deviceDynamicService.unbind(deviceNum, getUserId());
-        return ServerResponse.createBySuccess();
-    }
-
-    /**
-     * 查询用户的所有设备
-     */
-    @GetMapping("getListByUserId.do")
-    public ServerResponse getListByUserId() {
-        return ServerResponse.createBySuccess(deviceDynamicService.getListByUserId(getUserId()));
-    }
-
-    /**
-     * 修改默认设备
-     * 即登陆以后使用那个设备
-     *
-     * @param deviceNum 设备码
-     */
-    @PostMapping("changeDefault.do")
-    public ServerResponse changeDefault(String deviceNum) {
-        //删除上一个默认设备
-        deviceDynamicService.update(Wrappers.<DeviceDynamic>lambdaUpdate().eq(DeviceDynamic::getIsDefault, 1)
-                .eq(DeviceDynamic::getUserId, getUserId()).set(DeviceDynamic::getIsDefault, 0));
-        //添加新的默认设备
-        deviceDynamicService.update(Wrappers.<DeviceDynamic>lambdaUpdate().eq(DeviceDynamic::getDeviceNum, deviceNum)
-                .set(DeviceDynamic::getIsDefault, 1));
-        return ServerResponse.createBySuccess();
-    }
-}

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

@@ -6,7 +6,7 @@ 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.SetBaseService;
-import com.zy.bms.service.SetNewsService;
+import com.zy.bms.service.NewsService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -28,7 +28,7 @@ public class SetInfoController extends BaseController {
     @Resource
     private CallRecordsService callRecordsService;
     @Resource
-    private SetNewsService setNewsService;
+    private NewsService setNewsService;
 
     /**
      * 查询设备的音量设置

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

@@ -2,13 +2,10 @@ package com.zy.bms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zy.bms.model.DeviceDynamic;
-import com.zy.bms.common.vo.DeviceRelationVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
-
 /**
  * 用户设备绑定关系表
  *
@@ -19,19 +16,12 @@ import java.util.List;
 @Repository
 public interface DeviceDynamicMapper extends BaseMapper<DeviceDynamic> {
 
-    /**
-     * 查询用户绑定的设备集合
-     *
-     * @param userId 用户ID
-     */
-    List<DeviceRelationVo> getListByUserId(@Param("userId") String userId);
-
     /**
      * 查询设备是否有绑定用户
      *
      * @param deviceNum 设备号
      */
-    int checkDeviceIsBind(@Param("deviceNum") String deviceNum);
+    int checkBind(@Param("deviceNum") String deviceNum);
 
     /**
      * 查询设备是否属于某用户

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

@@ -28,14 +28,6 @@ public interface DeviceMapper extends BaseMapper<Device> {
      */
     IPage<DeviceFullDataVo> listPage(IPage<DeviceFullDataVo> page, @Param("io") DeviceIO io);
 
-    /**
-     * 更新设备名称
-     *
-     * @param num  设备号
-     * @param name 名称
-     */
-    void updateName(@Param("num") String num, @Param("name") String name);
-
     /**
      * 批量更新设备在线状态
      */

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

@@ -5,7 +5,6 @@ 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 java.util.List;
@@ -31,22 +30,13 @@ public class DeviceDynamicService extends ServiceImpl<DeviceDynamicMapper, Devic
         baseMapper.delete(queryWrapper);
     }
 
-    /**
-     * 查询用户绑定的设备集合
-     *
-     * @param userId 用户ID
-     */
-    public List<DeviceRelationVo> getListByUserId(String userId) {
-        return baseMapper.getListByUserId(userId);
-    }
-
     /**
      * 查询设备是否有绑定关系
      *
      * @param deviceNum 设备号
      */
-    public boolean checkDeviceIsBind(String deviceNum) {
-        return baseMapper.checkDeviceIsBind(deviceNum) > 0;
+    public boolean checkBind(String deviceNum) {
+        return baseMapper.checkBind(deviceNum) > 0;
     }
 
     /**

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

@@ -50,16 +50,6 @@ public class DeviceService extends ServiceImpl<DeviceMapper, Device> {
         return baseMapper.selectOne(queryWrapper);
     }
 
-    /**
-     * 更新设备名称
-     *
-     * @param num  设备号
-     * @param name 名称
-     */
-    public void updateName(String num, String name) {
-        baseMapper.updateName(num, name);
-    }
-
     /**
      * 通过设备 clientId 获取设备信息
      *

src/main/java/com/zy/bms/service/SetNewsService.java → src/main/java/com/zy/bms/service/NewsService.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
  * Create on 2020/4/10
  */
 @Service
-public class SetNewsService extends ServiceImpl<NewsMapper, News> {
+public class NewsService extends ServiceImpl<NewsMapper, News> {
     /**
      * 分页查询播报记录
      *

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

@@ -27,7 +27,7 @@ public class SetService {
     @Resource
     private SetBaseService setBaseService;
     @Resource
-    private SetNewsService setNewsService;
+    private NewsService setNewsService;
     @Resource
     private MqttGateway mqttGateway;
     @Resource

src/main/resources/mapper/DeviceDynamicMapping.xml

@@ -4,22 +4,11 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zy.bms.mapper.DeviceDynamicMapper">
 
-    <select id="getListByUserId" resultType="com.zy.bms.common.vo.DeviceRelationVo">
-        SELECT t1.isDefault,
-               t2.num,
-               t2.name,
-               t2.clientId AS deviceId
-        FROM device_dynamic t1
-                 INNER JOIN zy_device t2 ON t1.deviceNum = t2.num
-        WHERE t1.userId = #{userId}
-        ORDER BY t1.isDefault DESC
-    </select>
-
-    <select id="checkDeviceIsBind" resultType="java.lang.Integer">
+    <select id="checkBind" resultType="java.lang.Integer">
         SELECT IFNULL( (SELECT 1 FROM device_dynamic WHERE deviceNum = #{deviceNum} LIMIT 1) ,0)
     </select>
 
     <select id="checkBelong" resultType="java.lang.Integer">
-        SELECT IFNULL((SELECT 1 FROM device_dynamic WHERE deviceId = #{deviceId} AND userId = #{userId} LIMIT 1), 0)
+        SELECT IFNULL( (SELECT 1 FROM device_dynamic WHERE deviceId = #{deviceId} AND userId = #{userId} LIMIT 1), 0)
     </select>
 </mapper>

src/main/resources/mapper/DeviceMapping.xml

@@ -8,10 +8,9 @@
             t1.password,
             t1.createTime,
             t1.status,
-            t1.name,
             t1.lastOnlineTime,
             t2.deviceId,
-            t2.mode,
+            t2.`mode`,
             t2.lon,
             t2.lat,
             t2.lonGcj,
@@ -23,7 +22,7 @@
             t2.speed,
             t2.uploadTime
         FROM
-            zy_device t1
+            device t1
         LEFT JOIN latest_location t2 ON t1.clientId = t2.deviceId
         <where>
             <if test="io.num != null and io.num != ''">
@@ -37,13 +36,6 @@
             t1.createTime DESC
     </select>
 
-    <update id="updateName">
-        UPDATE
-        zy_device
-        SET name = #{name}
-        WHERE num = #{num}
-    </update>
-
     <update id="updateDeviceStatus">
         UPDATE
             zy_device

src/main/resources/mapper/LatestLocationMapping.xml

@@ -9,7 +9,7 @@
             t1.num AS deviceNum,
             t2.*
         FROM
-        zy_device t1
+            device t1
         LEFT JOIN latest_location t2 ON t1.clientId = t2.deviceId
     </select>
 </mapper>

src/main/resources/mapper/MqttLogMapping.xml

@@ -6,9 +6,9 @@
 
     <select id="getListPage" resultType="com.zy.bms.model.MqttLog">
         SELECT
-        *
+            *
         FROM
-        mqtt_log
+            mqtt_log
         <where>
             <if test="io.deviceId != null and io.deviceId != ''">
                 AND deviceId LIKE CONCAT("%",#{io.deviceId},"%")

src/main/resources/mapper/UserMapping.xml

@@ -15,7 +15,7 @@
             province,
             city,
             createTime
-        FROM user
+        FROM `user`
         <where>
             <if test="io.key != null and io.key != ''">
                 AND (username LIKE CONCAT("%",#{io.key},"%")