独立拆出老人机项目

src/main/java/com/zy/bms/common/aspect/LogAspect.java

@@ -1,57 +0,0 @@
-package com.zy.bms.common.aspect;
-
-import com.zy.bms.common.exception.ApiRuntimeException;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-
-import java.lang.reflect.Method;
-import java.util.Arrays;
-
-/**
- * 打印日志切面
- *
- * @author yang xiao kun
- * create on 2021/2/25
- */
-//@Aspect
-//@Component
-public class LogAspect {
-
-    /**
-     * 定义一个切入点.
-     */
-    @Pointcut("execution(* com.zhiyun.mqtt.service.impl..*.*(..))||execution(* com.zhiyun.mqtt.controller..*.*(..))")
-    public void pointcut() {
-    }
-
-    /**
-     * 方法切入点（输出方法执行概要日志）
-     *
-     * @param joinPoint 连接点
-     * @return 原方法返回值
-     */
-    @Around(value = "pointcut()")
-    public Object around(ProceedingJoinPoint joinPoint) {
-        StringBuilder sb = buildMethodInfo(joinPoint);
-        try {
-            return joinPoint.proceed();
-        } catch (Throwable throwable) {
-            sb.append("发生异常:").append(throwable.getMessage());
-            throw new ApiRuntimeException("系统错误");
-        } finally {
-            System.out.println(sb.toString());
-        }
-    }
-
-    private StringBuilder buildMethodInfo(ProceedingJoinPoint joinPoint) {
-        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
-        Method method = signature.getMethod();
-        StringBuilder result = new StringBuilder();
-        result.append("执行方法:").append(method.toGenericString())
-                .append(" -- ")
-                .append("入参:").append(Arrays.toString(joinPoint.getArgs()));
-        return result;
-    }
-}

src/main/java/com/zy/bms/BMSApplication.java → src/main/java/com/zy/omp/OMPApplication.java

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

src/main/java/com/zy/bms/common/Constant.java → src/main/java/com/zy/omp/common/Constant.java

@@ -1,4 +1,4 @@
-package com.zy.bms.common;
+package com.zy.omp.common;
 
 /**
  * 常量
@@ -10,6 +10,7 @@ public class Constant {
 
 
     public static final String OLD_PHONE_DEVICE_ID_PREFIX = "omp_";//老人机项目设备注册MQTT用户名前缀
+    public static final String LP_DEVICE_ID_PREFIX = "IMEI";//路牌项目设备注册MQTT用户名前缀
 
     /**
      * redis key前缀
@@ -41,6 +42,14 @@ public class Constant {
     public static final String TOPIC_DEVICE_SERVER = "$dtx/";
     public static final String TOPIC_DEVICE_CLIENT = "$drx/";
 
+    /**
+     * 路牌
+     */
+    public static final String TOPIC_REGISTER_SERVER_LP = "$regdtx2";
+    public static final String TOPIC_REGISTER_CLIENT_LP = "$regdrx2";
+    public static final String TOPIC_DEVICE_SERVER_LP = "$dtxlp/";
+    public static final String TOPIC_DEVICE_CLIENT_LP = "$drxlp/";
+
     /**
      * 微信小程序登录相关配置
      */

src/main/java/com/zy/bms/common/ServerResponse.java → src/main/java/com/zy/omp/common/ServerResponse.java

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

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

@@ -1,7 +1,7 @@
-package com.zy.bms.common.controller;
+package com.zy.omp.common.controller;
 
-import com.zy.bms.common.exception.ApiRuntimeException;
-import com.zy.bms.utils.AesUtils;
+import com.zy.omp.common.exception.ApiRuntimeException;
+import com.zy.omp.utils.AesUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.ModelAttribute;
 

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

@@ -1,6 +1,6 @@
-package com.zy.bms.common.controller;
+package com.zy.omp.common.controller;
 
-import com.zy.bms.common.ServerResponse;
+import com.zy.omp.common.ServerResponse;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

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

@@ -1,7 +1,7 @@
-package com.zy.bms.common.controller;
+package com.zy.omp.common.controller;
 
-import com.zy.bms.common.ServerResponse;
-import com.zy.bms.common.exception.ApiRuntimeException;
+import com.zy.omp.common.ServerResponse;
+import com.zy.omp.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/zy/bms/common/enums/ResponseCode.java → src/main/java/com/zy/omp/common/enums/ResponseCode.java

