修复BUG

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

@@ -42,7 +42,7 @@ public class MqttConsumerCfg {
     public MessageProducer inbound() {
         // 初始化入站通道适配器，使用的是Eclipse Paho MQTT客户端库
         MqttPahoMessageDrivenChannelAdapter adapter =
-                new MqttPahoMessageDrivenChannelAdapter(RandomCode.UUID_8(), mqttClientFactory, defaultTopic);
+                new MqttPahoMessageDrivenChannelAdapter(RandomCode.UUID_8() + "consumer", mqttClientFactory, defaultTopic);
         // 设置连接超时时长 毫秒
         adapter.setCompletionTimeout(5000);
         // 配置默认Paho消息转换器(qos=0, retain=false, charset=UTF-8)

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

@@ -37,7 +37,7 @@ public class MqttProducerCfg {
     @Bean
     @ServiceActivator(inputChannel = "mqttOutboundChannel")
     public MessageHandler mqttOutbound() {
-        MqttPahoMessageHandler messageHandler = new MqttPahoMessageHandler(RandomCode.UUID_8(), mqttClientFactory);
+        MqttPahoMessageHandler messageHandler = new MqttPahoMessageHandler(RandomCode.UUID_8() + "_product", mqttClientFactory);
         // 设置异步发送，默认是false(发送时阻塞)
         messageHandler.setAsync(true);
         // 设置默认的服务质量

src/main/java/com/zy/bms/entity/ubi/UbiInfoState.java

@@ -91,4 +91,8 @@ public class UbiInfoState implements Serializable {
      */
     private LocalDateTime updateTime;
 
+    public Integer getStatus() {
+        if (updateTime == null || freq == null) return 0;
+        return LocalDateTime.now().isAfter(updateTime.plusSeconds(freq + 500)) ? 0 : 1;
+    }
 }

src/main/java/com/zy/bms/pojo/io/DeviceIO.java

@@ -1,7 +1,6 @@
 package com.zy.bms.pojo.io;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 /**
  * 设备查询入参
@@ -18,12 +17,7 @@ public class DeviceIO extends PageIO {
     private String openNum;
 
     /**
-     * 设备状态
-     */
-    private Integer status;
-
-    /**
-     * 项目组
+     * 设备组
      */
     private String groupId;
 

src/main/java/com/zy/bms/pojo/vo/LpDeviceListVo.java

@@ -15,8 +15,6 @@ import java.time.LocalDateTime;
 @Data
 public class LpDeviceListVo {
 
-    private Integer id;
-
     /**
      * 设备唯一码
      */
@@ -118,11 +116,6 @@ public class LpDeviceListVo {
      */
     private Integer mode;
 
-    /**
-     * 状态 0:离线 1:在线
-     */
-    private Integer status;
-
     /**
      * 上传类型
      */
@@ -133,6 +126,9 @@ public class LpDeviceListVo {
      */
     private LocalDateTime updateTime;
 
+    /**
+     * 状态
+     */
     public Integer getStatus() {
         if (updateTime == null || wakeInt == null) return 0;
         return LocalDateTime.now().isAfter(updateTime.plusMinutes(wakeInt.multiply(BigDecimal.valueOf(60)).intValue() + 3)) ? 0 : 1;

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

@@ -38,7 +38,7 @@ public class UserPrivilegeServiceImpl extends ServiceImpl<UserPrivilegeMapper, U
     @Override
     public Map<String, List<GroupListVo>> getGroupByUserId(Integer userId) {
         List<GroupListVo> allGroup = groupService.getAllList();
-        HashSet<String> ownGroup = new HashSet<>(baseMapper.getGroupIdsByUserId(userId));
+        HashSet<String> ownGroup = new HashSet<>(getGroupIdsByUserId(userId));
         return allGroup.stream().filter(item -> !ownGroup.contains(item.getCode()))
                 .collect(Collectors.groupingBy(GroupListVo::getItem));
     }

src/main/resources/mapper/DeviceBaseMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.zy.bms.mapper.DeviceBaseMapper">
 
     <select id="getTypeByGroupId" resultType="java.lang.String">
-        SELECT type FROM device_base WHERE group_id = #{group_id} LIMIT 1
+        SELECT type FROM device_base WHERE group_id = #{groupId} LIMIT 1
     </select>
 
 </mapper>

src/main/resources/mapper/LpInfoStateMapper.xml

@@ -20,9 +20,6 @@
         <if test="io.groupId != null and io.groupId > -1">
             AND t1.group_id = #{io.groupId}
         </if>
-        <if test="io.status != null and io.status > -1">
-            AND t2.status = #{io.status}
-        </if>
     </select>
 
     <select id="listByUserId" resultType="com.zy.bms.pojo.vo.DeviceWxListVo">

src/main/resources/mapper/UbiInfoStateMapper.xml

@@ -4,7 +4,6 @@
 
     <select id="listPage" resultType="com.zy.bms.pojo.vo.UbiDeviceListVo">
         SELECT
-        t1.open_num,
         t1.username,
         t1.password,
         t1.sn,
@@ -22,15 +21,10 @@
         <if test="io.groupId != null and io.groupId > -1">
             AND t1.group_id = #{io.groupId}
         </if>
-        <if test="io.status != null and io.status > -1">
-            AND t2.status = #{io.status}
-        </if>
     </select>
 
     <select id="getDetail" resultType="com.zy.bms.pojo.vo.UbiDeviceDetailVo">
-        SELECT *
-        FROM ubi_info_state
-        WHERE open_num = #{openNum}
+        SELECT * FROM ubi_info_state WHERE open_num = #{openNum}
     </select>
 
     <select id="listByGroupId" resultType="com.zy.bms.entity.ubi.UbiInfoState">
@@ -41,17 +35,17 @@
 
     <select id="listByUserId" resultType="com.zy.bms.pojo.vo.DeviceWxListVo">
         SELECT
-            t1.open_num,
-            t1.group_id,
-            t1.type,
-            t2.update_time,
-            IF(TIMESTAMPDIFF(SECOND, t2.update_time, NOW()) > IFNULL(t2.freq, 0) + 180,0,1) AS `status`
+        t1.open_num,
+        t1.group_id,
+        t1.type,
+        t2.update_time,
+        IF(TIMESTAMPDIFF(SECOND, t2.update_time, NOW()) > IFNULL(t2.freq, 0) + 180,0,1) AS `status`
         FROM
-            device_base t1
+        device_base t1
         LEFT JOIN ubi_info_state t2 ON t1.open_num = t2.open_num
         WHERE
-            t1.type = 'gnss'
-            AND t1.group_id IN (SELECT group_id FROM user_privilege WHERE user_id = #{userId})
+        t1.type = 'gnss'
+        AND t1.group_id IN (SELECT group_id FROM user_privilege WHERE user_id = #{userId})
     </select>
 
 </mapper>