功能基本开发完成

src/main/java/com/zhiyun/mqtt/common/io/wechat/ServerSetIO.java

@@ -1,27 +0,0 @@
-package com.zhiyun.mqtt.common.io.wechat;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 服务端口设置
- *
- * @author yang xiao kun
- * create on 2021/1/21
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Deprecated
-public class ServerSetIO extends SimpleSetIO {
-
-    /**
-     * 服务器
-     */
-    private String serverHost;
-
-    /**
-     * 端口
-     */
-    private Integer serverPort;
-
-}

src/main/java/com/zhiyun/mqtt/common/io/wechat/WhitePhoneSetIO.java

@@ -1,25 +0,0 @@
-package com.zhiyun.mqtt.common.io.wechat;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 白名单设置
- *
- * @author yang xiao kun
- * create on 2021/1/21
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Deprecated
-public class WhitePhoneSetIO extends SimpleSetIO {
-    /**
-     * 0关闭 1开启
-     */
-    private Integer whiteTag;
-
-    /**
-     * json序列化数据
-     */
-    private String whiteList;
-}

src/main/java/com/zhiyun/mqtt/config/mqtt/MqttCallbackHandler.java

@@ -1,162 +0,0 @@
-package com.zhiyun.mqtt.config.mqtt;
-
-import com.alibaba.fastjson.JSON;
-import com.zhiyun.mqtt.model.*;
-import com.zhiyun.mqtt.redis.DeviceManager;
-import com.zhiyun.mqtt.service.*;
-import com.zhiyun.mqtt.utils.CodeGenerator;
-import com.zhiyun.mqtt.utils.GaoDeApiUtil;
-import com.zhiyun.mqtt.websocket.WebSocketServer;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-
-/**
- * MQTT 消息返回处理类
- *
- * @author yang xiao kun
- * create on 2021/1/19
- */
-@Component
-public class MqttCallbackHandler {
-
-    @Resource
-    private DeviceService deviceService;
-    @Resource
-    private SetToDeviceService setToDeviceService;
-    @Resource
-    private DeviceLocationService deviceLocationService;
-    @Resource
-    private GaoDeApiUtil gaoDeApiService;
-    @Resource
-    private DeviceManager deviceRedisService;
-    @Resource
-    private WebSocketServer webSocketServer;
-    @Resource
-    private CallRecordsService callRecordsService;
-
-    /**
-     * 处理消息
-     *
-     * @param topic   主题
-     * @param payload 消息内容
-     */
-    void handle(String topic, String payload) {
-        if (topic.contains("/")) {
-            webSocketServer.massMessage(topic.split("/")[1], payload);
-        }
-        //消息返回JSON转Object
-        MqttMsgDto msgObject = JSON.parseObject(payload, MqttMsgDto.class);
-        //根据报文标识代码 M 处理消息
-        switch (msgObject.getM()) {
-            case "10"://设备端注册报文
-                registerDevice(msgObject);
-                break;
-            case "12"://设备注册完成
-                setToDeviceService.registerOK(msgObject.getData().get("deviceid").toString());
-                break;
-            case "20":// 设备位置信息上报
-                LocationHandler(msgObject);
-                break;
-            case "40"://设备上传通话记录
-                CallRecordsHandler(msgObject);
-                break;
-//            case "30"://设备联网后发送消息,请求更新设置
-//                getDeviceSet(msgObject);
-//            case "40": // 基站信息
-//                String deviceId = msgObject.getR().split("/")[1];
-//                baseStationService.insertBaseStation(deviceId, msgObject.getData());
-//                break;
-        }
-    }
-
-    /**
-     * 注册设备
-     */
-    private void registerDevice(MqttMsgDto obj) {
-        String num = obj.getData().get("num").toString();
-        //查询数据库中是否有此设备
-        Device device = deviceService.getByNum(num);
-        if (device == null) {
-            device = new Device(num, CodeGenerator.generateClientId(), CodeGenerator.generateShortUuid());
-            //没有该设备,保存至数据库
-            deviceService.save(device);
-        }
-        //发送消息
-        setToDeviceService.returnCodeToDevice(device.getNum(), device.getClientId(), device.getPassword());
-    }
-
-    /**
-     * 处理上传位置
-     */
-    private void LocationHandler(MqttMsgDto obj) {
-        DeviceLocation location = new DeviceLocation(obj);
-        // 逆地理位置解析
-        location.setSite(gaoDeApiService.regeo(location.getLonGcj(), location.getLatGcj()));
-        // 保存位置信息--历史记录
-        deviceLocationService.save(location);
-        // 将最新位置信息保存至redis中
-        deviceRedisService.saveLocation(location);
-        // 通知设备更新未接收到的设置信息
-        //setToDeviceService.notifyDeviceUpdateSet(setUpdateTagService.getByDeviceId(location.getDeviceId()));
-    }
-
-    /**
-     * 设备上传通话记录
-     */
-    private void CallRecordsHandler(MqttMsgDto obj) {
-        CallRecords callRecords = new CallRecords();
-        callRecords.setDeviceId(obj.getR().split("/")[1]);
-        callRecords.setType((int) obj.getData().get("type"));
-        callRecords.setKey((String) obj.getData().get("key"));
-        callRecords.setPhoneNum((String) obj.getData().get("phnoenum"));
-        callRecords.setTalkTime((int) obj.getData().get("talktime"));
-        callRecords.setEndTime((String) obj.getData().get("endtime"));
-        callRecordsService.save(callRecords);
-    }
-
-//    /**
-//     * 获取设备更新设置
-//     */
-//    private void getDeviceSet(MqttMsgDto obj) {
-//        String deviceId = obj.getR().split("/")[1];
-//        // res = 1,代表设备中设置更新完毕
-//        if (obj.getData().get("res").toString().equals("1")) {
-//            //设备更新完成,数据库保持同步
-//            setUpdateTagService.updateMsgConfirm(deviceId, obj.getData().get("settag").toString(), "0");
-//        }
-//        // res = 0,代表设备中设置需要更新
-//        if (obj.getData().get("res").toString().equals("0")) {
-//            switch (obj.getData().get("settag").toString()) {
-//                case Constant.TAG_uploadTag://数据上传频率
-//                    SetOther uploadTag = setOtherService.getNetwork(deviceId);
-//                    setToDeviceService.setNetwork(BeanUtil.cast(uploadTag, NetWorkSetIO.class));
-//                    break;
-//                case Constant.TAG_ownTag://持有者配置
-//                    break;
-//                case Constant.TAG_sosTag:// 紧急联系人设置
-//                    SetSOS sosTag = setSosService.getOne(new QueryWrapper<SetSOS>().eq("deviceId", deviceId));
-//                    setToDeviceService.setSOS(BeanUtil.cast(sosTag, SosSetIO.class));
-//                    break;
-//                case Constant.TAG_valTag://音量设置
-//                    SetOther valTag = setOtherService.getVolume(deviceId);
-//                    setToDeviceService.setVolume(BeanUtil.cast(valTag, VolumeSetIO.class));
-//                    break;
-//                case Constant.TAG_timeTag://整点报时设置
-//                    break;
-//                case Constant.TAG_hangonTag://自动接听设置
-//                    SetOther hongonTag = setOtherService.getAutoAnswerAndClock(deviceId);
-//                    setToDeviceService.setAutoAnswer(BeanUtil.cast(hongonTag, AnswerSetIO.class));
-//                    break;
-//                case Constant.TAG_whiteTag: //白名单设置
-//                    SetOther whiteTag = setOtherService.getWhite(deviceId);
-//                    setToDeviceService.setWhitePhone(BeanUtil.cast(whiteTag, WhitePhoneSetIO.class));
-//                    break;
-//                case Constant.TAG_serverTag://服务器设置
-//                    break;
-//                case Constant.TAG_msgTag://语音播报内容设置
-//
-//            }
-//        }
-//    }
-}

src/main/java/com/zhiyun/mqtt/mapper/SetUpdateTagMapper.java

@@ -1,30 +0,0 @@
-package com.zhiyun.mqtt.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiyun.mqtt.model.SetUpdateTag;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-/**
- * 设备设置消息通知相关
- *
- * @author chenyi
- * Create on 2020/4/10
- */
-@Mapper
-@Repository
-@Deprecated
-public interface SetUpdateTagMapper extends BaseMapper<SetUpdateTag> {
-
-    /**
-     * 更新设备设置消息通知
-     *
-     * @param deviceId 设备ID
-     * @param column   设置列
-     * @param tag      开关标签
-     */
-    int updateMsgConfirm(@Param("deviceId") String deviceId,
-                         @Param("column") String column,
-                         @Param("tag") String tag);
-}

src/main/java/com/zhiyun/mqtt/model/SetUpdateTag.java

@@ -1,36 +0,0 @@
-package com.zhiyun.mqtt.model;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- * 设备收到设置消息确认表
- * Created by konglilia on 2020/5/13.
- */
-@Data
-@TableName("set_update_tag")
-public class SetUpdateTag {
-    @TableId
-    private Integer id;
-    //设备ID
-    private String deviceId;
-    //数据上传频率
-    private String uploadtag;
-    //持有人信息
-    private String owntag;
-    //紧急联系人
-    private String sostag;
-    //音t
-    private String valtag;
-    //整点报时
-    private String timetag;
-    //自动接听
-    private String hangontag;
-    //白名单
-    private String whitetag;
-    //服务器信息
-    private String servertag;
-    //语音播报
-    private String msgtag;
-}