@@ -1,4 +1,4 @@
-package com.zy.bms.common.enums;
+package com.zy.omp.common.enums;
 
 /**
  * 接口返回常量
@@ -7,7 +7,6 @@ public enum ResponseCode {
     SUCCESS(200, "Success"),//成功
     WARNING(300, "Warning"),//警告,不进入成功回调函数,直接alert
     AUTHOR(401, "Forbidden"),//没有权限,跳转登录
-    ILLEGAL(402, "Illegal"),//非法请求
     ERROR(500, "Error");//服务器异常
     public final int code;
     public final String msg;

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

@@ -1,4 +1,4 @@
-package com.zy.bms.common.exception;
+package com.zy.omp.common.exception;
 
 /**
  * 运行时异常

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

@@ -1,8 +1,8 @@
-package com.zy.bms.common.redis;
+package com.zy.omp.common.redis;
 
 import com.alibaba.fastjson.JSON;
-import com.zy.bms.common.Constant;
-import com.zy.bms.model.Location;
+import com.zy.omp.common.Constant;
+import com.zy.omp.model.Location;
 import org.springframework.data.redis.core.RedisTemplate;
 
 import javax.annotation.Resource;

src/main/java/com/zy/bms/common/redis/SessionManager.java → src/main/java/com/zy/omp/common/redis/SessionManager.java

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

src/main/java/com/zy/bms/config/BeanConfig.java → src/main/java/com/zy/omp/config/BeanConfig.java

@@ -1,4 +1,4 @@
-package com.zy.bms.config;
+package com.zy.omp.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
@@ -7,7 +7,6 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.client.RestTemplate;
 import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 import java.time.LocalDateTime;
@@ -41,6 +40,8 @@ public class BeanConfig {
     }
 
     /**
+     * WebSocket
+     * <p>
      * ServerEndpointExporter 作用
      * 这个Bean会自动注册使用@ServerEndpoint注解声明的websocket endpoint
      */

src/main/java/com/zy/bms/config/InterceptorConfig.java → src/main/java/com/zy/omp/config/InterceptorConfig.java

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

src/main/java/com/zy/bms/config/WebMvcConfig.java → src/main/java/com/zy/omp/config/WebMvcConfig.java

@@ -1,4 +1,4 @@
-package com.zy.bms.config;
+package com.zy.omp.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
@@ -11,6 +11,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 @Profile("dev")
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
+
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         //设置允许跨域的路径

src/main/java/com/zy/bms/common/interceptor/AuthInterceptor.java → src/main/java/com/zy/omp/config/interceptor/AuthInterceptor.java

@@ -1,6 +1,6 @@
-package com.zy.bms.common.interceptor;
+package com.zy.omp.config.interceptor;
 
-import com.zy.bms.common.redis.SessionManager;
+import com.zy.omp.common.redis.SessionManager;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 

src/main/java/com/zy/bms/common/interceptor/VerifyInterceptor.java → src/main/java/com/zy/omp/config/interceptor/VerifyInterceptor.java

@@ -1,4 +1,4 @@
-package com.zy.bms.common.interceptor;
+package com.zy.omp.config.interceptor;
 
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;

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

@@ -1,14 +1,14 @@
-package com.zy.bms.config.mqtt;
+package com.zy.omp.config.mqtt;
 
