大屏数据

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/controller/EnvDeviceEquipmentController.java

@@ -68,11 +68,11 @@ public class EnvDeviceEquipmentController {
             int i = Integer.parseInt(s, 2);
             JSONObject jsonObject  =new JSONObject();
             jsonObject.put("dev_ctrl",i);
-            log.info("消息配置完成开始发送："+i);
+            log.info("消息配置完成开始发送："+jsonObject.toJSONString());
             publishMQTT.start("tcp://115.238.57.190:1883",chipId,"admin","admin","huimv_down_"+chipId,jsonObject.toJSONString());
             return new Result(10000,"修改成功",true);
         }catch (Exception e){
-            System.out.println(e);
+            System.out.println("22222222222"+e);
             return new Result(10001,"修改失败",false);
         }
 

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/mqtt/publish/PublishMQTT.java

@@ -17,7 +17,7 @@ import java.util.Map;
 @Component
 public class PublishMQTT {
 
-//    public static final String HOST = "tcp://192.168.1.68:1883";
+//    public static final String HOST = "tcp://115.238.57.190:1883";
 //    private static final String clientid = "publish";
 //    private MqttClient client;
 //    private MqttConnectOptions options;
@@ -51,13 +51,14 @@ public class PublishMQTT {
 
 //            pubMessage(client,"list",topic);
             MqttMessage mess = new MqttMessage();
-            mess.setQos(1);
+            mess.setQos(2);
             mess.setRetained(true);
             mess.setPayload(message.getBytes());
             try {
                 client.publish(topic, mess);
             } catch (Exception e) {
-                //LOGGER.error(e.getLocalizedMessage());
+//                LOGGER.error(e.getLocalizedMessage());
+                System.out.println("1111111111"+e);
             }
 
         } catch (Exception e) {

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/mqtt/subscribe/ConsumerMQTT.java

@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration;
 
 @Configuration
 public class ConsumerMQTT {
-    public static final String HOST = "tcp://192.168.1.68:1883";
+    public static final String HOST = "tcp://115.238.57.190:1883";
     private static final String clientid = "test001";
     private MqttClient client;
     private MqttConnectOptions options;
@@ -47,8 +47,8 @@ public class ConsumerMQTT {
         }
     }
 
-    public static void main(String[] args) {
-        ConsumerMQTT consumerMQTT = new ConsumerMQTT();
-        consumerMQTT.start();
-    }
+//    public static void main(String[] args) {
+//        ConsumerMQTT consumerMQTT = new ConsumerMQTT();
+//        consumerMQTT.start();
+//    }
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/mqtt/subscribe/PushCallback.java

@@ -35,7 +35,6 @@ public class PushCallback implements MqttCallback {
 
     @Override
     public void connectionLost(Throwable cause) {
-
         // 连接丢失后，一般在这里面进行重连
         System.out.println("连接断开，可以做重连");
     }
@@ -57,7 +56,7 @@ public class PushCallback implements MqttCallback {
         String chip = split[2];
         System.out.println(chip);
         String messages = new String(message.getPayload());
-        if (messages.equals("sync_time")) {
+        if ("sync_time".equals(messages)) {
             log.info("-----开始配置同步时间----");
             JSONObject jsonObject1 = new JSONObject();
             ZonedDateTime ZonedDateTime = java.time.ZonedDateTime.now();
@@ -72,11 +71,11 @@ public class PushCallback implements MqttCallback {
             System.out.println(jsonObject1);
             try {
                 PublishMQTT publishMQTT = new PublishMQTT();
-                publishMQTT.start("tcp://192.168.1.68:1883", chip, "admin", "admin", "huimv_down_" + chip, jsonObject1.toJSONString());
+                publishMQTT.start("tcp://115.238.57.190:1883", chip, "admin", "admin", "huimv_down_" + chip, jsonObject1.toJSONString());
             } catch (Exception e) {
                 System.out.println(e);
             }
-        } else if (messages.equals("alarm_cfg")) {
+        } else if ("alarm_cfg".equals(messages)) {
             log.info("-----开始配置报警信息----");
             IEnvDeviceRegisterService registerService = SpringUtil.getBean(IEnvDeviceRegisterService.class);
             QueryWrapper<EnvDeviceRegister> queryWrapper = new QueryWrapper<>();
@@ -109,9 +108,9 @@ public class PushCallback implements MqttCallback {
             jsonObject1.put("alarm_cfg", map);
             System.out.println(jsonObject1);
             PublishMQTT publishMQTT = new PublishMQTT();
-            publishMQTT.start("tcp://192.168.1.68:1883", chip, "admin", "admin", "huimv_down_" + chip, jsonObject1.toJSONString());
+            publishMQTT.start("tcp://115.238.57.190:1883", chip, "admin", "admin", "huimv_down_" + chip, jsonObject1.toJSONString());
             log.info("----报警配置下发完成---");
-        } else if (messages.equals("get_dev_ctrl")) {
+        } else if ("get_dev_ctrl".equals(messages)) {
             JSONObject jsonObject = new JSONObject();
             log.info("-----开始配置设备控制消息----");
             QueryWrapper<EnvDeviceRegister> queryWrapper1 = new QueryWrapper<>();
@@ -132,11 +131,11 @@ public class PushCallback implements MqttCallback {
             jsonObject.put("dev_ctrl", i);
             log.info("设备配置完成开始发送：" + i);
             PublishMQTT publishMQTT = new PublishMQTT();
-            publishMQTT.start("tcp://192.168.1.68:1883", chip, "admin", "admin", "huimv_down_" + chip, jsonObject.toJSONString());
+            publishMQTT.start("tcp://115.238.57.190:1883", chip, "admin", "admin", "huimv_down_" + chip, jsonObject.toJSONString());
             log.info("---设备控制发送完成---");
         }  else if (messages.equals("dev_ctrl_suc")) {
             PublishMQTT publishMQTT = new PublishMQTT();
-            publishMQTT.start("tcp://192.168.1.68:1883", chip, "admin", "admin", "huimv_down_" + chip,"已应答");
+            publishMQTT.start("tcp://115.238.57.190:1883", chip, "admin", "admin", "huimv_down_" + chip,"已应答");
         } else {
             JSONObject jsonObject = JSON.parseObject(messages);
             System.out.println("这里是1111：" + jsonObject);

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/mqtt/uplod/uploadmqtt.java

@@ -13,13 +13,12 @@ import org.springframework.transaction.annotation.Transactional;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class uploadmqtt  extends Thread {
-    public static final String HOST = "tcp://192.168.1.68:1883";
+public class UploadMqtt extends Thread {
+    public static final String HOST = "tcp://115.238.57.190:1883";
     private  String clientid ;
     private MqttClient client;
     private MqttConnectOptions options;
 
-
     private String userName = "admin";    //非必须
     private String passWord = "admin";  //非必须
     private String topic ;

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/mqtt/uplod/UploadMqttStart.java

@@ -1,13 +1,11 @@
 package com.huimv.env.manage.saas.mqtt.uplod;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.env.manage.entity.EnvDeviceRegister;
 import com.huimv.env.manage.service.IEnvDeviceRegisterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
-import javax.management.Query;
 import java.util.List;
 
 @Component
@@ -21,20 +19,11 @@ public class UploadMqttStart {
         List<EnvDeviceRegister> list = deviceRegisterService.list();
         for (EnvDeviceRegister deviceRegister : list) {
             String chipId = deviceRegister.getChipId();
-            uploadmqtt uploadmqtt = new uploadmqtt();
+            UploadMqtt uploadmqtt = new UploadMqtt();
             uploadmqtt.setClientid("pub_" + chipId);
             uploadmqtt.setTopic("huimv_up_" + chipId);
             uploadmqtt.start();
         }
-//        QueryWrapper<EnvDeviceRegister> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.eq("device_code", 122);
-//        EnvDeviceRegister one = deviceRegisterService.getOne(queryWrapper);
-//        String chipId = one.getChipId();
-//        System.out.println("这里拿到了设备编码");
-//            uploadmqtt uploadmqtt = new uploadmqtt();
-//            uploadmqtt.setClientid("pub_"+chipId);
-//            uploadmqtt.setTopic("huimv_up_"+chipId);
-//            uploadmqtt.start();
     }
 
 }