整理文件路径

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

@@ -8,8 +8,6 @@ import java.io.Serializable;
 
 /**
  * 接口数据返回定义类
- * 作用:将需要返回给前端的数据进行封装，同时封装status和msg两个字段并JSON序列化
- * T(泛型) 返回数据的类型
  */
 @Data
 @JsonSerialize
@@ -36,10 +34,6 @@ public class ServerResponse implements Serializable {
         return new ServerResponse(ResponseCode.ERROR.code, null, ResponseCode.ERROR.msg);
     }
 
-    public static ServerResponse createByError(String msg) {
-        return new ServerResponse(ResponseCode.ERROR.code, null, msg);
-    }
-
     public static ServerResponse createByWarning(String msg) {
         return new ServerResponse(ResponseCode.WARNING.code, null, msg);
     }

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

@@ -21,14 +21,14 @@ public class ExceptionController {
      */
     @ExceptionHandler(value = MethodArgumentTypeMismatchException.class)
     public ServerResponse MethodArgumentTypeMismatchExceptionHandler() {
-        return ServerResponse.createByError("参数类型错误");
+        return ServerResponse.createByError();
     }
 
     /**
      * 对运行时异常拦截
      */
     @ExceptionHandler(value = ApiRuntimeException.class)
-    public ServerResponse ApiRuntimeExceptionHandler(ApiRuntimeException apiRuntimeException) {
-        return ServerResponse.createByError(apiRuntimeException.getMsg());
+    public ServerResponse ApiRuntimeExceptionHandler() {
+        return ServerResponse.createByError();
     }
 }

src/main/java/com/zy/bms/common/interceptor/AuthInterceptor.java

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

src/main/java/com/zy/bms/redis/DeviceManager.java → src/main/java/com/zy/bms/common/redis/DeviceManager.java

@@ -1,4 +1,4 @@
-package com.zy.bms.redis;
+package com.zy.bms.common.redis;
 
 import com.alibaba.fastjson.JSON;
 import com.zy.bms.common.Constant;

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

@@ -1,4 +1,4 @@
-package com.zy.bms.redis;
+package com.zy.bms.common.redis;
 
 import com.alibaba.fastjson.JSON;
 import com.zy.bms.common.Constant;

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

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.zy.bms.common.Constant;
 import com.zy.bms.common.exception.ApiRuntimeException;
 import com.zy.bms.model.*;
-import com.zy.bms.redis.DeviceManager;
+import com.zy.bms.common.redis.DeviceManager;
 import com.zy.bms.service.*;
 import com.zy.bms.utils.*;
 import com.zy.bms.utils.CoordTransformUtil;

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

@@ -2,7 +2,7 @@ package com.zy.bms.controller.pc;
 
 import com.zy.bms.common.ServerResponse;
 import com.zy.bms.model.Admin;
-import com.zy.bms.redis.SessionManager;
+import com.zy.bms.common.redis.SessionManager;
 import com.zy.bms.service.AdminService;
 import com.zy.bms.utils.MD5Util;
 import org.springframework.web.bind.annotation.GetMapping;

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

@@ -2,14 +2,11 @@ package com.zy.bms.controller.pc;
 
 import com.zy.bms.common.ServerResponse;
 import com.zy.bms.common.io.wechat.*;
-import com.zy.bms.config.mqtt.MqttGateway;
 import com.zy.bms.service.SetBaseService;
 import com.zy.bms.service.SetService;
-import com.zy.bms.service.SetToDeviceService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.Map;
 
 /**
  * 设备设置相关
@@ -26,20 +23,6 @@ public class PcSetController {
     @Resource
     private SetService setService;
 
-    @Resource
-    private MqttGateway mqttGateway;
-
-    /**
-     * 发送消息
-     */
-    @PostMapping("sendMessage.do")
-    public ServerResponse sendMessage(@RequestBody Map<String, String> param) {
-        String topic = param.get("topic");
-        String message = param.get("message");
-        mqttGateway.sendMsgToMqtt(message, topic);
-        return ServerResponse.createBySuccess();
-    }
-
     /**
      * 其他设置
      *

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

@@ -5,7 +5,7 @@ import com.zy.bms.common.io.wechat.DeviceHistoryIO;
 import com.zy.bms.common.vo.LocationHistoryVo;
 import com.zy.bms.mapper.DeviceLocationMapper;
 import com.zy.bms.model.DeviceLocation;
-import com.zy.bms.redis.DeviceManager;
+import com.zy.bms.common.redis.DeviceManager;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

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

@@ -8,7 +8,7 @@ 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 com.zy.bms.common.redis.DeviceManager;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;