|
|
@@ -347,11 +347,11 @@ public class OperationMessageService {
|
|
|
// 业务处理的消息内容
|
|
|
JSONObject requestData = (JSONObject) json.get("data");
|
|
|
requestData.set("mqttDataId", entity.getDataId());
|
|
|
- requestData.set("GateWayId", entity.getGateWayId());
|
|
|
- String DeviceId = requestData.getStr("DeviceId");
|
|
|
+ requestData.set("gateWayId", entity.getGateWayId());
|
|
|
+ String DeviceId = requestData.getStr("deviceId");
|
|
|
if (StringUtils.isEmpty(DeviceId)) {
|
|
|
DeviceId = entity.getDeviceId();
|
|
|
- requestData.set("DeviceId", DeviceId);
|
|
|
+ requestData.set("deviceId", DeviceId);
|
|
|
}
|
|
|
entity.setDeviceId(DeviceId);
|
|
|
|