src/main/java/com/zhiyun/mqtt/service/SetUpdateTagService.java

@@ -1,37 +0,0 @@
-package com.zhiyun.mqtt.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiyun.mqtt.mapper.SetUpdateTagMapper;
-import com.zhiyun.mqtt.model.SetUpdateTag;
-
-/**
- * 设备设置消息通知相关
- *
- * @author chenyi
- * Create on 2020/4/10
- */
-@Deprecated
-public class SetUpdateTagService extends ServiceImpl<SetUpdateTagMapper, SetUpdateTag> {
-
-    /**
-     * 更新设备设置消息通知
-     *
-     * @param deviceId 设备ID
-     * @param column   设置列
-     * @param tag      开关标签
-     */
-    public void updateMsgConfirm(String deviceId, String column, String tag) {
-        baseMapper.updateMsgConfirm(deviceId, column, tag);
-    }
-
-    /**
-     * 通过设备ID查询设备的设置更新tag
-     *
-     * @param deviceId 设备ID
-     */
-    public SetUpdateTag getByDeviceId(String deviceId) {
-        QueryWrapper<SetUpdateTag> queryWrapper = new QueryWrapper<SetUpdateTag>().eq("deviceId", deviceId);
-        return baseMapper.selectOne(queryWrapper);
-    }
-}

src/main/java/com/zhiyun/mqtt/MqttServerApplication.java → src/main/java/com/zy/bms/BMSApplication.java

