增加路牌处理

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

@@ -41,6 +41,8 @@ public class Constant {
         public static final String UBI_GET_SET_INFO = "29";
         //普适型 - 设备设置信息 device -> serve
         public static final String UBI_SET_INFO = "30";
+        //同步更新路牌设备信息
+        public static final String LP_UPDATE_DEVICE_INFO = "71";
     }
 
     /**
@@ -67,6 +69,10 @@ public class Constant {
         public static final String DEVICE_SERVER = "$dtx2/IMEI";
         // server -> device 通讯主题
         public static final String DEVICE_CLIENT = "$drx2/IMEI";
+        // device -> server 通讯主题
+        public static final String DEVICE_SERVER_LP = "$dtxlp/";
+        // server -> device 通讯主题
+        public static final String DEVICE_CLIENT_LP = "$drxlp/IMEI";
     }
 
     /**

src/main/java/com/zy/bms/config/InterceptorCfg.java

@@ -3,7 +3,6 @@ package com.zy.bms.config;
 import com.zy.bms.config.interceptor.OperateAuthInterceptor;
 import com.zy.bms.config.interceptor.UbiAppAuthInterceptor;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
@@ -17,7 +16,7 @@ import java.util.List;
  * @author chenyi
  * Create on 2019/10/10
  */
-@Profile("prod")
+//@Profile("prod")
 @Configuration
 public class InterceptorCfg implements WebMvcConfigurer {
     /**
@@ -31,7 +30,8 @@ public class InterceptorCfg implements WebMvcConfigurer {
     private static List<String> whiteList = new ArrayList<>();
 
     static {
-        whiteList.add("/bms/api/pc/admin/login.do");
+        whiteList.add("/bms/api/operate/admin/login.do");
+        whiteList.add("/bms/api/common/author.do");
     }
 
     /**

src/main/java/com/zy/bms/config/interceptor/ChannelAuthInterceptor.java

@@ -1,37 +0,0 @@
-//package com.zy.bms.config.interceptor;
-//
-//import org.springframework.stereotype.Component;
-//import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-//
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import java.util.HashSet;
-//
-///**
-// * 请求通道校验
-// * 1. PC运营后台端
-// * 2. 普适型扫码查询状态微信小程序端
-// *
-// * @author chenyi
-// * Create on 2019/10/10
-// */
-//public class ChannelAuthInterceptor extends HandlerInterceptorAdapter {
-//    //合法通道取值
-//    private final static HashSet<String> legalHeader = new HashSet<>();
-//
-//    static {
-//        legalHeader.add("bms");
-//        legalHeader.add("ubi-app");
-//    }
-//
-//    @Override
-//    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
-//        if (request.getMethod().equals("OPTIONS")) {
-//            response.setStatus(HttpServletResponse.SC_OK);
-//            return true;
-//        }
-//        if (legalHeader.contains(request.getHeader("channel"))) return true;
-//        response.setStatus(HttpServletResponse.SC_FORBIDDEN);
-//        return false;
-//    }
-//}

src/main/java/com/zy/bms/config/interceptor/OperateAuthInterceptor.java

@@ -1,7 +1,6 @@
 package com.zy.bms.config.interceptor;
 
 import com.zy.bms.manager.SessionManager;
-import com.zy.bms.utils.CustomResponseUtil;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
@@ -23,10 +22,10 @@ public class OperateAuthInterceptor extends HandlerInterceptorAdapter {
     private SessionManager sessionManager;
 
     @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         String channel = request.getHeader("channel");
-        if (channel.equals("bms") && sessionManager.valid(request.getHeader("token"))) return true;
-        CustomResponseUtil.author(response);
+        if ("bms".equals(channel) && sessionManager.valid(request.getHeader("token"))) return true;
+        request.getRequestDispatcher("/bms/api/common/author.do").forward(request, response);
         return false;
     }
 }

src/main/java/com/zy/bms/config/interceptor/UbiAppAuthInterceptor.java

@@ -1,6 +1,5 @@
 package com.zy.bms.config.interceptor;
 
-import com.zy.bms.utils.CustomResponseUtil;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
@@ -18,10 +17,10 @@ import javax.servlet.http.HttpServletResponse;
 public class UbiAppAuthInterceptor extends HandlerInterceptorAdapter {
 
     @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         String channel = request.getHeader("channel");
         if (channel.equals("ubi-app") && request.getHeader("app_user") != null) return true;
-        CustomResponseUtil.author(response);
+        request.getRequestDispatcher("/bms/api/common/author.do").forward(request, response);
         return false;
     }
 }

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

@@ -23,11 +23,10 @@ import java.util.Map;
  * @since 2021-06-03
  */
 @RestController
-@RequestMapping("/bms/admin")
+@RequestMapping("/bms/api/operate/admin")
 public class AdminController extends BaseController {
     @Resource
     private IAdminService adminService;
-
     @Resource
     private SessionManager sessionManager;
 

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

@@ -0,0 +1,22 @@
+package com.zy.bms.controller;
+
+import com.zy.bms.common.ServerResponse;
+import com.zy.bms.common.enums.ResponseCode;
+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("/bms/api/common")
+public class CommonController {
+
+    @RequestMapping("author.do")
+    public ServerResponse author() {
+        return ServerResponse.custom(ResponseCode.AUTHOR);
+    }
+}

src/main/java/com/zy/bms/controller/PrivilegeApplyController.java

@@ -1,6 +1,5 @@
 package com.zy.bms.controller;
 
-
 import com.zy.bms.common.ServerResponse;
 import com.zy.bms.entity.PrivilegeApplyRecord;
 import com.zy.bms.pojo.io.PrivilegeApplyIO;

src/main/java/com/zy/bms/service/impl/PostMqttMsgServiceImpl.java

@@ -15,6 +15,8 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 向设备发送协议消息 服务类
@@ -61,7 +63,9 @@ public class PostMqttMsgServiceImpl implements IPostMqttMsgService {
 
     @Override
     public void updateDeviceInfoLp(String openNum, BigDecimal wakeInt, Integer thresh) {
-
+        MqttDTO mqttDTO = new MqttDTO(Constant.M.LP_UPDATE_DEVICE_INFO);
+        mqttDTO.put("setf", "true").put("wakeint", wakeInt).put("thresh", thresh);
+        sendMqttMessage(Constant.TOPIC.DEVICE_CLIENT_LP + openNum, mqttDTO.json());
     }
 
     /**

src/main/java/com/zy/bms/utils/CustomResponseUtil.java

@@ -1,33 +0,0 @@
-package com.zy.bms.utils;
-
-import com.alibaba.fastjson.JSON;
-import com.zy.bms.common.ServerResponse;
-import com.zy.bms.common.enums.ResponseCode;
-import com.zy.bms.common.exception.ApiRuntimeException;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * 自定义返回请求
- *
- * @author yang xiao kun
- * create on 2021/7/15
- */
-public class CustomResponseUtil {
-    //权限不足结果
-    private final static String author = JSON.toJSONString(ServerResponse.custom(ResponseCode.AUTHOR));
-
-    /**
-     * 权限验证失败
-     */
-    public static void author(HttpServletResponse response) {
-        response.setCharacterEncoding("UTF-8");
-        response.setContentType("application/json;charset=utf-8");
-        try {
-            response.getWriter().write(author);
-        } catch (IOException e) {
-            throw new ApiRuntimeException("自定义response返回结果写入异常");
-        }
-    }
-}