|
@@ -1,13 +1,17 @@
|
|
|
package com.huimv.env.manage.saas.controller;
|
|
|
|
|
|
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.huimv.env.manage.entity.EnvDeviceRegister;
|
|
|
+import com.huimv.env.manage.entity.EnvTopic;
|
|
|
import com.huimv.env.manage.saas.dao.entity.EnvDeviceEquipment;
|
|
|
import com.huimv.env.manage.saas.mqtt.publish.PublishMQTT;
|
|
|
+import com.huimv.env.manage.saas.mqtt.subscribe.ConsumerMQTT;
|
|
|
import com.huimv.env.manage.saas.service.IEnvDeviceEquipmentService;
|
|
|
import com.huimv.env.manage.service.IEnvDeviceRegisterService;
|
|
|
+import com.huimv.env.manage.service.IEnvTopicService;
|
|
|
import com.huimv.env.manage.utils.Result;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -36,6 +40,8 @@ public class EnvDeviceEquipmentController {
|
|
|
|
|
|
@Autowired
|
|
|
IEnvDeviceEquipmentService envDeviceEquipmentService;
|
|
|
+ @Autowired
|
|
|
+ IEnvTopicService topicService;
|
|
|
|
|
|
@PostMapping("/listByUnit")
|
|
|
public Result listByUnit(@RequestBody Map<String, String> map, HttpServletRequest request){
|
|
@@ -69,9 +75,21 @@ public class EnvDeviceEquipmentController {
|
|
|
JSONObject jsonObject =new JSONObject();
|
|
|
jsonObject.put("dev_ctrl",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);
|
|
|
+ publishMQTT.start("tcp://115.238.57.190:1883","test"+chipId,"admin","admin","huimv_down_"+chipId,jsonObject.toJSONString());
|
|
|
+ ConsumerMQTT consumerMQTT = new ConsumerMQTT();
|
|
|
+ consumerMQTT.start("tcp://115.238.57.190:1883","controller","admin","admin","huimv_up_"+chipId);
|
|
|
+
|
|
|
+ QueryWrapper<EnvTopic> topicQueryWrapper = new QueryWrapper<>();
|
|
|
+ topicQueryWrapper.orderByDesc("time").last(" limit 1");
|
|
|
+ EnvTopic topic = topicService.getOne(topicQueryWrapper);
|
|
|
+ if (ObjectUtil.isEmpty(topic)) {
|
|
|
+ return new Result(10000, "操作成功", true);
|
|
|
+ }
|
|
|
+ if (topic.getTopic() == 0) {
|
|
|
+ return new Result(10000, "操作成功", true);
|
|
|
+ } else {
|
|
|
+ return new Result(10001, "操作失败,请重新操作", false);
|
|
|
+ }
|
|
|
}catch (Exception e){
|
|
|
System.out.println("22222222222"+e);
|
|
|
return new Result(10001,"修改失败",false);
|