独立拆出老人机项目

src/main/java/com/zy/bms/common/redis/DeviceLatestLocationManager.java

@@ -2,7 +2,7 @@ package com.zy.bms.common.redis;
 
 import com.alibaba.fastjson.JSON;
 import com.zy.bms.common.Constant;
-import com.zy.bms.model.DeviceLocation;
+import com.zy.bms.model.Location;
 import org.springframework.data.redis.core.RedisTemplate;
 
 import javax.annotation.Resource;
@@ -26,7 +26,7 @@ public class DeviceLatestLocationManager {
      *
      * @param entity 位置信息
      */
-    public void saveLocation(DeviceLocation entity) {
+    public void saveLocation(Location entity) {
         redisTemplate.boundHashOps(Constant.REDIS_LOCATION).put(entity.getDeviceId(), JSON.toJSONString(entity));
     }
 
@@ -35,9 +35,9 @@ public class DeviceLatestLocationManager {
      *
      * @param deviceId 设备ID
      */
-    public DeviceLocation getLocation(String deviceId) {
+    public Location getLocation(String deviceId) {
         Object json = redisTemplate.boundHashOps(Constant.REDIS_LOCATION).get(deviceId);
         if (json == null) return null;
-        return JSON.parseObject(json.toString(), DeviceLocation.class);
+        return JSON.parseObject(json.toString(), Location.class);
     }
 }

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

@@ -97,7 +97,7 @@ public class MqttCallbackHandler {
      * 处理上传位置
      */
     private void uploadLocationHandler(MqttMsgDto msg) {
-        DeviceLocation location = MqttMsgToLocation(msg);
+        Location location = MqttMsgToLocation(msg);
         // 逆地理位置解析
         location.setSite(GaoDeApiUtil.regeo(location.getLonGcj(), location.getLatGcj()));
         // 保存位置信息
@@ -139,9 +139,9 @@ public class MqttCallbackHandler {
     /**
      * 解析信息转为位置对象
      */
-    private DeviceLocation MqttMsgToLocation(MqttMsgDto obj) {
+    private Location MqttMsgToLocation(MqttMsgDto obj) {
         try {
-            DeviceLocation location = new DeviceLocation();
+            Location location = new Location();
             location.setDeviceId(obj.getDeviceId());
             location.setBatteryNum(obj.getInt("batterynum"));
             location.setSignalNum(obj.getInt("signalnum"));

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

@@ -3,7 +3,7 @@ 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.UserDeviceRelation;
+import com.zy.bms.model.DeviceDynamic;
 import com.zy.bms.service.DeviceService;
 import com.zy.bms.service.RelationService;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -68,11 +68,11 @@ public class RelationController extends BaseController {
     @PostMapping("changeDefault.do")
     public ServerResponse changeDefault(String deviceNum) {
         //删除上一个默认设备
-        relationService.update(Wrappers.<UserDeviceRelation>lambdaUpdate().eq(UserDeviceRelation::getIsDefault, 1)
-                .eq(UserDeviceRelation::getUserId, getUserId()).set(UserDeviceRelation::getIsDefault, 0));
+        relationService.update(Wrappers.<DeviceDynamic>lambdaUpdate().eq(DeviceDynamic::getIsDefault, 1)
+                .eq(DeviceDynamic::getUserId, getUserId()).set(DeviceDynamic::getIsDefault, 0));
         //添加新的默认设备
-        relationService.update(Wrappers.<UserDeviceRelation>lambdaUpdate().eq(UserDeviceRelation::getDeviceNum, deviceNum)
-                .set(UserDeviceRelation::getIsDefault, 1));
+        relationService.update(Wrappers.<DeviceDynamic>lambdaUpdate().eq(DeviceDynamic::getDeviceNum, deviceNum)
+                .set(DeviceDynamic::getIsDefault, 1));
         return ServerResponse.createBySuccess();
     }
 }

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

@@ -1,7 +1,7 @@
 package com.zy.bms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zy.bms.model.UserDeviceRelation;
+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;
@@ -17,7 +17,7 @@ import java.util.List;
  */
 @Mapper
 @Repository
-public interface UserDeviceRelationMapper extends BaseMapper<UserDeviceRelation> {
+public interface DeviceDynamicMapper extends BaseMapper<DeviceDynamic> {
 
     /**
      * 查询用户绑定的设备集合
@@ -47,5 +47,5 @@ public interface UserDeviceRelationMapper extends BaseMapper<UserDeviceRelation>
      * @param userId   用户ID
      * @param deviceId 设备ID
      */
-    int checkDeviceIsBelongByDeviceId(@Param("userId") String userId, @Param("deviceId") String deviceId);
+    int checkBelongByDeviceId(@Param("userId") String userId, @Param("deviceId") String deviceId);
 }

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

@@ -3,7 +3,7 @@ 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.DeviceLocation;
+import com.zy.bms.model.Location;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
@@ -17,7 +17,7 @@ import java.util.List;
  */
 @Mapper
 @Repository
-public interface DeviceLocationMapper extends BaseMapper<DeviceLocation> {
+public interface DeviceLocationMapper extends BaseMapper<Location> {
 
     /**
      * 查看设备历史轨迹

src/main/java/com/zy/bms/mapper/SetNewsMapper.java → src/main/java/com/zy/bms/mapper/NewsMapper.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zy.bms.common.io.NewsIO;
-import com.zy.bms.model.SetNews;
+import com.zy.bms.model.News;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -17,11 +17,11 @@ import org.springframework.stereotype.Repository;
  */
 @Mapper
 @Repository
-public interface SetNewsMapper extends BaseMapper<SetNews> {
+public interface NewsMapper extends BaseMapper<News> {
     /**
      * 分页查询播报记录
      *
      * @param io 查询参数
      */
-    IPage<SetNews> getListPage(Page<SetNews> page, @Param("io") NewsIO io);
+    IPage<News> getListPage(Page<News> page, @Param("io") NewsIO io);
 }

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

@@ -10,7 +10,7 @@ import java.time.LocalDateTime;
  * 设备信息
  */
 @Data
-@TableName("zy_device")
+@TableName("device")
 public class Device {
     @TableId
     private Integer id;
@@ -44,9 +44,4 @@ public class Device {
      * 1:在线 0:离线
      */
     private Integer status;
-
-    /**
-     * 设备名
-     */
-    private String name;
 }

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

@@ -0,0 +1,48 @@
+package com.zy.bms.model;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 设备扩展信息表
+ *
+ * @author chen_yi
+ * Create on 2020/8/1
+ */
+@Data
+@TableName("device_dynamic")
+public class DeviceDynamic {
+
+    @TableId
+    private Integer id;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 设备随机码
+     */
+    private String deviceNum;
+
+    /**
+     * 是否是默认设备
+     * 0:否 1:是
+     */
+    private Integer isDefault;
+
+    /**
+     * 设备名
+     */
+    private String name;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+}

src/main/java/com/zy/bms/model/DeviceLocation.java → src/main/java/com/zy/bms/model/Location.java

@@ -7,12 +7,11 @@ import lombok.Data;
 import java.time.LocalDateTime;
 
 /**
- * 设备定位相关
- * Created by konglilia on 2020/5/27.
+ * 设备定位信息表
  */
 @Data
-@TableName("zy_location")
-public class DeviceLocation {
+@TableName("location")
+public class Location {
 
     @TableId
     private Integer id;
@@ -81,10 +80,4 @@ public class DeviceLocation {
      * 数据上传时间
      */
     private LocalDateTime uploadTime;
-
-    /**
-     * 当前和临近位置区、小区以及信号强度的拼接字符串
-     */
-    private String cellInfo;
-
 }

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

@@ -10,8 +10,8 @@ import java.time.LocalDateTime;
  * 语音播报记录
  */
 @Data
-@TableName("set_news")
-public class SetNews {
+@TableName("news")
+public class News {
     @TableId
     private Integer id;
     /**

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

@@ -1,27 +0,0 @@
-package com.zy.bms.model;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- * 用户设备关系绑定表
- *
- * @author chen_yi
- * Create on 2020/8/1
- */
-@Data
-@TableName("user_device_relation")
-public class UserDeviceRelation {
-    @TableId
-    private Integer id;
-
-    //用户ID
-    private String userId;
-
-    //设备随机码
-    private String deviceNum;
-
-    //是否是默认设备 0 不是 1 是
-    private Integer isDefault;
-}

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

@@ -5,7 +5,7 @@ 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.model.DeviceLocation;
+import com.zy.bms.model.Location;
 import com.zy.bms.model.LatestLocation;
 import com.zy.bms.utils.BeanUtil;
 import org.springframework.stereotype.Service;
@@ -20,7 +20,7 @@ import java.util.List;
  * Create on 2020/4/10
  */
 @Service
-public class DeviceLocationService extends ServiceImpl<DeviceLocationMapper, DeviceLocation> {
+public class DeviceLocationService extends ServiceImpl<DeviceLocationMapper, Location> {
 
     @Resource
     private LatestLocationService latestLocationService;
@@ -28,7 +28,7 @@ public class DeviceLocationService extends ServiceImpl<DeviceLocationMapper, Dev
     /**
      * 保存位置信息
      */
-    public void saveLocation(DeviceLocation entity) {
+    public void saveLocation(Location entity) {
         save(entity);
         //更新最新的位置信息
         QueryWrapper<LatestLocation> queryWrapper = new QueryWrapper<>();

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

@@ -2,8 +2,8 @@ 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.mapper.UserDeviceRelationMapper;
-import com.zy.bms.model.UserDeviceRelation;
+import com.zy.bms.mapper.DeviceDynamicMapper;
+import com.zy.bms.model.DeviceDynamic;
 import com.zy.bms.common.vo.DeviceRelationVo;
 import org.springframework.stereotype.Service;
 
@@ -18,7 +18,7 @@ import java.util.List;
  * Create on 2020/4/10
  */
 @Service
-public class RelationService extends ServiceImpl<UserDeviceRelationMapper, UserDeviceRelation> {
+public class RelationService extends ServiceImpl<DeviceDynamicMapper, DeviceDynamic> {
 
     @Resource
     private DeviceService deviceService;
@@ -31,7 +31,7 @@ public class RelationService extends ServiceImpl<UserDeviceRelationMapper, UserD
      * @param deviceName 设备名称
      */
     public void saveEntity(String userId, String deviceNum, String deviceName) {
-        UserDeviceRelation entity = new UserDeviceRelation();
+        DeviceDynamic entity = new DeviceDynamic();
         entity.setUserId(userId);
         entity.setDeviceNum(deviceNum);
         baseMapper.insert(entity);
@@ -44,7 +44,7 @@ public class RelationService extends ServiceImpl<UserDeviceRelationMapper, UserD
      * @param deviceNum 设备号
      */
     public void unbind(String deviceNum, String userId) {
-        QueryWrapper<UserDeviceRelation> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<DeviceDynamic> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("deviceNum", deviceNum);
         queryWrapper.eq("userId", userId);
         baseMapper.delete(queryWrapper);

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

@@ -4,8 +4,8 @@ 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.NewsIO;
-import com.zy.bms.mapper.SetNewsMapper;
-import com.zy.bms.model.SetNews;
+import com.zy.bms.mapper.NewsMapper;
+import com.zy.bms.model.News;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,14 +13,14 @@ import org.springframework.stereotype.Service;
  * Create on 2020/4/10
  */
 @Service
-public class SetNewsService extends ServiceImpl<SetNewsMapper, SetNews> {
+public class SetNewsService extends ServiceImpl<NewsMapper, News> {
     /**
      * 分页查询播报记录
      *
      * @param io 查询参数
      */
-    public IPage<SetNews> getListPage(NewsIO io) {
-        Page<SetNews> page = new Page<>(io.getCurrent(), io.getSize());
+    public IPage<News> getListPage(NewsIO io) {
+        Page<News> page = new Page<>(io.getCurrent(), io.getSize());
         return baseMapper.getListPage(page, io);
     }
 }

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

@@ -5,7 +5,7 @@ import com.zy.bms.common.dto.MqttMsgDto;
 import com.zy.bms.config.mqtt.MqttGateway;
 import com.zy.bms.model.Device;
 import com.zy.bms.model.SetBase;
-import com.zy.bms.model.SetNews;
+import com.zy.bms.model.News;
 import com.zy.bms.utils.BeanUtil;
 import com.zy.bms.common.io.wechat.*;
 import com.zy.bms.websocket.WebSocketServer;
@@ -78,7 +78,7 @@ public class SetService {
     private void saveToDataBase(String code, SetIO io) {
         //发送语音播报单独处理
         if (code.equals(Constant.M_CODE_NEWS)) {
-            SetNews entity = BeanUtil.cast(io, SetNews.class);
+            News entity = BeanUtil.cast(io, News.class);
             setNewsService.save(entity);
         } else {
             SetBase entity = BeanUtil.cast(io, SetBase.class);

src/main/resources/mapper/DeviceDynamicMapping.xml

@@ -0,0 +1,30 @@
+<?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.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 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>
+</mapper>

src/main/resources/mapper/SetNewsMapping.xml → src/main/resources/mapper/NewsMapping.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.bms.mapper.SetNewsMapper">
+<mapper namespace="com.zy.bms.mapper.NewsMapper">
 
-    <select id="getListPage" resultType="com.zy.bms.model.SetNews">
+    <select id="getListPage" resultType="com.zy.bms.model.News">
         SELECT
             newsTime,
             newsType,

src/main/resources/mapper/UserDeviceRelationMapping.xml

@@ -1,39 +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.UserDeviceRelationMapper">
-
-    <select id="getListByUserId" resultType="com.zy.bms.common.vo.DeviceRelationVo">
-        SELECT t1.isDefault,
-               t2.num,
-               t2.name,
-               t2.clientId AS deviceId
-        FROM user_device_relation 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 IFNULL( (SELECT 1 FROM user_device_relation WHERE deviceNum = #{deviceNum} LIMIT 1) ,0)
-    </select>
-
-    <select id="checkDeviceIsBelongByNum" resultType="java.lang.Integer">
-        SELECT IFNULL( (SELECT 1 FROM user_device_relation WHERE deviceNum = #{deviceNum} AND userId=#{userId} LIMIT 1),0 )
-    </select>
-
-    <select id="checkDeviceIsBelongByDeviceId" resultType="java.lang.Integer">
-        SELECT IFNULL(
-        (
-        SELECT
-            1
-        FROM
-            zy_device t1
-        INNER JOIN
-            user_device_relation t2 ON t1.num = t2.deviceNum
-        WHERE
-            t1.clientId = #{deviceId} AND t2.userId = #{userId} LIMIT 1
-        ),0)
-    </select>
-</mapper>