diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java index 5db6af4..7b96c45 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java @@ -10,6 +10,7 @@ import com.psdc.entity.vo.ModelVo; import com.psdc.enums.ControlKeyEnum; import com.psdc.exception.ControlException; import com.psdc.mapper.*; +import com.psdc.mqtt.MyMQTTClient; import com.psdc.service.IPsdcDeviceService; import com.psdc.utils.SecurityUtils; import com.psdc.utils.poi.ExcelUtil; @@ -56,6 +57,8 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH"); + static Integer MID = 0; + SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); /** @@ -371,8 +374,16 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService { String controlContext = ControlKeyEnum.getControlContext(controlKey); // TODO 发送MQTT指令 - // MyMQTTClient myMQTTClient = new MyMQTTClient(); - // myMQTTClient.publish(jsonObject.toJSONString(), "/hwj1/dntd/request/action/command", 2, false); + MyMQTTClient myMQTTClient = new MyMQTTClient(); + // 封装控制策略Json + JSONObject jsonObject = new JSONObject(); + jsonObject.put("mid",MID); + jsonObject.put("timestamp",sdf2.format(new Date())); + jsonObject.put("deviceId",deviceId); + jsonObject.put("sceneCode",sceneCode); + jsonObject.put("data",data); + MID = MID + 1; + myMQTTClient.publish(jsonObject.toJSONString(), "/hwj1/dntd/request/action/command", 2, false); // psdcControlLogMapper.insert(new PsdcControlLog(deviceId,psdcDevice.getDeviceName(),psdcDevice.getDeviceSn(),controlContext,controlValue,controlMethod,2,"控制成功",controlBy)); // psdcControlLogMapper.insert(new PsdcControlLog(deviceId,psdcDevice.getDeviceName(),psdcDevice.getDeviceSn(),controlContext,controlValue,controlMethod,3,"等待终端响应超时",controlBy)); // 发送成功