@@ -1,11 +1,11 @@
-package com.zhiyun.mqtt;
+package com.zy.bms;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class MqttServerApplication {
+public class BMSApplication {
     public static void main(String[] args) {
-        SpringApplication.run(MqttServerApplication.class, args);
+        SpringApplication.run(BMSApplication.class, args);
     }
 }

src/main/java/com/zhiyun/mqtt/common/Constant.java → src/main/java/com/zy/bms/common/Constant.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.common;
+package com.zy.bms.common;
 
 /**
  * @author yang xiao kun
@@ -25,16 +25,6 @@ public class Constant {
     public static final String M_CODE_NEWS = "39";//语音播报
     public static final String M_CODE_CONTINUE_GPS = "41";//设备连续定位设置
 
-//    public static final String TAG_uploadTag = "uploadtag";//数据上传频率
-//    public static final String TAG_ownTag = "owntag";//持有人信息
-//    public static final String TAG_sosTag = "sostag";//紧急联系人
-//    public static final String TAG_valTag = "valtag";//音量
-//    public static final String TAG_timeTag = "timetag";//整点报时
-//    public static final String TAG_hangonTag = "hangontag";//自动接听
-//    public static final String TAG_whiteTag = "whitetag";//白名单
-//    public static final String TAG_serverTag = "servertag";//服务器信息
-//    public static final String TAG_msgTag = "msgtag";//语音播报
-
     /**
      * 主题前缀
      * SERVER为服务器订阅接收设备发来消息￿

src/main/java/com/zhiyun/mqtt/common/ServerResponse.java → src/main/java/com/zy/bms/common/ServerResponse.java

@@ -1,7 +1,7 @@
-package com.zhiyun.mqtt.common;
+package com.zy.bms.common;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.zhiyun.mqtt.common.enums.ResponseCode;
+import com.zy.bms.common.enums.ResponseCode;
 import lombok.Data;
 
 import java.io.Serializable;

src/main/java/com/zhiyun/mqtt/common/aspect/LogAspect.java → src/main/java/com/zy/bms/common/aspect/LogAspect.java

@@ -1,12 +1,10 @@
-package com.zhiyun.mqtt.common.aspect;
+package com.zy.bms.common.aspect;
 
-import com.zhiyun.mqtt.common.exception.ApiRuntimeException;
+import com.zy.bms.common.exception.ApiRuntimeException;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.stereotype.Component;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;

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

@@ -0,0 +1,21 @@
+package com.zy.bms.common.controller;
+
+import com.zy.bms.common.ServerResponse;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 通用 Controller
+ *
+ * @author yang xiao kun
+ * create on 2021/4/7
+ */
+@RestController
+@RequestMapping("common")
+public class CommonController {
+
+    @RequestMapping("author.do")
+    public ServerResponse author() {
+        return ServerResponse.createByAuthor();
+    }
+}

src/main/java/com/zhiyun/mqtt/common/ExceptionController.java → src/main/java/com/zy/bms/common/controller/ExceptionController.java

@@ -1,6 +1,7 @@
-package com.zhiyun.mqtt.common;
+package com.zy.bms.common.controller;
 
-import com.zhiyun.mqtt.common.exception.ApiRuntimeException;
+import com.zy.bms.common.ServerResponse;
+import com.zy.bms.common.exception.ApiRuntimeException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;

src/main/java/com/zhiyun/mqtt/common/enums/ResponseCode.java → src/main/java/com/zy/bms/common/enums/ResponseCode.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.common.enums;
+package com.zy.bms.common.enums;
 
 /**
  * 接口返回常量

src/main/java/com/zhiyun/mqtt/common/exception/ApiRuntimeException.java → src/main/java/com/zy/bms/common/exception/ApiRuntimeException.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.common.exception;
+package com.zy.bms.common.exception;
 
 /**
  * 运行时异常
@@ -12,18 +12,10 @@ public class ApiRuntimeException extends RuntimeException {
      */
     private String msg;
 
-    public ApiRuntimeException(String code, String msg) {
-        this.msg = "{'code':" + code + ",'msg:'" + msg + "}";
-    }
-
     public ApiRuntimeException(String msg) {
         this.msg = msg;
     }
 
-    public ApiRuntimeException() {
-        this.msg = "系统错误";
-    }
-
     @Override
     public String getMessage() {
         return msg;

src/main/java/com/zhiyun/mqtt/common/interceptor/AuthInterceptor.java → src/main/java/com/zy/bms/common/interceptor/AuthInterceptor.java

@@ -1,8 +1,6 @@
-package com.zhiyun.mqtt.common.interceptor;
+package com.zy.bms.common.interceptor;
 
-import com.alibaba.fastjson.JSON;
-import com.zhiyun.mqtt.common.ServerResponse;
-import com.zhiyun.mqtt.redis.SessionManager;
+import com.zy.bms.redis.SessionManager;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
@@ -26,7 +24,7 @@ public class AuthInterceptor extends HandlerInterceptorAdapter {
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         String token = request.getHeader("token");
         if (token == null || !sessionManager.valid(token)) {
-            response.getWriter().print(JSON.toJSONString(ServerResponse.createByAuthor()));
+            request.getRequestDispatcher("/common/author.do").forward(request, response);
             return false;
         }
         return true;

src/main/java/com/zhiyun/mqtt/common/interceptor/VerifyInterceptor.java → src/main/java/com/zy/bms/common/interceptor/VerifyInterceptor.java

@@ -1,13 +1,10 @@
-package com.zhiyun.mqtt.common.interceptor;
+package com.zy.bms.common.interceptor;
 
-import com.alibaba.fastjson.JSON;
-import com.zhiyun.mqtt.common.ServerResponse;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 
 /**
  * 身份验证拦截器
@@ -20,13 +17,13 @@ import java.io.IOException;
 public class VerifyInterceptor extends HandlerInterceptorAdapter {
 
     @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws IOException {
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         if (request.getMethod().equals("OPTIONS")) {
             response.setStatus(HttpServletResponse.SC_OK);
             return true;
         }
-        if (request.getHeader("verify") != null && request.getHeader("verify").equals("mqtt")) return true;
-        response.getWriter().println(JSON.toJSONString(ServerResponse.createByErrorMsg("illegal request")));
+        if (request.getHeader("verify") != null && request.getHeader("verify").equals("bms")) return true;
+        request.getRequestDispatcher("/common/author.do").forward(request, response);
         return false;
     }
 }

src/main/java/com/zhiyun/mqtt/common/io/CallRecordsIO.java → src/main/java/com/zy/bms/common/io/CallRecordsIO.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.common.io;
+package com.zy.bms.common.io;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/zhiyun/mqtt/common/io/SetNewsIO.java → src/main/java/com/zy/bms/common/io/NewsIO.java

@@ -1,17 +1,17 @@
-package com.zhiyun.mqtt.common.io;
+package com.zy.bms.common.io;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 播报IO
+ * 查询语音播报 IO
  *
  * @author yang xiao kun
  * create on 2021/1/21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class SetNewsIO extends PageIO {
+public class NewsIO extends PageIO {
 
     /**
      * 设备ID

src/main/java/com/zhiyun/mqtt/common/io/PageIO.java → src/main/java/com/zy/bms/common/io/PageIO.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.common.io;
+package com.zy.bms.common.io;
 
 import lombok.Data;
 

src/main/java/com/zhiyun/mqtt/common/io/pc/DeviceIO.java → src/main/java/com/zy/bms/common/io/pc/DeviceIO.java

@@ -1,6 +1,6 @@
-package com.zhiyun.mqtt.common.io.pc;
+package com.zy.bms.common.io.pc;
 
-import com.zhiyun.mqtt.common.io.PageIO;
+import com.zy.bms.common.io.PageIO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

src/main/java/com/zhiyun/mqtt/common/io/pc/UserIO.java → src/main/java/com/zy/bms/common/io/pc/UserIO.java

@@ -1,6 +1,6 @@
-package com.zhiyun.mqtt.common.io.pc;
+package com.zy.bms.common.io.pc;
 
-import com.zhiyun.mqtt.common.io.PageIO;
+import com.zy.bms.common.io.PageIO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

src/main/java/com/zhiyun/mqtt/common/io/wechat/AnswerSetIO.java → src/main/java/com/zy/bms/common/io/wechat/AnswerSetIO.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.common.io.wechat;
+package com.zy.bms.common.io.wechat;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/zhiyun/mqtt/common/io/wechat/ContinueSetIO.java → src/main/java/com/zy/bms/common/io/wechat/ContinueSetIO.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.common.io.wechat;
+package com.zy.bms.common.io.wechat;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/zhiyun/mqtt/common/io/wechat/DeviceHistoryIO.java → src/main/java/com/zy/bms/common/io/wechat/DeviceHistoryIO.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.common.io.wechat;
+package com.zy.bms.common.io.wechat;
 
 import lombok.Data;
 

src/main/java/com/zhiyun/mqtt/common/io/wechat/GpsRateSetIO.java → src/main/java/com/zy/bms/common/io/wechat/GpsRateSetIO.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.common.io.wechat;
+package com.zy.bms.common.io.wechat;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/zhiyun/mqtt/common/io/wechat/NewsSetIO.java → src/main/java/com/zy/bms/common/io/wechat/NewsSetIO.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.common.io.wechat;
+package com.zy.bms.common.io.wechat;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/zhiyun/mqtt/common/io/wechat/SimpleSetIO.java → src/main/java/com/zy/bms/common/io/wechat/SimpleSetIO.java

@@ -1,6 +1,6 @@
-package com.zhiyun.mqtt.common.io.wechat;
+package com.zy.bms.common.io.wechat;
 
-import com.zhiyun.mqtt.common.Constant;
+import com.zy.bms.common.Constant;
 import lombok.Data;
 
 /**

src/main/java/com/zhiyun/mqtt/common/io/wechat/SosSetIO.java → src/main/java/com/zy/bms/common/io/wechat/SosSetIO.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.common.io.wechat;
+package com.zy.bms.common.io.wechat;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.common.io.wechat;
+package com.zy.bms.common.io.wechat;
 
 import lombok.Data;
 

src/main/java/com/zhiyun/mqtt/common/io/wechat/VolumeSetIO.java → src/main/java/com/zy/bms/common/io/wechat/VolumeSetIO.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.common.io.wechat;
+package com.zy.bms.common.io.wechat;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/zhiyun/mqtt/common/vo/DeviceVo.java → src/main/java/com/zy/bms/common/vo/DeviceVo.java

@@ -1,9 +1,7 @@
-package com.zhiyun.mqtt.common.vo;
+package com.zy.bms.common.vo;
 
 import lombok.Data;
 
-import java.time.LocalDateTime;
-
 /**
  * 设备查询结果表
  *
@@ -12,11 +10,7 @@ import java.time.LocalDateTime;
  */
 @Data
 public class DeviceVo {
-    private int id;//设备表主键
     private String num;//设备随机码
-    private String clientId;//设备编号
     private Integer isDefault;//是否是默认设备 0:不是 1:是
-    private LocalDateTime createTime;//设备创建时间
     private String name;//设备名称
-    private int groupId;//设备组ID
 }

src/main/java/com/zhiyun/mqtt/common/vo/LocationHistoryVo.java → src/main/java/com/zy/bms/common/vo/LocationHistoryVo.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.common.vo;
+package com.zy.bms.common.vo;
 
 import lombok.Data;
 

src/main/java/com/zhiyun/mqtt/config/BeanConfig.java → src/main/java/com/zy/bms/config/BeanConfig.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.config;
+package com.zy.bms.config;
 
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;

src/main/java/com/zhiyun/mqtt/config/InterceptorConfig.java → src/main/java/com/zy/bms/config/InterceptorConfig.java

@@ -1,8 +1,7 @@
-package com.zhiyun.mqtt.config;
+package com.zy.bms.config;
 
-import com.zhiyun.mqtt.common.interceptor.AuthInterceptor;
-import com.zhiyun.mqtt.common.interceptor.VerifyInterceptor;
-import org.springframework.context.annotation.Configuration;
+import com.zy.bms.common.interceptor.AuthInterceptor;
+import com.zy.bms.common.interceptor.VerifyInterceptor;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 

src/main/java/com/zhiyun/mqtt/config/WebMvcConfig.java → src/main/java/com/zy/bms/config/WebMvcConfig.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.config;
+package com.zy.bms.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;

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

@@ -0,0 +1,118 @@
+package com.zy.bms.config.mqtt;
+
+import com.alibaba.fastjson.JSON;
+import com.zy.bms.redis.DeviceManager;
+import com.zy.bms.service.DeviceLocationService;
+import com.zy.bms.service.DeviceService;
+import com.zy.bms.service.SetToDeviceService;
+import com.zy.bms.utils.CodeGenerator;
+import com.zy.bms.utils.GaoDeApiUtil;
+import com.zy.bms.websocket.WebSocketServer;
+import com.zy.bms.model.CallRecords;
+import com.zy.bms.model.Device;
+import com.zy.bms.model.DeviceLocation;
+import com.zy.bms.model.MqttMsgDto;
+import com.zy.bms.service.CallRecordsService;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * MQTT 消息返回处理类
+ *
+ * @author yang xiao kun
+ * create on 2021/1/19
+ */
+@Component
+public class MqttCallbackHandler {
+
+    @Resource
+    private DeviceService deviceService;
+    @Resource
+    private SetToDeviceService setToDeviceService;
+    @Resource
+    private DeviceLocationService deviceLocationService;
+    @Resource
+    private GaoDeApiUtil gaoDeApiService;
+    @Resource
+    private DeviceManager deviceRedisService;
+    @Resource
+    private WebSocketServer webSocketServer;
+    @Resource
+    private CallRecordsService callRecordsService;
+
+    /**
+     * 处理消息
+     *
+     * @param topic   主题
+     * @param payload 消息内容
+     */
+    void handle(String topic, String payload) {
+        System.out.println(payload);
+        System.out.println("------------------------------------------------------");
+        if (topic.contains("/")) {
+            webSocketServer.massMessage(topic.split("/")[1], payload);
+        }
+        //消息返回JSON转Object
+        MqttMsgDto msgObject = JSON.parseObject(payload, MqttMsgDto.class);
+        //根据报文标识代码 M 处理消息
+        switch (msgObject.getM()) {
+//            case "10"://设备端注册报文
+//                registerDevice(msgObject);
+//                break;
+//            case "12"://设备注册完成
+//                setToDeviceService.registerOK(msgObject.getData().get("deviceid").toString());
+//                break;
+            case "20":// 设备位置信息上报
+                LocationHandler(msgObject);
+                break;
+            case "40"://设备上传通话记录
+                CallRecordsHandler(msgObject);
+                break;
+        }
+    }
+
+    /**
+     * 注册设备
+     */
+    private void registerDevice(MqttMsgDto obj) {
+        String num = obj.getData().get("num").toString();
+        //查询数据库中是否有此设备
+        Device device = deviceService.getByNum(num);
+        if (device == null) {
+            device = new Device(num, CodeGenerator.generateClientId(), CodeGenerator.generateShortUuid());
+            //没有该设备,保存至数据库
+            deviceService.save(device);
+        }
+        //发送消息
+        setToDeviceService.returnCodeToDevice(device.getNum(), device.getClientId(), device.getPassword());
+    }
+
+    /**
+     * 处理上传位置
+     */
+    private void LocationHandler(MqttMsgDto obj) {
+        DeviceLocation location = new DeviceLocation(obj);
+        // 逆地理位置解析
+        location.setSite(gaoDeApiService.regeo(location.getLonGcj(), location.getLatGcj()));
+        // 保存位置信息--历史记录
+        deviceLocationService.save(location);
+        // 将最新位置信息保存至redis中
+        deviceRedisService.saveLocation(location);
+    }
+
+    /**
+     * 设备上传通话记录
+     */
+    private void CallRecordsHandler(MqttMsgDto obj) {
+        CallRecords callRecords = new CallRecords();
+        callRecords.setDeviceId(obj.getR().split("/")[1]);
+        callRecords.setType((int) obj.getData().get("type"));
+        callRecords.setKey((String) obj.getData().get("key"));
+        callRecords.setPhoneNum((String) obj.getData().get("phnoenum"));
+        callRecords.setTalkTime((int) obj.getData().get("talktime"));
+        callRecords.setEndTime((String) obj.getData().get("endtime"));
+        callRecordsService.save(callRecords);
+    }
+
+}

src/main/java/com/zhiyun/mqtt/config/mqtt/MqttConfig.java → src/main/java/com/zy/bms/config/mqtt/MqttConfig.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.config.mqtt;
+package com.zy.bms.config.mqtt;
 
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.springframework.context.annotation.Bean;

src/main/java/com/zhiyun/mqtt/config/mqtt/MqttConsumerCfg.java → src/main/java/com/zy/bms/config/mqtt/MqttConsumerCfg.java

@@ -1,6 +1,6 @@
-package com.zhiyun.mqtt.config.mqtt;
+package com.zy.bms.config.mqtt;
 
-import com.zhiyun.mqtt.utils.CodeGenerator;
+import com.zy.bms.utils.CodeGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -32,7 +32,7 @@ public class MqttConsumerCfg {
 
     //默认监听主题
 //    private final String[] defaultTopic = new String[]{"$regdtx", "$dtx/#", "HelloWrold"};
-    private final String[] defaultTopic = new String[]{"$regdtx", "$dtx/469d1ff28acd4694a79138fa335756a7","$drx/469d1ff28acd4694a79138fa335756a7"};
+    private final String[] defaultTopic = new String[]{"$regdtx", "$dtx/76f7c742428b4720b363d95d8292b357","$drx/76f7c742428b4720b363d95d8292b357"};
 
     /**
      * MQTT 消息订阅绑定（消费者）
@@ -53,7 +53,7 @@ public class MqttConsumerCfg {
             1 至少一次，数据可能重复;
             2 只有一次，有且只有一次;最耗性能;
          */
-        adapter.setQos(1);
+        adapter.setQos(0);
         // 设置订阅通道
         adapter.setOutputChannel(mqttInboundChannel());
         return adapter;

src/main/java/com/zhiyun/mqtt/config/mqtt/MqttGateway.java → src/main/java/com/zy/bms/config/mqtt/MqttGateway.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.config.mqtt;
+package com.zy.bms.config.mqtt;
 
 import org.springframework.integration.annotation.MessagingGateway;
 import org.springframework.integration.mqtt.support.MqttHeaders;

src/main/java/com/zhiyun/mqtt/config/mqtt/MqttProducerCfg.java → src/main/java/com/zy/bms/config/mqtt/MqttProducerCfg.java

@@ -1,6 +1,6 @@
-package com.zhiyun.mqtt.config.mqtt;
+package com.zy.bms.config.mqtt;
 
-import com.zhiyun.mqtt.utils.CodeGenerator;
+import com.zy.bms.utils.CodeGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/zhiyun/mqtt/controller/DeviceController.java → src/main/java/com/zy/bms/controller/DeviceController.java

@@ -1,8 +1,8 @@
-package com.zhiyun.mqtt.controller;
+package com.zy.bms.controller;
 
-import com.zhiyun.mqtt.common.exception.ApiRuntimeException;
-import com.zhiyun.mqtt.common.ServerResponse;
-import com.zhiyun.mqtt.service.DeviceService;
+import com.zy.bms.common.exception.ApiRuntimeException;
+import com.zy.bms.common.ServerResponse;
+import com.zy.bms.service.DeviceService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/com/zhiyun/mqtt/controller/IdiomsController.java → src/main/java/com/zy/bms/controller/IdiomsController.java

@@ -1,9 +1,9 @@
-package com.zhiyun.mqtt.controller;
+package com.zy.bms.controller;
 
-import com.zhiyun.mqtt.common.exception.ApiRuntimeException;
-import com.zhiyun.mqtt.common.ServerResponse;
-import com.zhiyun.mqtt.model.UserIdioms;
-import com.zhiyun.mqtt.service.IdiomsService;
+import com.zy.bms.common.exception.ApiRuntimeException;
+import com.zy.bms.common.ServerResponse;
+import com.zy.bms.model.UserIdioms;
+import com.zy.bms.service.IdiomsService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/zhiyun/mqtt/controller/LocationController.java → src/main/java/com/zy/bms/controller/LocationController.java

@@ -1,9 +1,9 @@
-package com.zhiyun.mqtt.controller;
+package com.zy.bms.controller;
 
-import com.zhiyun.mqtt.common.ServerResponse;
-import com.zhiyun.mqtt.common.io.wechat.DeviceHistoryIO;
-import com.zhiyun.mqtt.service.DeviceLocationService;
-import com.zhiyun.mqtt.redis.DeviceManager;
+import com.zy.bms.common.ServerResponse;
+import com.zy.bms.common.io.wechat.DeviceHistoryIO;
+import com.zy.bms.service.DeviceLocationService;
+import com.zy.bms.redis.DeviceManager;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/zhiyun/mqtt/controller/RelationController.java → src/main/java/com/zy/bms/controller/RelationController.java

@@ -1,11 +1,11 @@
-package com.zhiyun.mqtt.controller;
+package com.zy.bms.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.zhiyun.mqtt.common.ServerResponse;
-import com.zhiyun.mqtt.common.io.wechat.UserDeviceRelationIO;
-import com.zhiyun.mqtt.model.UserDeviceRelation;
-import com.zhiyun.mqtt.service.DeviceService;
-import com.zhiyun.mqtt.service.RelationService;
+import com.zy.bms.common.ServerResponse;
+import com.zy.bms.common.io.wechat.UserDeviceRelationIO;
+import com.zy.bms.model.UserDeviceRelation;
+import com.zy.bms.service.DeviceService;
+import com.zy.bms.service.RelationService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -66,8 +66,8 @@ public class RelationController {
      * @param userId    用户ID
      * @param deviceNum 设备码
      */
-    @PostMapping("changeDefaultDev.do")
-    public ServerResponse changeDefaultDev(String userId, String deviceNum) {
+    @PostMapping("changeDefault.do")
+    public ServerResponse changeDefault(String userId, String deviceNum) {
         //删除上一个默认设备
         relationService.update(Wrappers.<UserDeviceRelation>lambdaUpdate().eq(UserDeviceRelation::getIsDefault, 1)
                 .eq(UserDeviceRelation::getUserId, userId).set(UserDeviceRelation::getIsDefault, 0));

src/main/java/com/zhiyun/mqtt/controller/SetController.java → src/main/java/com/zy/bms/controller/SetController.java

@@ -1,8 +1,8 @@
-package com.zhiyun.mqtt.controller;
+package com.zy.bms.controller;
 
-import com.zhiyun.mqtt.common.ServerResponse;
-import com.zhiyun.mqtt.common.io.wechat.*;
-import com.zhiyun.mqtt.service.SetService;
+import com.zy.bms.common.ServerResponse;
+import com.zy.bms.common.io.wechat.*;
+import com.zy.bms.service.SetService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/com/zhiyun/mqtt/controller/SetInfoController.java → src/main/java/com/zy/bms/controller/SetInfoController.java

@@ -1,11 +1,11 @@
-package com.zhiyun.mqtt.controller;
+package com.zy.bms.controller;
 
-import com.zhiyun.mqtt.common.ServerResponse;
-import com.zhiyun.mqtt.common.io.CallRecordsIO;
-import com.zhiyun.mqtt.common.io.SetNewsIO;
-import com.zhiyun.mqtt.service.CallRecordsService;
-import com.zhiyun.mqtt.service.SetBaseService;
-import com.zhiyun.mqtt.service.SetNewsService;
+import com.zy.bms.common.ServerResponse;
+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 org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -73,7 +73,7 @@ public class SetInfoController {
      * 获取播报记录
      */
     @GetMapping("news.do")
-    public ServerResponse news(SetNewsIO io) {
+    public ServerResponse news(NewsIO io) {
         return ServerResponse.createBySuccess(setNewsService.getListPage(io));
     }
 }

src/main/java/com/zhiyun/mqtt/controller/UserController.java → src/main/java/com/zy/bms/controller/UserController.java

@@ -1,8 +1,8 @@
-package com.zhiyun.mqtt.controller;
+package com.zy.bms.controller;
 
-import com.zhiyun.mqtt.common.ServerResponse;
-import com.zhiyun.mqtt.model.User;
-import com.zhiyun.mqtt.service.UserService;
+import com.zy.bms.common.ServerResponse;
+import com.zy.bms.model.User;
+import com.zy.bms.service.UserService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/com/zhiyun/mqtt/controller/pc/AdminController.java → src/main/java/com/zy/bms/controller/pc/AdminController.java

@@ -1,10 +1,10 @@
-package com.zhiyun.mqtt.controller.pc;
+package com.zy.bms.controller.pc;
 
-import com.zhiyun.mqtt.common.ServerResponse;
-import com.zhiyun.mqtt.model.Admin;
-import com.zhiyun.mqtt.redis.SessionManager;
-import com.zhiyun.mqtt.service.AdminService;
-import com.zhiyun.mqtt.utils.MD5Util;
+import com.zy.bms.common.ServerResponse;
+import com.zy.bms.model.Admin;
+import com.zy.bms.redis.SessionManager;
+import com.zy.bms.service.AdminService;
+import com.zy.bms.utils.MD5Util;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/zhiyun/mqtt/controller/pc/PcDeviceController.java → src/main/java/com/zy/bms/controller/pc/PcDeviceController.java

@@ -1,8 +1,8 @@
-package com.zhiyun.mqtt.controller.pc;
+package com.zy.bms.controller.pc;
 
-import com.zhiyun.mqtt.common.ServerResponse;
-import com.zhiyun.mqtt.common.io.pc.DeviceIO;
-import com.zhiyun.mqtt.service.DeviceService;
+import com.zy.bms.common.ServerResponse;
+import com.zy.bms.common.io.pc.DeviceIO;
+import com.zy.bms.service.DeviceService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/zhiyun/mqtt/controller/pc/PcLocationController.java → src/main/java/com/zy/bms/controller/pc/PcLocationController.java

@@ -1,7 +1,7 @@
-package com.zhiyun.mqtt.controller.pc;
+package com.zy.bms.controller.pc;
 
-import com.zhiyun.mqtt.common.ServerResponse;
-import com.zhiyun.mqtt.service.DeviceService;
+import com.zy.bms.common.ServerResponse;
+import com.zy.bms.service.DeviceService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/com/zhiyun/mqtt/controller/pc/PcSetController.java → src/main/java/com/zy/bms/controller/pc/PcSetController.java

@@ -1,8 +1,9 @@
-package com.zhiyun.mqtt.controller.pc;
+package com.zy.bms.controller.pc;
 
-import com.zhiyun.mqtt.common.ServerResponse;
-import com.zhiyun.mqtt.common.io.wechat.*;
-import com.zhiyun.mqtt.service.*;
+import com.zy.bms.common.ServerResponse;
+import com.zy.bms.common.io.wechat.*;
+import com.zy.bms.service.SetBaseService;
+import com.zy.bms.service.SetService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/zhiyun/mqtt/controller/pc/PcUserController.java → src/main/java/com/zy/bms/controller/pc/PcUserController.java

@@ -1,8 +1,8 @@
-package com.zhiyun.mqtt.controller.pc;
+package com.zy.bms.controller.pc;
 
-import com.zhiyun.mqtt.common.ServerResponse;
-import com.zhiyun.mqtt.common.io.pc.UserIO;
-import com.zhiyun.mqtt.service.UserService;
+import com.zy.bms.common.ServerResponse;
+import com.zy.bms.common.io.pc.UserIO;
+import com.zy.bms.service.UserService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/com/zhiyun/mqtt/mapper/AdminMapper.java → src/main/java/com/zy/bms/mapper/AdminMapper.java

@@ -1,7 +1,7 @@
-package com.zhiyun.mqtt.mapper;
+package com.zy.bms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiyun.mqtt.model.Admin;
+import com.zy.bms.model.Admin;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/zhiyun/mqtt/mapper/BaseStationMapper.java → src/main/java/com/zy/bms/mapper/BaseStationMapper.java

@@ -1,7 +1,7 @@
-package com.zhiyun.mqtt.mapper;
+package com.zy.bms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiyun.mqtt.model.BaseStation;
+import com.zy.bms.model.BaseStation;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/zhiyun/mqtt/mapper/CallRecordsMapper.java → src/main/java/com/zy/bms/mapper/CallRecordsMapper.java

@@ -1,10 +1,10 @@
-package com.zhiyun.mqtt.mapper;
+package com.zy.bms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhiyun.mqtt.common.io.CallRecordsIO;
-import com.zhiyun.mqtt.model.CallRecords;
+import com.zy.bms.common.io.CallRecordsIO;
+import com.zy.bms.model.CallRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

src/main/java/com/zhiyun/mqtt/mapper/DeviceLocationMapper.java → src/main/java/com/zy/bms/mapper/DeviceLocationMapper.java

@@ -1,9 +1,9 @@
-package com.zhiyun.mqtt.mapper;
+package com.zy.bms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiyun.mqtt.common.io.wechat.DeviceHistoryIO;
-import com.zhiyun.mqtt.common.vo.LocationHistoryVo;
-import com.zhiyun.mqtt.model.DeviceLocation;
+import com.zy.bms.common.io.wechat.DeviceHistoryIO;
+import com.zy.bms.common.vo.LocationHistoryVo;
+import com.zy.bms.model.DeviceLocation;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/zhiyun/mqtt/mapper/DeviceMapper.java → src/main/java/com/zy/bms/mapper/DeviceMapper.java

@@ -1,9 +1,9 @@
-package com.zhiyun.mqtt.mapper;
+package com.zy.bms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zhiyun.mqtt.common.io.pc.DeviceIO;
-import com.zhiyun.mqtt.model.Device;
+import com.zy.bms.common.io.pc.DeviceIO;
+import com.zy.bms.model.Device;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

src/main/java/com/zhiyun/mqtt/mapper/IdiomsMapper.java → src/main/java/com/zy/bms/mapper/IdiomsMapper.java

@@ -1,7 +1,7 @@
-package com.zhiyun.mqtt.mapper;
+package com.zy.bms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiyun.mqtt.model.UserIdioms;
+import com.zy.bms.model.UserIdioms;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/zhiyun/mqtt/mapper/SetBaseMapper.java → src/main/java/com/zy/bms/mapper/SetBaseMapper.java

@@ -1,7 +1,7 @@
-package com.zhiyun.mqtt.mapper;
+package com.zy.bms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiyun.mqtt.model.SetBase;
+import com.zy.bms.model.SetBase;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/zhiyun/mqtt/mapper/SetNewsMapper.java → src/main/java/com/zy/bms/mapper/SetNewsMapper.java

@@ -1,10 +1,10 @@
-package com.zhiyun.mqtt.mapper;
+package com.zy.bms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhiyun.mqtt.common.io.SetNewsIO;
-import com.zhiyun.mqtt.model.SetNews;
+import com.zy.bms.common.io.NewsIO;
+import com.zy.bms.model.SetNews;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -23,5 +23,5 @@ public interface SetNewsMapper extends BaseMapper<SetNews> {
      *
      * @param io 查询参数
      */
-    IPage<SetNews> getListPage(Page<SetNews> page, @Param("io") SetNewsIO io);
+    IPage<SetNews> getListPage(Page<SetNews> page, @Param("io") NewsIO io);
 }

src/main/java/com/zhiyun/mqtt/mapper/UserDeviceRelationMapper.java → src/main/java/com/zy/bms/mapper/UserDeviceRelationMapper.java

@@ -1,8 +1,8 @@
-package com.zhiyun.mqtt.mapper;
+package com.zy.bms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiyun.mqtt.model.UserDeviceRelation;
-import com.zhiyun.mqtt.common.vo.DeviceVo;
+import com.zy.bms.model.UserDeviceRelation;
+import com.zy.bms.common.vo.DeviceVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -25,11 +25,4 @@ public interface UserDeviceRelationMapper extends BaseMapper<UserDeviceRelation>
      * @param userId 用户ID
      */
     List<DeviceVo> getListByUserId(@Param("userId") String userId);
-
-    /**
-     * 通过用户ID 查询默认设备的设备num
-     *
-     * @param userId 用户Id
-     */
-    String getDefaultDeviceNum(String userId);
 }

src/main/java/com/zhiyun/mqtt/mapper/UserMapper.java → src/main/java/com/zy/bms/mapper/UserMapper.java

@@ -1,11 +1,10 @@
-package com.zhiyun.mqtt.mapper;
+package com.zy.bms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zhiyun.mqtt.common.io.pc.UserIO;
-import com.zhiyun.mqtt.model.User;
+import com.zy.bms.common.io.pc.UserIO;
+import com.zy.bms.model.User;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**

src/main/java/com/zhiyun/mqtt/model/Admin.java → src/main/java/com/zy/bms/model/Admin.java

@@ -1,10 +1,8 @@
-package com.zhiyun.mqtt.model;
+package com.zy.bms.model;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
 
 /**
  * PC 管理员
@@ -13,9 +11,7 @@ import lombok.ToString;
  * Create on 2020/7/31
  */
 @Data
-@ToString
 @TableName("admin")
-@NoArgsConstructor
 public class Admin {
 
     @TableId

src/main/java/com/zhiyun/mqtt/model/BaseStation.java → src/main/java/com/zy/bms/model/BaseStation.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.model;
+package com.zy.bms.model;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

src/main/java/com/zhiyun/mqtt/model/CallRecords.java → src/main/java/com/zy/bms/model/CallRecords.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.model;
+package com.zy.bms.model;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -11,7 +11,7 @@ import lombok.Data;
  * create on 2021/4/1
  */
 @Data
-@TableName("base_station")
+@TableName("call_records")
 public class CallRecords {
     @TableId
     private Integer id;

src/main/java/com/zhiyun/mqtt/model/Device.java → src/main/java/com/zy/bms/model/Device.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.model;
+package com.zy.bms.model;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -41,9 +41,6 @@ public class Device {
     //设备名
     private String name;
 
-    //是否关机
-    private Integer shutdown;
-
     /**
      * 注册设备构造器
      *

src/main/java/com/zhiyun/mqtt/model/DeviceLocation.java → src/main/java/com/zy/bms/model/DeviceLocation.java

@@ -1,9 +1,9 @@
-package com.zhiyun.mqtt.model;
+package com.zy.bms.model;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.zhiyun.mqtt.utils.CoordTransformUtil;
-import com.zhiyun.mqtt.utils.DateTimeUtil;
+import com.zy.bms.utils.CoordTransformUtil;
+import com.zy.bms.utils.DateTimeUtil;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

src/main/java/com/zhiyun/mqtt/model/MqttMsgDto.java → src/main/java/com/zy/bms/model/MqttMsgDto.java

@@ -1,7 +1,7 @@
-package com.zhiyun.mqtt.model;
+package com.zy.bms.model;
 
 import com.alibaba.fastjson.JSON;
-import com.zhiyun.mqtt.common.Constant;
+import com.zy.bms.common.Constant;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

src/main/java/com/zhiyun/mqtt/model/SetBase.java → src/main/java/com/zy/bms/model/SetBase.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.model;
+package com.zy.bms.model;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

src/main/java/com/zhiyun/mqtt/model/SetNews.java → src/main/java/com/zy/bms/model/SetNews.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.model;
+package com.zy.bms.model;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

src/main/java/com/zhiyun/mqtt/model/User.java → src/main/java/com/zy/bms/model/User.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.model;
+package com.zy.bms.model;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

src/main/java/com/zhiyun/mqtt/model/UserDeviceRelation.java → src/main/java/com/zy/bms/model/UserDeviceRelation.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.model;
+package com.zy.bms.model;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

src/main/java/com/zhiyun/mqtt/model/UserIdioms.java → src/main/java/com/zy/bms/model/UserIdioms.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.model;
+package com.zy.bms.model;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

src/main/java/com/zhiyun/mqtt/redis/DeviceManager.java → src/main/java/com/zy/bms/redis/DeviceManager.java

@@ -1,8 +1,8 @@
-package com.zhiyun.mqtt.redis;
+package com.zy.bms.redis;
 
 import com.alibaba.fastjson.JSON;
-import com.zhiyun.mqtt.common.Constant;
-import com.zhiyun.mqtt.model.DeviceLocation;
+import com.zy.bms.common.Constant;
+import com.zy.bms.model.DeviceLocation;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 

src/main/java/com/zhiyun/mqtt/redis/SessionManager.java → src/main/java/com/zy/bms/redis/SessionManager.java

@@ -1,9 +1,9 @@
-package com.zhiyun.mqtt.redis;
+package com.zy.bms.redis;
 
 import com.alibaba.fastjson.JSON;
-import com.zhiyun.mqtt.common.Constant;
-import com.zhiyun.mqtt.model.Admin;
-import com.zhiyun.mqtt.utils.CodeGenerator;
+import com.zy.bms.common.Constant;
+import com.zy.bms.model.Admin;
+import com.zy.bms.utils.CodeGenerator;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 

src/main/java/com/zhiyun/mqtt/service/AdminService.java → src/main/java/com/zy/bms/service/AdminService.java

@@ -1,9 +1,9 @@
-package com.zhiyun.mqtt.service;
+package com.zy.bms.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiyun.mqtt.mapper.AdminMapper;
-import com.zhiyun.mqtt.model.Admin;
+import com.zy.bms.mapper.AdminMapper;
+import com.zy.bms.model.Admin;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/zhiyun/mqtt/service/BaseStationService.java → src/main/java/com/zy/bms/service/BaseStationService.java

@@ -1,9 +1,9 @@
-package com.zhiyun.mqtt.service;
+package com.zy.bms.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiyun.mqtt.mapper.BaseStationMapper;
-import com.zhiyun.mqtt.model.BaseStation;
+import com.zy.bms.mapper.BaseStationMapper;
+import com.zy.bms.model.BaseStation;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;

src/main/java/com/zhiyun/mqtt/service/CallRecordsService.java → src/main/java/com/zy/bms/service/CallRecordsService.java

@@ -1,11 +1,11 @@
-package com.zhiyun.mqtt.service;
+package com.zy.bms.service;
 
 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.zhiyun.mqtt.common.io.CallRecordsIO;
-import com.zhiyun.mqtt.mapper.CallRecordsMapper;
-import com.zhiyun.mqtt.model.CallRecords;
+import com.zy.bms.common.io.CallRecordsIO;
+import com.zy.bms.mapper.CallRecordsMapper;
+import com.zy.bms.model.CallRecords;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/zhiyun/mqtt/service/DeviceLocationService.java → src/main/java/com/zy/bms/service/DeviceLocationService.java

@@ -1,10 +1,10 @@
-package com.zhiyun.mqtt.service;
+package com.zy.bms.service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiyun.mqtt.common.io.wechat.DeviceHistoryIO;
-import com.zhiyun.mqtt.common.vo.LocationHistoryVo;
-import com.zhiyun.mqtt.mapper.DeviceLocationMapper;
-import com.zhiyun.mqtt.model.DeviceLocation;
+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 org.springframework.stereotype.Service;
 
 import java.util.List;

src/main/java/com/zhiyun/mqtt/service/DeviceService.java → src/main/java/com/zy/bms/service/DeviceService.java

@@ -1,14 +1,14 @@
-package com.zhiyun.mqtt.service;
+package com.zy.bms.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.zhiyun.mqtt.common.io.pc.DeviceIO;
-import com.zhiyun.mqtt.mapper.DeviceMapper;
-import com.zhiyun.mqtt.model.Device;
-import com.zhiyun.mqtt.model.DeviceLocation;
-import com.zhiyun.mqtt.redis.DeviceManager;
+import com.zy.bms.common.io.pc.DeviceIO;
+import com.zy.bms.mapper.DeviceMapper;
+import com.zy.bms.model.Device;
+import com.zy.bms.model.DeviceLocation;
+import com.zy.bms.redis.DeviceManager;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

src/main/java/com/zhiyun/mqtt/service/IdiomsService.java → src/main/java/com/zy/bms/service/IdiomsService.java

@@ -1,9 +1,9 @@
-package com.zhiyun.mqtt.service;
+package com.zy.bms.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiyun.mqtt.mapper.IdiomsMapper;
-import com.zhiyun.mqtt.model.UserIdioms;
+import com.zy.bms.mapper.IdiomsMapper;
+import com.zy.bms.model.UserIdioms;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

src/main/java/com/zhiyun/mqtt/service/RelationService.java → src/main/java/com/zy/bms/service/RelationService.java

@@ -1,12 +1,12 @@
-package com.zhiyun.mqtt.service;
+package com.zy.bms.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiyun.mqtt.common.io.wechat.UserDeviceRelationIO;
-import com.zhiyun.mqtt.mapper.UserDeviceRelationMapper;
-import com.zhiyun.mqtt.model.UserDeviceRelation;
-import com.zhiyun.mqtt.common.vo.DeviceVo;
-import com.zhiyun.mqtt.utils.BeanUtil;
+import com.zy.bms.common.io.wechat.UserDeviceRelationIO;
+import com.zy.bms.mapper.UserDeviceRelationMapper;
+import com.zy.bms.model.UserDeviceRelation;
+import com.zy.bms.common.vo.DeviceVo;
+import com.zy.bms.utils.BeanUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -31,7 +31,9 @@ public class RelationService extends ServiceImpl<UserDeviceRelationMapper, UserD
      * @param io 实体类
      */
     public void saveEntity(UserDeviceRelationIO io) {
-        int isDefault = getDefaultDeviceNum(io.getUserId()) == null ? 1 : 0;
+        QueryWrapper<UserDeviceRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("userId", io.getUserId()).eq("isDefault", 1);
+        int isDefault = baseMapper.selectOne(queryWrapper) == null ? 1 : 0;
         UserDeviceRelation entity = BeanUtil.cast(io, UserDeviceRelation.class);
         entity.setIsDefault(isDefault);
         baseMapper.insert(entity);
@@ -56,15 +58,6 @@ public class RelationService extends ServiceImpl<UserDeviceRelationMapper, UserD
         return baseMapper.getListByUserId(userId);
     }
 
-    /**
-     * 通过用户ID 查询默认设备的设备num
-     *
-     * @param userId 用户Id
-     */
-    private String getDefaultDeviceNum(String userId) {
-        return baseMapper.getDefaultDeviceNum(userId);
-    }
-
     /**
      * 查询设备是否有绑定关系
      *

src/main/java/com/zhiyun/mqtt/service/SetBaseService.java → src/main/java/com/zy/bms/service/SetBaseService.java

@@ -1,10 +1,10 @@
-package com.zhiyun.mqtt.service;
+package com.zy.bms.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiyun.mqtt.common.exception.ApiRuntimeException;
-import com.zhiyun.mqtt.mapper.SetBaseMapper;
-import com.zhiyun.mqtt.model.SetBase;
+import com.zy.bms.common.exception.ApiRuntimeException;
+import com.zy.bms.mapper.SetBaseMapper;
+import com.zy.bms.model.SetBase;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/zhiyun/mqtt/service/SetNewsService.java → src/main/java/com/zy/bms/service/SetNewsService.java

@@ -1,11 +1,11 @@
-package com.zhiyun.mqtt.service;
+package com.zy.bms.service;
 
 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.zhiyun.mqtt.common.io.SetNewsIO;
-import com.zhiyun.mqtt.mapper.SetNewsMapper;
-import com.zhiyun.mqtt.model.SetNews;
+import com.zy.bms.common.io.NewsIO;
+import com.zy.bms.mapper.SetNewsMapper;
+import com.zy.bms.model.SetNews;
 import org.springframework.stereotype.Service;
 
 /**
@@ -19,7 +19,7 @@ public class SetNewsService extends ServiceImpl<SetNewsMapper, SetNews> {
      *
      * @param io 查询参数
      */
-    public IPage<SetNews> getListPage(SetNewsIO io) {
+    public IPage<SetNews> getListPage(NewsIO io) {
         Page<SetNews> page = new Page<>(io.getCurrent(), io.getSize());
         return baseMapper.getListPage(page, io);
     }

src/main/java/com/zhiyun/mqtt/service/SetService.java → src/main/java/com/zy/bms/service/SetService.java

@@ -1,9 +1,9 @@
-package com.zhiyun.mqtt.service;
+package com.zy.bms.service;
 
-import com.zhiyun.mqtt.common.io.wechat.*;
-import com.zhiyun.mqtt.model.SetBase;
-import com.zhiyun.mqtt.model.SetNews;
-import com.zhiyun.mqtt.utils.BeanUtil;
+import com.zy.bms.model.SetBase;
+import com.zy.bms.model.SetNews;
+import com.zy.bms.utils.BeanUtil;
+import com.zy.bms.common.io.wechat.*;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;

src/main/java/com/zhiyun/mqtt/service/SetToDeviceService.java → src/main/java/com/zy/bms/service/SetToDeviceService.java

@@ -1,9 +1,9 @@
-package com.zhiyun.mqtt.service;
+package com.zy.bms.service;
 
-import com.zhiyun.mqtt.common.Constant;
-import com.zhiyun.mqtt.common.io.wechat.*;
-import com.zhiyun.mqtt.config.mqtt.MqttGateway;
-import com.zhiyun.mqtt.model.MqttMsgDto;
+import com.zy.bms.common.Constant;
+import com.zy.bms.config.mqtt.MqttGateway;
+import com.zy.bms.model.MqttMsgDto;
+import com.zy.bms.common.io.wechat.*;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -134,39 +134,4 @@ public class SetToDeviceService {
         mqttGateway.sendMsgToMqtt(msg.toJson(), Constant.TOPIC_REGISTER_CLIENT);
     }
 
-//    /**
-//     * 设置服务器端口号
-//     */
-//    public void setServer(ServerSetIO io) {
-//        //发送模板消息给设备
-//        MqttMsgDto msg = new MqttMsgDto(Constant.M_CODE_SERVER, io.getDeviceId());
-//        msg.set("serverhost", io.getServerHost()).set("serverport", io.getServerPort());
-//        mqttGateway.sendMsgToMqtt(msg.toJson(), io.getTopic());
-//    }
-//    /**
-//     * 通知设备更新设置
-//     *
-//     * @param tag 更新设置tag
-//     */
-//    public void notifyDeviceUpdateSet(SetUpdateTag tag) {
-//        //都等于零 说明无更新,则不发送
-//        if (tag == null || (tag.getHangontag().equals("0") && tag.getMsgtag().equals("0") && tag.getWhitetag().equals("0")
-//                && tag.getOwntag().equals("0") && tag.getServertag().equals("0") && tag.getSostag().equals("0")
-//                && tag.getTimetag().equals("0") && tag.getUploadtag().equals("0") && tag.getValtag().equals("0"))) {
-//            return;
-//        }
-//        //发送模板消息给设备
-//        MqttMsgDto msg = new MqttMsgDto(Constant.M_CODE_CONFIG_TAG, tag.getDeviceId());
-//        msg.set("deviceid", tag.getDeviceId())
-//                .set("uploadtag", tag.getUploadtag())
-//                .set("owntag", tag.getOwntag())
-//                .set("sostag", tag.getSostag())
-//                .set("valtag", tag.getValtag())
-//                .set("timetag", tag.getTimetag())
-//                .set("hongontag", tag.getHangontag())
-//                .set("whitetag", tag.getWhitetag())
-//                .set("servertag", tag.getServertag())
-//                .set("msgtag", tag.getMsgtag());
-//        mqttGateway.sendMsgToMqtt(msg.toJson(), Constant.TOPIC_REGISTER_CLIENT);
-//    }
 }

src/main/java/com/zhiyun/mqtt/service/UserService.java → src/main/java/com/zy/bms/service/UserService.java

@@ -1,16 +1,15 @@
-package com.zhiyun.mqtt.service;
+package com.zy.bms.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.zhiyun.mqtt.common.Constant;
-import com.zhiyun.mqtt.common.io.pc.UserIO;
-import com.zhiyun.mqtt.mapper.UserMapper;
-import com.zhiyun.mqtt.model.User;
-import com.zhiyun.mqtt.utils.HttpUtil;
-import org.apache.ibatis.annotations.Param;
+import com.zy.bms.common.Constant;
+import com.zy.bms.common.io.pc.UserIO;
+import com.zy.bms.mapper.UserMapper;
+import com.zy.bms.model.User;
+import com.zy.bms.utils.HttpUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;

src/main/java/com/zhiyun/mqtt/utils/BeanUtil.java → src/main/java/com/zy/bms/utils/BeanUtil.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.utils;
+package com.zy.bms.utils;
 
 import com.github.dozermapper.core.DozerBeanMapperBuilder;
 import com.github.dozermapper.core.Mapper;

src/main/java/com/zhiyun/mqtt/utils/CodeGenerator.java → src/main/java/com/zy/bms/utils/CodeGenerator.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.utils;
+package com.zy.bms.utils;
 
 import java.util.UUID;
 

src/main/java/com/zhiyun/mqtt/utils/CoordTransformUtil.java → src/main/java/com/zy/bms/utils/CoordTransformUtil.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.utils;
+package com.zy.bms.utils;
 
 import java.text.DecimalFormat;
 

src/main/java/com/zhiyun/mqtt/utils/DateTimeUtil.java → src/main/java/com/zy/bms/utils/DateTimeUtil.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.utils;
+package com.zy.bms.utils;
 
 /**
  * 时间格式化工具类

src/main/java/com/zhiyun/mqtt/utils/GaoDeApiUtil.java → src/main/java/com/zy/bms/utils/GaoDeApiUtil.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.utils;
+package com.zy.bms.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;

src/main/java/com/zhiyun/mqtt/utils/HttpUtil.java → src/main/java/com/zy/bms/utils/HttpUtil.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.utils;
+package com.zy.bms.utils;
 
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;

src/main/java/com/zhiyun/mqtt/utils/MD5Util.java → src/main/java/com/zy/bms/utils/MD5Util.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.utils;
+package com.zy.bms.utils;
 
 
 import java.security.MessageDigest;

src/main/java/com/zhiyun/mqtt/websocket/WebSocketServer.java → src/main/java/com/zy/bms/websocket/WebSocketServer.java

@@ -1,4 +1,4 @@
-package com.zhiyun.mqtt.websocket;
+package com.zy.bms.websocket;
 
 import org.springframework.stereotype.Component;
 

src/main/resources/MQTT协议报文.js

@@ -1,235 +0,0 @@
-// 注册功能编码说明：10：设备请求注册，11：服务器设备注册信息，12：设备注册完成确认，13：服务器确认设备注册完成
-// 未注册设备接收消息订阅：$regdrx，发送消息订阅：$regdtx
-// 注册完成的设备发送消息订阅：$dtx/d1，接收消息订阅：$drx/d1，其中“d1”是服务器返回的信息。
-// 服务器订阅，发送消息订阅：$regdrx，$drx/d1，$drx/d2……，接收消息订阅：$regdtx，$dtx/d1，$dtx/d2……
-// 注册报文，client->server，使用授权信息：登录名为:regUser,密码为:RE12we,mqtt地址为：view.ailishi.org:1883
-device_register_10 = {
-    "m": "10",
-    "t": "$regdtx",
-    "r": "$regdrx",
-    "data": {
-        "regnum": "19999942"// 设备随机码
-    }
-};
-// 设备注册完成，client->server，
-device_register_ok_12 = {
-    "m": "12",
-    "t": "$dtx/d1", //发送订阅主题
-    "r": "$drx/d1", //接收订阅主题
-    "data": {
-        "deviceid": "d1" //mqtt服务器登陆名
-    }
-};
-// 服务器返回设备授权码，server->client
-server_register_11 = {
-    "m": "11",
-    "t": "$regdrx",
-    "r": "$regdtx",
-    "data": {
-        "regnum": "1234343242",//设备唯一码
-        "deviceid": "d1", //mqtt服务器登陆名
-        "password": "1234"// mqtt服务器密码
-    }
-};
-// 服务器返回设备注册完成消息，server->client
-server_register_ok_13 = {
-    "m": "13",
-    "t": "$drx/d1", //发送订阅主题
-    "r": "$dtx/d1", //接收订阅主题
-    "data": {
-        "deviceid": "d1", //mqtt服务器登陆名
-        "res": "ok"// 注册成功标记
-    }
-};
-// 注册结束
-// 上传位置信息功能，20：
-// 位置信息上传，无网络情况下设备本地最多可存储100条数据，有网络后上传到服务器上，并清除本地储存，client->server
-device_location_20 = {
-    "m": "20",
-    "t": "$dtx/d1", //发送订阅主题
-    "r": "$drx/d1", //接收订阅主题
-    "data": {
-        "deviceid": "d1",
-        "type": 1,// 1:实时数据，2：补发数据
-        "batterynum": 80, // 电量
-        "signalnum": 25, // 信号强度
-        "mode": 1,//0:无法定位，1：北斗定位，2：基站定位，3：GPS定位
-        "lon": "xxxx.xxxx",//精度
-        "lat": "xxxx.xxx",//纬度
-        "speed": 2.3, //速度
-        "num": 3,// 收星颗数
-        "createtime": "", //数据时间
-        "uploadtime": ""//上传时间
-    }
-};
-// 服务器发送设备配置信息，tag为0表示没有更新设置，1表示有更新，设备应去获取对应更新，server->client
-server_device_config_tag_21 = {
-    "m": "21",
-    "t": "$drx/d1", //发送订阅主题
-    "r": "$dtx/d1", //接收订阅主题
-    "data": {
-        "deviceid": "d1",
-        "uploadtag": "0",//数据上传频率
-        "owntag": "0",//持有者配置
-        "sostag": "0",// 紧急联系人设置
-        "valtag": "0",//音量设置
-        "timetag": "0",//整点报时设置
-        "hongontag": "0",//自动接听设置
-        "whitetag": "0",// 白名单设置
-        "servertag": "0",//服务器设置
-        "msgtag": "0"//语音播报内容设置
-    }
-};
-// 设置有更新，设备向服务器请求更新数据，client->server
-device_set_uploadtag_30 = {
-    "m": "30",
-    "t": "$dtx/d1", //发送订阅主题
-    "r": "$drx/d1", //接收订阅主题
-    "data": {
-        "settag": "uploadtag",//设置类型
-        "res": 0//请求更新，1为设置完成
-    }
-};
-
-//服务器端返回配置信息，server->client
-server_set_device_31 = {
-    "m": "31",
-    "t": "$drx/d1", //发送订阅主题
-    "r": "$dtx/d1", //接收订阅主题
-    "data": {
-        "network": 0,// 0上传数据时打开网络链接，1一直保持网络链接
-        "rate": 0//0-6,0:15S上传一次位置信息,
-        //1:1分钟上传一次位置信息
-        //2:10分钟上传一次位置信息
-        //3:30分钟上传一次位置信息
-        //4:1小时上传一次位置信息
-        //5:2小时上传一次位置信息
-        //6:6小时上传一次位置信息
-        //7:12小时上传一次位置信息
-
-    }
-};
-// 持有者
-server_set_device_32 = {
-    "m": "32",
-    "t": "$drx/d1", //发送订阅主题
-    "r": "$dtx/d1", //接收订阅主题
-    "data": {
-        "username": "",// 持有者姓名
-        "cardid": "",//持有者证件号码
-        "memo": ""//备注信息
-    }
-};
-//紧急联系人设置
-server_set_device_33 = {
-    "m": "33",
-    "t": "$drx/d1", //发送订阅主题
-    "r": "$dtx/d1", //接收订阅主题
-    "data": {
-
-        "key0_keynum": "key1",//按键编号
-        "key0_type": 1, //1只拨打第一个电话，2电话1无人接听时拨打第二个电话
-        "key0_name": "",// 姓名
-        "key0_phone": "",//电话
-        "key0_name2": "",// 备用联系人
-        "key0_phone2": "",//
-        "key0_msg": "",//短信内容，可以为空，不设置不打电话
-
-        "key1_keynum": "key2",//按键编号
-        "key1_type": 1, //1只拨打第一个电话，2电话1无人接听时拨打第二个电话
-        "key1_name": "",// 姓名
-        "key1_phone": "",//电话
-        "key1_name2": "",// 备用联系人
-        "key1_phone2": "",//
-        "key1_msg": "",//短信内容，可以为空，不设置不打电话
-
-        "key2_keynum": "key3",//按键编号
-        "key2_type": 1, //1只拨打第一个电话，2电话1无人接听时拨打第二个电话
-        "key2_name": "",// 姓名
-        "key2_phone": "",//电话
-        "key2_name2": "",// 备用联系人
-        "key2_phone2": "",//
-        "key2_msg": ""//短信内容，可以为空，不设置不打电话
-
-    }
-};
-// 音量设置，
-server_set_device_34 = {
-    "m": "34",
-    "t": "$drx/d1", //发送订阅主题
-    "r": "$dtx/d1", //接收订阅主题
-    "data": {
-        "msgvol": 5,// 0-10，系统通知
-        "phonevol": 5,//0-10,通话音量
-        "msgtype": 3// 电话铃声，设备里的铃声编号
-    }
-};
-// 整点报时设置，server_set_device_35
-server_set_device_35 = {
-    "m": "35",
-    "t": "$drx/d1", //发送订阅主题
-    "r": "$dtx/d1", //接收订阅主题
-    "data": {
-        "clock": 1// 0关闭整点报时，1打开整点报时
-    }
-};
-// 自动接听设置
-server_set_device_36 = {
-    "m": "36",
-    "t": "$drx/d1", //发送订阅主题
-    "r": "$dtx/d1", //接收订阅主题
-    "data": {
-        "autoanswer": 1// 1自动接听，0不自动接听
-    }
-};
-//白名单设置，白名单中的号码来电，播报来电人姓名，如：张三来电，张三来电；白名单以外的电话号码来电，播报手机号，如：13833812345来电……
-server_set_device_37 = {
-    "m": "37",
-    "t": "$drx/d1", //发送订阅主题
-    "r": "$dtx/d1", //接收订阅主题
-    "data": {
-        "whitetag": 1,// 0关闭白名单，1打开白名单
-
-        "name0": "张三",//姓名
-        "phone0": "",//电话号码
-        "name1": "张三",//姓名
-        "phone1": "",//电话号码
-        "name9": "张三",//姓名
-        "phone9": ""//电话号码
-
-    }
-};
-// 服务器端口号设置
-server_set_device_38 = {
-    "m": "38",
-    "t": "$drx/d1", //发送订阅主题
-    "r": "$dtx/d1", //接收订阅主题
-    "data": {
-        "serverhost": "",
-        "serverport": ""
-    }
-};
-//语音播报
-server_set_device_39 = {
-    "m": "39",
-    "t": "$drx/d1", //发送订阅主题
-    "r": "$dtx/d1", //接收订阅主题
-    "data": {
-        "newstime": "",// 语音播放时间，到时间后开始播放内容
-        "newstype": "1",// 播报类型，1，实时播报，0，延时播报，等到newstime的时间点再播放。
-        "news": "",//服务器下发文字，播报完自动删除
-        "newsurl": ""//音频文件url，有内容的话，播放此音频文件
-    }
-};
-// 基站信息
-c2s_40 = {
-    "m": "40",
-    "t": "$dtx/5a0966ac50d14fa7831db53ab3200008",
-    "r": "$drx/5a0966ac50d14fa7831db53ab3200008",
-    "data": {
-        "cellinf0": "460.1.9550.102075144.28",// 临近基站1
-        "cellinf1": "460.1.9538.102218501.6",// 临近基站2
-        "createTime": "20200722102239",
-        "uploadTime": "20200722102239"
-    }
-};

src/main/resources/mapper/CallRecordsMapping.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.zhiyun.mqtt.mapper.CallRecordsMapper">
+<mapper namespace="com.zy.bms.mapper.CallRecordsMapper">
 
-    <select id="getListPage" resultType="com.zhiyun.mqtt.model.CallRecords">
+    <select id="getListPage" resultType="com.zy.bms.model.CallRecords">
         SELECT
             deviceId,
             `type`,

src/main/resources/mapper/DeviceConfigMapping.xml

@@ -1,15 +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.zhiyun.mqtt.mapper.SetUpdateTagMapper">
-
-    <update id="updateMsgConfirm">
-        UPDATE
-            set_update_tag
-        SET
-            ${column} = #{tag}
-        WHERE
-        deviceId = #{deviceId}
-    </update>
-</mapper>

src/main/resources/mapper/DeviceLocationMapping.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.zhiyun.mqtt.mapper.DeviceLocationMapper">
+<mapper namespace="com.zy.bms.mapper.DeviceLocationMapper">
 
-    <select id="getHistory" resultType="com.zhiyun.mqtt.common.vo.LocationHistoryVo">
+    <select id="getHistory" resultType="com.zy.bms.common.vo.LocationHistoryVo">
         SELECT
             deviceId,
             lonGcj,

src/main/resources/mapper/DeviceMapping.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.zhiyun.mqtt.mapper.DeviceMapper">
+<mapper namespace="com.zy.bms.mapper.DeviceMapper">
 
-    <select id="getListPage" resultType="com.zhiyun.mqtt.model.Device">
+    <select id="getListPage" resultType="com.zy.bms.model.Device">
         SELECT
         id,num,clientId,password,createTime,tags,status,groupId
         FROM zy_device
@@ -21,7 +21,7 @@
         </where>
     </select>
 
-    <select id="getByUserId" resultType="com.zhiyun.mqtt.model.Device">
+    <select id="getByUserId" resultType="com.zy.bms.model.Device">
         SELECT
             t2.id,
             t2.num,