-import com.zy.bms.common.Constant;
-import com.zy.bms.common.dto.MqttMsgDto;
-import com.zy.bms.common.exception.ApiRuntimeException;
-import com.zy.bms.model.*;
-import com.zy.bms.service.*;
-import com.zy.bms.utils.*;
-import com.zy.bms.utils.CoordTransformUtil;
-import com.zy.bms.utils.GaoDeApiUtil;
-import com.zy.bms.websocket.WebSocketServer;
+import com.zy.omp.common.Constant;
+import com.zy.omp.pojo.dto.MqttMsgDto;
+import com.zy.omp.common.exception.ApiRuntimeException;
+import com.zy.omp.model.*;
+import com.zy.omp.service.*;
+import com.zy.omp.utils.*;
+import com.zy.omp.utils.CoordTransformUtil;
+import com.zy.omp.utils.GaoDeApiUtil;
+import com.zy.omp.websocket.WebSocketServer;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -50,45 +50,98 @@ public class MqttCallbackHandler {
         mqttLogService.saveLog(topic, payload, 0);
         //消息返回JSON转Object
         MqttMsgDto msgDto = MqttMsgDto.parse(payload);
-        //根据报文标识代码 M 处理消息
-        switch (msgDto.getM()) {
-            //设备端注册报文
-            case Constant.M_CODE_REGISTER: {
-                registerDeviceHandler(msgDto);
-                break;
+        //路牌项目
+        if (topic.startsWith("$regdtx2") || topic.startsWith("$dtxlp")) {
+            switch (msgDto.getM()) {
+                //设备端注册报文
+                case Constant.M_CODE_REGISTER: {
+                    registerHandler_LP(msgDto);
+                    break;
+                }
+                // 设备位置信息上报
+                case Constant.M_CODE_UPLOAD_LOCATION: {
+                    uploadLocationHandler(msgDto);
+                    break;
+                }
+                //设备上传通话记录
+                case Constant.M_CODE_UPLOAD_CALL_RECORD: {
+                    uploadCallRecordsHandler(msgDto);
+                    break;
+                }
             }
-            // 设备位置信息上报
-            case Constant.M_CODE_UPLOAD_LOCATION: {
-                uploadLocationHandler(msgDto);
-                break;
+        }
+        //老人机项目
+        else {
+            switch (msgDto.getM()) {
+                //设备端注册报文
+                case Constant.M_CODE_REGISTER: {
+                    registerHandler_OMP(msgDto);
+                    break;
+                }
+                // 设备位置信息上报
+                case Constant.M_CODE_UPLOAD_LOCATION: {
+                    uploadLocationHandler(msgDto);
+                    break;
+                }
+                //设备上传通话记录
+                case Constant.M_CODE_UPLOAD_CALL_RECORD: {
+                    uploadCallRecordsHandler(msgDto);
+                    break;
+                }
             }
-            //设备上传通话记录
-            case Constant.M_CODE_UPLOAD_CALL_RECORD: {
-                uploadCallRecordsHandler(msgDto);
-                break;
+            //转发消息至网页,忽略注册的报文
+            if (!topic.equals(Constant.TOPIC_REGISTER_SERVER)) {
+                webSocketServer.massMessage(msgDto.getDeviceId(), payload);
             }
         }
-        //转发消息至网页,忽略注册的报文
-        if (!topic.equals(Constant.TOPIC_REGISTER_SERVER)) {
-            webSocketServer.massMessage(msgDto.getDeviceId(), payload);
+    }
+
+    /**
+     * 注册设备
+     * 老人机
+     */
+    private void registerHandler_OMP(MqttMsgDto obj) {
+        String num = obj.getString("regnum");
+        //查询数据库中是否有此设备
+        Device device = deviceService.getByNum(num);
+        //没有该设备,保存至数据库
+        if (device == null) {
+            device = new Device();
+            device.setNum(num);
+            device.setClientId(Constant.OLD_PHONE_DEVICE_ID_PREFIX + num);
+            device.setPassword(MD5Util.MD5Encode(num));
+            deviceService.save(device);
+            SetBase setBase = new SetBase();
+            setBase.setDeviceId(device.getClientId());
+            setBaseService.save(setBase);
         }
+        //mqtt服务器注册用户
+        rabbitMQApi.registerMqtt(device.getClientId(), device.getPassword());
+        //发送消息
+        setService.returnCode_OMP(device);
     }
 
     /**
      * 注册设备
+     * 路牌
      */
-    private void registerDeviceHandler(MqttMsgDto obj) {
+    private void registerHandler_LP(MqttMsgDto obj) {
         String num = obj.getString("regnum");
         //查询数据库中是否有此设备
         Device device = deviceService.getByNum(num);
         //没有该设备,保存至数据库
         if (device == null) {
-            device = createDevice(num);
+            device = new Device();
+            device.setNum(num);
+            device.setClientId(Constant.LP_DEVICE_ID_PREFIX + num);
+            device.setPassword(MD5Util.MD5Encode(num));
+            device.setGroup(obj.getString("group"));
+            deviceService.save(device);
         }
         //mqtt服务器注册用户
         rabbitMQApi.registerMqtt(device.getClientId(), device.getPassword());
         //发送消息
-        setService.returnCodeToDevice(device);
+        setService.returnCode_LP(device);
     }
 
     /**
@@ -116,23 +169,6 @@ public class MqttCallbackHandler {
         callRecordsService.save(callRecords);
     }
 
-    /**
-     * 创建设备信息,保存设备基础信息以及设置信息
-     *
-     * @param num 设备随机码
-     */
-    private Device createDevice(String num) {
-        Device device = new Device();
-        device.setNum(num);
-        String clientId = Constant.OLD_PHONE_DEVICE_ID_PREFIX + num;
-        device.setClientId(clientId);
-        device.setPassword(MD5Util.MD5Encode(clientId));
-        deviceService.save(device);
-        SetBase setBase = new SetBase();
-        setBase.setDeviceId(device.getClientId());
-        setBaseService.save(setBase);
-        return device;
-    }
 
     /**
      * 解析信息转为位置对象

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

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

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

@@ -1,6 +1,6 @@
-package com.zy.bms.config.mqtt;
+package com.zy.omp.config.mqtt;
 
-import com.zy.bms.utils.CodeGenerator;
+import com.zy.omp.utils.CodeGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -31,7 +31,7 @@ public class MqttConsumerCfg {
     private MqttPahoClientFactory mqttClientFactory;
 
     //默认监听主题
-    private final String[] defaultTopic = new String[]{"$regdtx", "$dtx/#"};
+    private final String[] defaultTopic = new String[]{"$regdtx", "$dtx/#","$regdtx2","$dtxlp/#"};
 
     /**
      * MQTT 消息订阅绑定（消费者）

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

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

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

@@ -1,6 +1,6 @@
-package com.zy.bms.config.mqtt;
+package com.zy.omp.config.mqtt;
 
-import com.zy.bms.utils.CodeGenerator;
+import com.zy.omp.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/zy/bms/controller/pc/AdminController.java → src/main/java/com/zy/omp/controller/pc/AdminController.java

@@ -1,11 +1,11 @@
-package com.zy.bms.controller.pc;
+package com.zy.omp.controller.pc;
 
-import com.zy.bms.common.ServerResponse;
-import com.zy.bms.common.controller.BaseController;
-import com.zy.bms.model.Admin;
-import com.zy.bms.common.redis.SessionManager;
-import com.zy.bms.service.AdminService;
-import com.zy.bms.utils.MD5Util;
+import com.zy.omp.common.ServerResponse;
+import com.zy.omp.common.controller.BaseController;
+import com.zy.omp.model.Admin;
+import com.zy.omp.common.redis.SessionManager;
+import com.zy.omp.service.AdminService;
+import com.zy.omp.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/zy/bms/controller/pc/PcDeviceController.java → src/main/java/com/zy/omp/controller/pc/PcDeviceController.java

@@ -1,8 +1,8 @@
-package com.zy.bms.controller.pc;
+package com.zy.omp.controller.pc;
 
-import com.zy.bms.common.ServerResponse;
-import com.zy.bms.common.io.pc.DeviceIO;
-import com.zy.bms.service.DeviceService;
+import com.zy.omp.common.ServerResponse;
+import com.zy.omp.pojo.io.pc.DeviceIO;
+import com.zy.omp.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/zy/bms/controller/pc/PcLocationController.java → src/main/java/com/zy/omp/controller/pc/PcLocationController.java

@@ -1,7 +1,7 @@
-package com.zy.bms.controller.pc;
+package com.zy.omp.controller.pc;
 
-import com.zy.bms.common.ServerResponse;
-import com.zy.bms.service.LatestLocationService;
+import com.zy.omp.common.ServerResponse;
+import com.zy.omp.service.LatestLocationService;
 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/zy/bms/controller/pc/PcMqttLogController.java → src/main/java/com/zy/omp/controller/pc/PcMqttLogController.java

@@ -1,9 +1,9 @@
-package com.zy.bms.controller.pc;
+package com.zy.omp.controller.pc;
 
-import com.zy.bms.common.Constant;
-import com.zy.bms.common.ServerResponse;
-import com.zy.bms.common.io.pc.MqttLogsIO;
-import com.zy.bms.service.MqttLogService;
+import com.zy.omp.common.Constant;
+import com.zy.omp.common.ServerResponse;
+import com.zy.omp.pojo.io.pc.MqttLogsIO;
+import com.zy.omp.service.MqttLogService;
 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/zy/bms/controller/pc/PcSetController.java → src/main/java/com/zy/omp/controller/pc/PcSetController.java

@@ -1,10 +1,10 @@
-package com.zy.bms.controller.pc;
+package com.zy.omp.controller.pc;
 
-import com.zy.bms.common.Constant;
-import com.zy.bms.common.ServerResponse;
-import com.zy.bms.common.io.wechat.SetIO;
-import com.zy.bms.service.SetBaseService;
-import com.zy.bms.service.SetService;
+import com.zy.omp.common.Constant;
+import com.zy.omp.common.ServerResponse;
+import com.zy.omp.pojo.io.wechat.SetIO;
+import com.zy.omp.service.SetBaseService;
+import com.zy.omp.service.SetService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

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

@@ -1,8 +1,8 @@
-package com.zy.bms.controller.pc;
+package com.zy.omp.controller.pc;
 
-import com.zy.bms.common.ServerResponse;
-import com.zy.bms.common.io.pc.UserIO;
-import com.zy.bms.service.UserService;
+import com.zy.omp.common.ServerResponse;
+import com.zy.omp.pojo.io.pc.UserIO;
+import com.zy.omp.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/zy/bms/controller/wx/DeviceController.java → src/main/java/com/zy/omp/controller/wx/DeviceController.java

@@ -1,12 +1,12 @@
-package com.zy.bms.controller.wx;
+package com.zy.omp.controller.wx;
 
 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 com.zy.omp.common.ServerResponse;
+import com.zy.omp.common.controller.BaseController;
+import com.zy.omp.model.DeviceDynamic;
+import com.zy.omp.service.DeviceService;
+import com.zy.omp.service.DeviceDynamicService;
 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/zy/bms/controller/wx/IdiomsController.java → src/main/java/com/zy/omp/controller/wx/IdiomsController.java

@@ -1,8 +1,8 @@
-package com.zy.bms.controller.wx;
+package com.zy.omp.controller.wx;
 
-import com.zy.bms.common.ServerResponse;
-import com.zy.bms.common.controller.BaseController;
-import com.zy.bms.service.IdiomsService;
+import com.zy.omp.common.ServerResponse;
+import com.zy.omp.common.controller.BaseController;
+import com.zy.omp.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/zy/bms/controller/wx/LocationController.java → src/main/java/com/zy/omp/controller/wx/LocationController.java

@@ -1,8 +1,8 @@
-package com.zy.bms.controller.wx;
+package com.zy.omp.controller.wx;
 
-import com.zy.bms.common.ServerResponse;
-import com.zy.bms.common.io.wechat.DeviceHistoryIO;
-import com.zy.bms.service.LocationService;
+import com.zy.omp.common.ServerResponse;
+import com.zy.omp.pojo.io.wechat.DeviceHistoryIO;
+import com.zy.omp.service.LocationService;
 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/zy/bms/controller/wx/SetController.java → src/main/java/com/zy/omp/controller/wx/SetController.java

@@ -1,11 +1,11 @@
-package com.zy.bms.controller.wx;
+package com.zy.omp.controller.wx;
 
-import com.zy.bms.common.Constant;
-import com.zy.bms.common.ServerResponse;
-import com.zy.bms.common.controller.BaseController;
-import com.zy.bms.common.io.wechat.*;
-import com.zy.bms.service.DeviceDynamicService;
-import com.zy.bms.service.SetService;
+import com.zy.omp.common.Constant;
+import com.zy.omp.common.ServerResponse;
+import com.zy.omp.common.controller.BaseController;
+import com.zy.omp.pojo.io.wechat.SetIO;
+import com.zy.omp.service.DeviceDynamicService;
+import com.zy.omp.service.SetService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

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

@@ -1,12 +1,12 @@
-package com.zy.bms.controller.wx;
+package com.zy.omp.controller.wx;
 
-import com.zy.bms.common.ServerResponse;
-import com.zy.bms.common.controller.BaseController;
-import com.zy.bms.common.io.CallRecordsIO;
-import com.zy.bms.common.io.NewsIO;
-import com.zy.bms.service.CallRecordsService;
-import com.zy.bms.service.SetBaseService;
-import com.zy.bms.service.NewsService;
+import com.zy.omp.common.ServerResponse;
+import com.zy.omp.common.controller.BaseController;
+import com.zy.omp.pojo.io.CallRecordsIO;
+import com.zy.omp.pojo.io.NewsIO;
+import com.zy.omp.service.CallRecordsService;
+import com.zy.omp.service.SetBaseService;
+import com.zy.omp.service.NewsService;
 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/zy/bms/controller/wx/UserController.java → src/main/java/com/zy/omp/controller/wx/UserController.java

@@ -1,9 +1,9 @@
-package com.zy.bms.controller.wx;
+package com.zy.omp.controller.wx;
 
-import com.zy.bms.common.ServerResponse;
-import com.zy.bms.model.User;
-import com.zy.bms.service.UserService;
-import com.zy.bms.utils.AesUtils;
+import com.zy.omp.common.ServerResponse;
+import com.zy.omp.model.User;
+import com.zy.omp.service.UserService;
+import com.zy.omp.utils.AesUtils;
 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/zy/bms/mapper/AdminMapper.java → src/main/java/com/zy/omp/mapper/AdminMapper.java

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

src/main/java/com/zy/bms/mapper/CallRecordsMapper.java → src/main/java/com/zy/omp/mapper/CallRecordsMapper.java

@@ -1,10 +1,10 @@
-package com.zy.bms.mapper;
+package com.zy.omp.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.zy.bms.common.io.CallRecordsIO;
-import com.zy.bms.model.CallRecords;
+import com.zy.omp.pojo.io.CallRecordsIO;
+import com.zy.omp.model.CallRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

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

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

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

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

src/main/java/com/zy/bms/mapper/IdiomsMapper.java → src/main/java/com/zy/omp/mapper/IdiomsMapper.java

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

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

@@ -1,8 +1,8 @@
-package com.zy.bms.mapper;
+package com.zy.omp.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zy.bms.common.vo.DeviceFullDataVo;
-import com.zy.bms.model.LatestLocation;
+import com.zy.omp.pojo.vo.DeviceFullDataVo;
+import com.zy.omp.model.LatestLocation;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 

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

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

src/main/java/com/zy/bms/mapper/MqttLogMapper.java → src/main/java/com/zy/omp/mapper/MqttLogMapper.java

@@ -1,10 +1,10 @@
-package com.zy.bms.mapper;
+package com.zy.omp.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.zy.bms.common.io.pc.MqttLogsIO;
-import com.zy.bms.model.MqttLog;
+import com.zy.omp.pojo.io.pc.MqttLogsIO;
+import com.zy.omp.model.MqttLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

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

@@ -1,10 +1,10 @@
-package com.zy.bms.mapper;
+package com.zy.omp.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.zy.bms.common.io.NewsIO;
-import com.zy.bms.model.News;
+import com.zy.omp.pojo.io.NewsIO;
+import com.zy.omp.model.News;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

src/main/java/com/zy/bms/mapper/SetBaseMapper.java → src/main/java/com/zy/omp/mapper/SetBaseMapper.java

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

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

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

src/main/java/com/zy/bms/model/Admin.java → src/main/java/com/zy/omp/model/Admin.java

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

src/main/java/com/zy/bms/model/CallRecords.java → src/main/java/com/zy/omp/model/CallRecords.java

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

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

@@ -1,4 +1,4 @@
-package com.zy.bms.model;
+package com.zy.omp.model;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -30,6 +30,11 @@ public class Device {
      */
     private String password;
 
+    /**
+     * 设备组
+     */
+    private String group;
+
     /**
      * 创建时间
      */

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

@@ -1,10 +1,9 @@
-package com.zy.bms.model;
+package com.zy.omp.model;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**

src/main/java/com/zy/bms/model/LatestLocation.java → src/main/java/com/zy/omp/model/LatestLocation.java

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

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

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

src/main/java/com/zy/bms/model/MqttLog.java → src/main/java/com/zy/omp/model/MqttLog.java

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

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

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

src/main/java/com/zy/bms/model/SetBase.java → src/main/java/com/zy/omp/model/SetBase.java

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

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

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

src/main/java/com/zy/bms/model/UserIdioms.java → src/main/java/com/zy/omp/model/UserIdioms.java

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

src/main/java/com/zy/bms/common/dto/MqttMsgDto.java → src/main/java/com/zy/omp/pojo/dto/MqttMsgDto.java

@@ -1,8 +1,8 @@
-package com.zy.bms.common.dto;
+package com.zy.omp.pojo.dto;
 
 import com.alibaba.fastjson.JSON;
-import com.zy.bms.common.Constant;
-import com.zy.bms.utils.DateTimeUtil;
+import com.zy.omp.common.Constant;
+import com.zy.omp.utils.DateTimeUtil;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

src/main/java/com/zy/bms/common/io/CallRecordsIO.java → src/main/java/com/zy/omp/pojo/io/CallRecordsIO.java

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

src/main/java/com/zy/bms/common/io/NewsIO.java → src/main/java/com/zy/omp/pojo/io/NewsIO.java

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

src/main/java/com/zy/bms/common/io/PageIO.java → src/main/java/com/zy/omp/pojo/io/PageIO.java

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

src/main/java/com/zy/bms/common/io/pc/DeviceIO.java → src/main/java/com/zy/omp/pojo/io/pc/DeviceIO.java

@@ -1,6 +1,6 @@
-package com.zy.bms.common.io.pc;
+package com.zy.omp.pojo.io.pc;
 
-import com.zy.bms.common.io.PageIO;
+import com.zy.omp.pojo.io.PageIO;
 import lombok.Data;
 
 /**

src/main/java/com/zy/bms/common/io/pc/MqttLogsIO.java → src/main/java/com/zy/omp/pojo/io/pc/MqttLogsIO.java

@@ -1,6 +1,6 @@
-package com.zy.bms.common.io.pc;
+package com.zy.omp.pojo.io.pc;
 
-import com.zy.bms.common.io.PageIO;
+import com.zy.omp.pojo.io.PageIO;
 import lombok.Data;
 
 /**

src/main/java/com/zy/bms/common/io/pc/UserIO.java → src/main/java/com/zy/omp/pojo/io/pc/UserIO.java

@@ -1,6 +1,6 @@
-package com.zy.bms.common.io.pc;
+package com.zy.omp.pojo.io.pc;
 
-import com.zy.bms.common.io.PageIO;
+import com.zy.omp.pojo.io.PageIO;
 import lombok.Data;
 
 /**

src/main/java/com/zy/bms/common/io/wechat/DeviceHistoryIO.java → src/main/java/com/zy/omp/pojo/io/wechat/DeviceHistoryIO.java

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

src/main/java/com/zy/bms/common/io/wechat/SetIO.java → src/main/java/com/zy/omp/pojo/io/wechat/SetIO.java

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

src/main/java/com/zy/bms/common/vo/AdminListVo.java → src/main/java/com/zy/omp/pojo/vo/AdminListVo.java

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

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

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

src/main/java/com/zy/bms/schedule/DeviceStatusSchedule.java → src/main/java/com/zy/omp/schedule/DeviceStatusSchedule.java

@@ -1,13 +1,10 @@
-package com.zy.bms.schedule;
+package com.zy.omp.schedule;
 
-import com.zy.bms.model.Device;
-import com.zy.bms.service.DeviceService;
-import com.zy.bms.service.RabbitMQApi;
+import com.zy.omp.model.Device;
+import com.zy.omp.service.DeviceService;
+import com.zy.omp.service.RabbitMQApi;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 
 import java.time.LocalDateTime;
@@ -20,9 +17,9 @@ import java.util.Set;
  * @author yang xiao kun
  * create on 2021/5/14
  */
-@EnableAsync
-@Configuration
-@EnableScheduling
+//@EnableAsync
+//@Configuration
+//@EnableScheduling
 public class DeviceStatusSchedule {
 
     @Autowired

src/main/java/com/zy/bms/service/AdminService.java → src/main/java/com/zy/omp/service/AdminService.java

@@ -1,9 +1,10 @@
-package com.zy.bms.service;
+package com.zy.omp.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.bms.mapper.AdminMapper;
-import com.zy.bms.model.Admin;
+import com.zy.omp.mapper.AdminMapper;
+import com.zy.omp.model.Admin;
 import org.springframework.stereotype.Service;
 
 /**
@@ -25,4 +26,10 @@ public class AdminService extends ServiceImpl<AdminMapper, Admin> {
         queryWrapper.eq("username", content);
         return baseMapper.selectOne(queryWrapper);
     }
+
+    public void up(Admin admin) {
+        UpdateWrapper<Admin> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("username", admin.getUsername());
+        baseMapper.update(admin, updateWrapper);
+    }
 }

src/main/java/com/zy/bms/service/CallRecordsService.java → src/main/java/com/zy/omp/service/CallRecordsService.java

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

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

@@ -1,14 +1,12 @@
-package com.zy.bms.service;
+package com.zy.omp.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.bms.mapper.DeviceDynamicMapper;
-import com.zy.bms.model.DeviceDynamic;
+import com.zy.omp.mapper.DeviceDynamicMapper;
+import com.zy.omp.model.DeviceDynamic;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * 用户设备绑定关系Service
  *

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

@@ -1,13 +1,13 @@
-package com.zy.bms.service;
+package com.zy.omp.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.zy.bms.common.io.pc.DeviceIO;
-import com.zy.bms.common.vo.DeviceFullDataVo;
-import com.zy.bms.mapper.DeviceMapper;
-import com.zy.bms.model.Device;
+import com.zy.omp.pojo.io.pc.DeviceIO;
+import com.zy.omp.pojo.vo.DeviceFullDataVo;
+import com.zy.omp.mapper.DeviceMapper;
+import com.zy.omp.model.Device;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

src/main/java/com/zy/bms/service/IdiomsService.java → src/main/java/com/zy/omp/service/IdiomsService.java

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

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

@@ -1,9 +1,9 @@
-package com.zy.bms.service;
+package com.zy.omp.service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.bms.common.vo.DeviceFullDataVo;
-import com.zy.bms.mapper.LatestLocationMapper;
-import com.zy.bms.model.LatestLocation;
+import com.zy.omp.pojo.vo.DeviceFullDataVo;
+import com.zy.omp.mapper.LatestLocationMapper;
+import com.zy.omp.model.LatestLocation;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

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

@@ -1,12 +1,12 @@
-package com.zy.bms.service;
+package com.zy.omp.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.bms.common.io.wechat.DeviceHistoryIO;
-import com.zy.bms.mapper.LocationMapper;
-import com.zy.bms.model.Location;
-import com.zy.bms.model.LatestLocation;
-import com.zy.bms.utils.BeanUtil;
+import com.zy.omp.pojo.io.wechat.DeviceHistoryIO;
+import com.zy.omp.mapper.LocationMapper;
+import com.zy.omp.model.Location;
+import com.zy.omp.model.LatestLocation;
+import com.zy.omp.utils.BeanUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

src/main/java/com/zy/bms/service/MqttLogService.java → src/main/java/com/zy/omp/service/MqttLogService.java

@@ -1,13 +1,13 @@
-package com.zy.bms.service;
+package com.zy.omp.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.zy.bms.common.Constant;
-import com.zy.bms.common.io.pc.MqttLogsIO;
-import com.zy.bms.mapper.MqttLogMapper;
-import com.zy.bms.model.MqttLog;
-import com.zy.bms.common.dto.MqttMsgDto;
+import com.zy.omp.common.Constant;
+import com.zy.omp.pojo.io.pc.MqttLogsIO;
+import com.zy.omp.mapper.MqttLogMapper;
+import com.zy.omp.model.MqttLog;
+import com.zy.omp.pojo.dto.MqttMsgDto;
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -1,11 +1,11 @@
-package com.zy.bms.service;
+package com.zy.omp.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.zy.bms.common.io.NewsIO;
-import com.zy.bms.mapper.NewsMapper;
-import com.zy.bms.model.News;
+import com.zy.omp.pojo.io.NewsIO;
+import com.zy.omp.mapper.NewsMapper;
+import com.zy.omp.model.News;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/zy/bms/service/RabbitMQApi.java → src/main/java/com/zy/omp/service/RabbitMQApi.java

@@ -1,9 +1,9 @@
-package com.zy.bms.service;
+package com.zy.omp.service;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.zy.bms.utils.HttpUtil;
+import com.zy.omp.utils.HttpUtil;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Component;
 

src/main/java/com/zy/bms/service/SetBaseService.java → src/main/java/com/zy/omp/service/SetBaseService.java

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

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

@@ -1,14 +1,14 @@
-package com.zy.bms.service;
+package com.zy.omp.service;
 
-import com.zy.bms.common.Constant;
-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.News;
-import com.zy.bms.utils.BeanUtil;
-import com.zy.bms.common.io.wechat.*;
-import com.zy.bms.websocket.WebSocketServer;
+import com.zy.omp.common.Constant;
+import com.zy.omp.pojo.dto.MqttMsgDto;
+import com.zy.omp.config.mqtt.MqttGateway;
+import com.zy.omp.model.Device;
+import com.zy.omp.model.SetBase;
+import com.zy.omp.model.News;
+import com.zy.omp.pojo.io.wechat.SetIO;
+import com.zy.omp.utils.BeanUtil;
+import com.zy.omp.websocket.WebSocketServer;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -56,8 +56,9 @@ public class SetService {
 
     /**
      * 服务器返回授权码
+     * 老人机
      */
-    public void returnCodeToDevice(Device device) {
+    public void returnCode_OMP(Device device) {
         //发送模板消息给设备
         MqttMsgDto msgDto = new MqttMsgDto();
         msgDto.setM(Constant.M_CODE_RETURN_CODE);
@@ -72,6 +73,24 @@ public class SetService {
         mqttLogService.saveLog(Constant.TOPIC_REGISTER_CLIENT, msgDto.toJson(), 1);
     }
 
+    /**
+     * 服务器返回授权码
+     * 路牌
+     */
+    public void returnCode_LP(Device device) {
+        //发送模板消息给设备
+        MqttMsgDto msgDto = new MqttMsgDto();
+        msgDto.setM(Constant.M_CODE_RETURN_CODE);
+        Map<String, Object> data = new HashMap<>();
+        data.put("regnum", device.getNum());
+        data.put("sn", "SN" + device.getNum());
+        data.put("password", device.getPassword());
+        data.put("group", device.getGroup());
+        msgDto.setData(data);
+        // 3. 存储消息日志
+        mqttLogService.saveLog(Constant.TOPIC_REGISTER_CLIENT_LP, msgDto.toJson(), 1);
+    }
+
     /**
      * 存储至数据库
      */

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

@@ -1,15 +1,15 @@
-package com.zy.bms.service;
+package com.zy.omp.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.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 com.zy.omp.common.Constant;
+import com.zy.omp.pojo.io.pc.UserIO;
+import com.zy.omp.mapper.UserMapper;
+import com.zy.omp.model.User;
+import com.zy.omp.utils.HttpUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;

src/main/java/com/zy/bms/utils/AesUtils.java → src/main/java/com/zy/omp/utils/AesUtils.java

@@ -1,4 +1,4 @@
-package com.zy.bms.utils;
+package com.zy.omp.utils;
 
 import javax.crypto.Cipher;
 import javax.crypto.KeyGenerator;

src/main/java/com/zy/bms/utils/BeanUtil.java → src/main/java/com/zy/omp/utils/BeanUtil.java

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

src/main/java/com/zy/bms/utils/CodeGenerator.java → src/main/java/com/zy/omp/utils/CodeGenerator.java

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

src/main/java/com/zy/bms/utils/CoordTransformUtil.java → src/main/java/com/zy/omp/utils/CoordTransformUtil.java

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

src/main/java/com/zy/bms/utils/DateTimeUtil.java → src/main/java/com/zy/omp/utils/DateTimeUtil.java

@@ -1,4 +1,4 @@
-package com.zy.bms.utils;
+package com.zy.omp.utils;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;

src/main/java/com/zy/bms/utils/GaoDeApiUtil.java → src/main/java/com/zy/omp/utils/GaoDeApiUtil.java

@@ -1,8 +1,7 @@
-package com.zy.bms.utils;
+package com.zy.omp.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import org.springframework.http.ResponseEntity;
 
 /**
  * 高德API 服务类

src/main/java/com/zy/bms/utils/HttpUtil.java → src/main/java/com/zy/omp/utils/HttpUtil.java

@@ -1,4 +1,4 @@
-package com.zy.bms.utils;
+package com.zy.omp.utils;
 
 import org.springframework.http.*;
 import org.springframework.util.MultiValueMap;

src/main/java/com/zy/bms/utils/MD5Util.java → src/main/java/com/zy/omp/utils/MD5Util.java

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

src/main/java/com/zy/bms/websocket/WebSocketServer.java → src/main/java/com/zy/omp/websocket/WebSocketServer.java

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

src/main/resources/mapper/CallRecordsMapping.xml

@@ -1,10 +1,8 @@
 <?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.CallRecordsMapper">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.omp.mapper.CallRecordsMapper">
 
-    <select id="getListPage" resultType="com.zy.bms.model.CallRecords">
+    <select id="getListPage" resultType="com.zy.omp.model.CallRecords">
         SELECT
             deviceId,
             `type`,

src/main/resources/mapper/DeviceDynamicMapping.xml

@@ -1,8 +1,6 @@
 <?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">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.omp.mapper.DeviceDynamicMapper">
 
     <select id="checkBind" resultType="java.lang.Integer">
         SELECT IFNULL( (SELECT 1 FROM device_dynamic WHERE deviceNum = #{deviceNum} LIMIT 1) ,0)

src/main/resources/mapper/DeviceMapping.xml

@@ -1,8 +1,8 @@
 <?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.DeviceMapper">
+<mapper namespace="com.zy.omp.mapper.DeviceMapper">
 
-    <select id="listPage" resultType="com.zy.bms.common.vo.DeviceFullDataVo">
+    <select id="listPage" resultType="com.zy.omp.pojo.vo.DeviceFullDataVo">
         SELECT
             t1.num             AS deviceNum,
             t1.clientId        AS deviceId,

src/main/resources/mapper/LatestLocationMapping.xml

@@ -1,10 +1,8 @@
 <?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.LatestLocationMapper">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.omp.mapper.LatestLocationMapper">
 
-    <select id="getLatestLocation" resultType="com.zy.bms.common.vo.DeviceFullDataVo">
+    <select id="getLatestLocation" resultType="com.zy.omp.pojo.vo.DeviceFullDataVo">
         SELECT
             t1.num AS deviceNum,
             t2.*

src/main/resources/mapper/LocationMapping.xml

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

src/main/resources/mapper/MqttLogMapping.xml

@@ -1,10 +1,8 @@
 <?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.MqttLogMapper">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.omp.mapper.MqttLogMapper">
 
-    <select id="getListPage" resultType="com.zy.bms.model.MqttLog">
+    <select id="getListPage" resultType="com.zy.omp.model.MqttLog">
         SELECT
             *
         FROM

src/main/resources/mapper/NewsMapping.xml

@@ -1,10 +1,8 @@
 <?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.NewsMapper">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.omp.mapper.NewsMapper">
 
-    <select id="getListPage" resultType="com.zy.bms.model.News">
+    <select id="getListPage" resultType="com.zy.omp.model.News">
         SELECT
             newsTime,
             newsType,

src/main/resources/mapper/UserMapping.xml

@@ -1,8 +1,8 @@
 <?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.UserMapper">
+<mapper namespace="com.zy.omp.mapper.UserMapper">
 
-    <select id="listPage" resultType="com.zy.bms.model.User">
+    <select id="listPage" resultType="com.zy.omp.model.User">
         SELECT
             id,
             username,

src/test/java/com/zy/bms/BMSApplicationTests.java → src/test/java/com/zy/omp/BMSApplicationTests.java

@@ -1,4 +1,4 @@
-package com.zy.bms;
+package com.zy.omp;
 
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;

src/test/java/com/zy/bms/MybatisPlusGenerator.java → src/test/java/com/zy/omp/MybatisPlusGenerator.java

@@ -1,4 +1,4 @@
-package com.zy.bms;
+package com.zy.omp;
 
 import com.baomidou.mybatisplus.generator.AutoGenerator;
 import com.baomidou.mybatisplus.generator.config.*;