Commit e016f793 authored by chenzhao's avatar chenzhao

修改分析适配

parent 91ac6035
......@@ -1893,8 +1893,8 @@ public class CommonServiceImpl {
Map<String, Float> indicatorDataListAllMap = indicatorDataListAll.stream()
.collect(Collectors.toMap(
indicatorData -> indicatorData.getAddress() + "_" + indicatorData.getGatewayId(),
IndicatorData::getValueF));
// 将测点id与值处理成map
IndicatorData::getValueF,
(value1, value2) -> value1)); // 将测点id与值处理成map
HashMap<String, Double> idxBizFanPointProcessVariableClassificationDtoIdValueMap = new HashMap<>();
log.info("indicatorDataListAllMap" + JSONObject.toJSONString(indicatorDataListAllMap));
log.info("data" + JSONObject.toJSONString(data));
......@@ -2190,7 +2190,8 @@ public class CommonServiceImpl {
Map<String, Float> indicatorDataListAllMap = indicatorDataListAll.stream()
.collect(Collectors.toMap(
indicatorData -> indicatorData.getAddress() + "_" + indicatorData.getGatewayId(),
IndicatorData::getValueF));
IndicatorData::getValueF,
(value1, value2) -> value1));
// 将测点id与值处理成map
HashMap<String, Double> idxBizFanPointProcessVariableClassificationDtoIdValueMap = new HashMap<>();
log.info("indicatorDataListAllMap" + JSONObject.toJSONString(indicatorDataListAllMap));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment