|
@@ -204,14 +204,11 @@ public class SubMessageSendManager {
|
|
|
List<SensorFunctionStatus> functionStatuses = subFunction.getFunctionStatuses();
|
|
List<SensorFunctionStatus> functionStatuses = subFunction.getFunctionStatuses();
|
|
|
List<SensorFunctionStatus> newFunctionStatuses = new ArrayList <>();
|
|
List<SensorFunctionStatus> newFunctionStatuses = new ArrayList <>();
|
|
|
for(SensorFunctionStatus sensor:functionStatuses){
|
|
for(SensorFunctionStatus sensor:functionStatuses){
|
|
|
- sensor.setDescribe(sensor.getFuncName());
|
|
|
|
|
|
|
+ sensor.setDescribe(sensor.getDescribe());
|
|
|
newFunctionStatuses.add(sensor);
|
|
newFunctionStatuses.add(sensor);
|
|
|
}
|
|
}
|
|
|
subFunction.setFunctionStatuses(newFunctionStatuses);
|
|
subFunction.setFunctionStatuses(newFunctionStatuses);
|
|
|
//todo 到这里结束
|
|
//todo 到这里结束
|
|
|
-
|
|
|
|
|
- //String json = JSONObject.toJSONString(subFunction);
|
|
|
|
|
- //logger.error("@@@@@@@@" + json);
|
|
|
|
|
//发送事件
|
|
//发送事件
|
|
|
//本来使用mqtt接收,因为mqtt 每个客户端接受到都会处理,
|
|
//本来使用mqtt接收,因为mqtt 每个客户端接受到都会处理,
|
|
|
List<LabMessageEvent> labMessageEvents = mqttConfig.getLabMessMap().get(MqttConstants.TOPIC_LAB_FUNCTION_DATA);
|
|
List<LabMessageEvent> labMessageEvents = mqttConfig.getLabMessMap().get(MqttConstants.TOPIC_LAB_FUNCTION_DATA);
|