Skip to content

A
amos-boot-zx-biz
Commit e016f793 authored by chenzhao's avatar chenzhao
Browse files
Options

修改分析适配

parent 91ac6035
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java
View file @ e016f793
...@@ -1893,8 +1893,8 @@ public class CommonServiceImpl { ...@@ -1893,8 +1893,8 @@ public class CommonServiceImpl {
Map<String, Float> indicatorDataListAllMap = indicatorDataListAll.stream() Map<String, Float> indicatorDataListAllMap = indicatorDataListAll.stream()
.collect(Collectors.toMap( .collect(Collectors.toMap(
indicatorData -> indicatorData.getAddress() + "_" + indicatorData.getGatewayId(), indicatorData -> indicatorData.getAddress() + "_" + indicatorData.getGatewayId(),
IndicatorData::getValueF)); IndicatorData::getValueF,
// 将测点id与值处理成map (value1, value2) -> value1)); // 将测点id与值处理成map
HashMap<String, Double> idxBizFanPointProcessVariableClassificationDtoIdValueMap = new HashMap<>(); HashMap<String, Double> idxBizFanPointProcessVariableClassificationDtoIdValueMap = new HashMap<>();
log.info("indicatorDataListAllMap" + JSONObject.toJSONString(indicatorDataListAllMap)); log.info("indicatorDataListAllMap" + JSONObject.toJSONString(indicatorDataListAllMap));
log.info("data" + JSONObject.toJSONString(data)); log.info("data" + JSONObject.toJSONString(data));
...@@ -2190,7 +2190,8 @@ public class CommonServiceImpl { ...@@ -2190,7 +2190,8 @@ public class CommonServiceImpl {
Map<String, Float> indicatorDataListAllMap = indicatorDataListAll.stream() Map<String, Float> indicatorDataListAllMap = indicatorDataListAll.stream()
.collect(Collectors.toMap( .collect(Collectors.toMap(
indicatorData -> indicatorData.getAddress() + "_" + indicatorData.getGatewayId(), indicatorData -> indicatorData.getAddress() + "_" + indicatorData.getGatewayId(),
IndicatorData::getValueF)); IndicatorData::getValueF,
(value1, value2) -> value1));
// 将测点id与值处理成map // 将测点id与值处理成map
HashMap<String, Double> idxBizFanPointProcessVariableClassificationDtoIdValueMap = new HashMap<>(); HashMap<String, Double> idxBizFanPointProcessVariableClassificationDtoIdValueMap = new HashMap<>();
log.info("indicatorDataListAllMap" + JSONObject.toJSONString(indicatorDataListAllMap)); 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