bug 修改

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/IotIndexResVo.java

@@ -32,4 +32,6 @@ public class IotIndexResVo {
 
     private List<IotDataVO> iotData;
 
+    private String equipId;
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java

@@ -990,6 +990,7 @@ public class TopographyController extends AbstractBaseController {
                         vo.setNameKey(index.getPerfQuotaDefinitionId());
                         vo.setUnit(index.getUnitName());
                         vo.setTimes(dateMap.get(index.getPerfQuotaDefinitionId()));
+                        vo.setEquipId(specId);
                         if (waterLevelIndexKey.contains(vo.getNameKey())) {
                             resContainsWaterLevelList.add(vo);
                         } else {
@@ -1008,14 +1009,14 @@ public class TopographyController extends AbstractBaseController {
         }
         List<Date> containsWaterDates = new ArrayList<>();
 
-        Map<Long, Map<Date, IotDataVO>> iotDataAndDateMap= new HashMap<>();
+        Map<String, Map<Date, IotDataVO>> iotDataAndDateMap= new HashMap<>();
         finalResContainsWaterLevel.stream().forEach(item -> {
             containsWaterDates.addAll(item.getTimes());
             Map<Date, IotDataVO> dateDataMap = new HashMap<>();
             for (int i = 0; i < item.getTimes().size(); i++) {
                 dateDataMap.put(item.getTimes().get(i), item.getIotData().get(i));
             }
-            iotDataAndDateMap.put(item.getId(), dateDataMap);
+            iotDataAndDateMap.put(item.getId() + item.getEquipId(), dateDataMap);
         });
 
 
@@ -1030,7 +1031,7 @@ public class TopographyController extends AbstractBaseController {
             iotIndexRes.setId(indexResVo.getId());
             iotIndexRes.setNameKey(indexResVo.getNameKey());
             iotIndexRes.setUnit(indexResVo.getUnit());
-            Map<Date, IotDataVO> dateIotDataVOMap = iotDataAndDateMap.get(indexResVo.getId());
+            Map<Date, IotDataVO> dateIotDataVOMap = iotDataAndDateMap.get(indexResVo.getId() + indexResVo.getEquipId());
             List<IotDataVO> list = new ArrayList<>();
             collect.forEach(item -> {
                 IotDataVO iotDataVO = new IotDataVO();