|
|
@@ -228,19 +228,19 @@ public class OperationMessageService {
|
|
|
jsonObject.put("event", event);
|
|
|
}
|
|
|
// 是否是测试
|
|
|
- boolean isTest = false;
|
|
|
+ boolean isTest = true;
|
|
|
// ping不执行
|
|
|
if (isTest && event.equals("ping")) {
|
|
|
return;
|
|
|
}
|
|
|
- if(isTest) {
|
|
|
+ if (isTest) {
|
|
|
id = CommonUtil.UUID();
|
|
|
}
|
|
|
log.info("Topic: {} {}", event, topicName);
|
|
|
|
|
|
String gateWayId = jsonObject.getStr("gatewayId");
|
|
|
String deviceId = jsonObject.getStr("deviceId");
|
|
|
- boolean isTimeOut = false;
|
|
|
+ boolean isTimeOut = true;
|
|
|
if (time == null) {
|
|
|
time = System.currentTimeMillis();
|
|
|
}
|
|
|
@@ -459,7 +459,9 @@ public class OperationMessageService {
|
|
|
OperationMessageResult messageResult = new OperationMessageResult();
|
|
|
messageResult.setOperationMessage(entity);
|
|
|
messageResult.setIotMain(iotMain);
|
|
|
+ // 设备ID
|
|
|
messageResult.setDeviceId(iotMain.getDeviceId());
|
|
|
+ // 分组code
|
|
|
messageResult.setProjectCode(iotMain.getProjectCode());
|
|
|
messageResult.setGateWayId(entity.getGateWayId());
|
|
|
messageResult.setRealIotTopic(iotMain.getRealIotTopic());
|