修复BUG,稳定版本

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

@@ -13,7 +13,7 @@ import lombok.Data;
 public class MqttLogsIO extends PageIO {
 
     /**
-     * 0:发送 1:接收
+     * 0:接收 1:发送
      */
     private Integer tag;
 

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

@@ -1,5 +1,8 @@
 package com.zy.bms.config;
 
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.context.annotation.Bean;
@@ -16,6 +19,18 @@ import java.time.format.DateTimeFormatter;
  */
 @Configuration
 public class BeanConfig {
+    /**
+     * mybatis-plus分页插件
+     */
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        //向Mybatis过滤器链中添加分页拦截器
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        //还可以添加i他的拦截器
+        return interceptor;
+    }
+
     /**
      * LocalDateTime 全局格式化配置
      */

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

@@ -54,8 +54,6 @@ public class MqttCallbackHandler {
         mqttLogService.saveLog(topic, payload, 0);
         //消息返回JSON转Object
         MqttMsgDto msgObject = MqttMsgDto.parse(payload);
-        //转发消息至网页
-        webSocketServer.massMessage(msgObject.getDeviceId(), payload);
         //根据报文标识代码 M 处理消息
         switch (msgObject.getM()) {
             case Constant.M_CODE_REGISTER://设备端注册报文
@@ -68,6 +66,11 @@ public class MqttCallbackHandler {
                 uploadCallRecordsHandler(msgObject);
                 break;
         }
+        //注册的报文忽略
+        if (!topic.equals(Constant.TOPIC_REGISTER_SERVER)) {
+            //转发消息至网页
+            webSocketServer.massMessage(msgObject.getDeviceId(), payload);
+        }
     }
 
     /**

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

@@ -5,6 +5,7 @@ import com.zy.bms.common.ServerResponse;
 import com.zy.bms.common.io.pc.MqttLogsIO;
 import com.zy.bms.service.MqttLogService;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -44,7 +45,7 @@ public class PcMqttLogController {
     /**
      * 分页查询日志
      */
-    @GetMapping("listPage.do")
+    @PostMapping("listPage.do")
     public ServerResponse getListPage(MqttLogsIO io) {
         return ServerResponse.createBySuccess(mqttLogService.getListPage(io));
     }

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

@@ -24,7 +24,7 @@ public class MqttLogService extends ServiceImpl<MqttLogMapper, MqttLog> {
      *
      * @param topic   主题
      * @param payload 消息内容
-     * @param tag     0收 1发￿
+     * @param tag     0收 1发
      */
     public void saveLog(String topic, String payload, Integer tag) {
         MqttLog mqttLog = new MqttLog();

src/main/resources/application-prod.yml

@@ -8,15 +8,15 @@ spring:
     password: CHENyi_406
   jackson:
     default-property-inclusion: non_null
-    #date-format: yyyy-MM-dd HH:mm:ss
-    #time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
   # MySQL
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://localhost:3306/zy_mobile?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=true
-    username: useryxk
-    password: CHENyi406@
+    username: root
+    password: kun95736489+
     dbcp2:
       min-idle: 10
       initial-size: 15

src/main/resources/application.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: dev
+    active: prod

src/main/resources/mapper/MqttLogMapping.xml

@@ -20,5 +20,6 @@
                 AND instruction = #{io.instruction}
             </if>
         </where>
+        ORDER BY createTime DESC
     </select>
 </mapper>