2 Commits 980696076b ... f4947f9cd9

Autore SHA1 Messaggio Data
  秦国才 f4947f9cd9 Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0 1 anno fa
  秦国才 f91b8d7a74 任务提交 taskStop中mqtt消息加入taskid 1 anno fa

+ 1 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DirectiveServiceImpl.java

@@ -123,6 +123,7 @@ public class DirectiveServiceImpl implements DirectiveService {
             HashMap<String, Object> requestMap = new HashMap<>();
             HashMap<String, Object> requestMap = new HashMap<>();
             requestMap.put("id", siteInfo.getId());
             requestMap.put("id", siteInfo.getId());
             requestMap.put("action", action);
             requestMap.put("action", action);
+            requestMap.put("taskid", taskResul.getTaskid());
             String topic = "down/" + siteInfo.getDeviceId() + "/taskStop";
             String topic = "down/" + siteInfo.getDeviceId() + "/taskStop";
             String data = JSONUtil.toJsonStr(requestMap);
             String data = JSONUtil.toJsonStr(requestMap);
             log.info("mqtt发送数据:topic:{} data:{}",topic,data);
             log.info("mqtt发送数据:topic:{} data:{}",topic,data);