监控分析

2024年8月9日16:11:29

modules/thing/src/main/java/com/thing/device/analysisdata/service/impl/AnalysisDataServiceImpl.java

@@ -100,8 +100,8 @@ public class AnalysisDataServiceImpl implements AnalysisDataService {
         Map<String, Object> resMap = new HashMap<>();
         //获取数据源信息
         List<IotThingSourceDTO> iotThingSourceList = iotThingSourceService.findAllByFromIdAndThingIdAndConfigType(
-                        monitoringDataReqDTO.getThingRelationList().stream().map(IotThingSourceDTO::getThingId).toList(),
                         null,
+                        monitoringDataReqDTO.getThingRelationList().stream().map(IotThingSourceDTO::getThingId).toList(),
                         monitoringDataReqDTO.getConfigType(),
                         monitoringDataReqDTO.getThingRelationList().stream().map(IotThingSourceDTO::getRootId).toList()
         );
@@ -248,6 +248,7 @@ public class AnalysisDataServiceImpl implements AnalysisDataService {
                                     IotThingSourceDTO iotThingSourceDTO = first.get();
                                     relationDTO.setThingAttrUnit(iotThingSourceDTO.getThingAttrUnit());
                                     relationDTO.setDataDealConfig(iotThingSourceDTO.getDataDealConfig());
+                                    relationDTO.setDataTreatingMark(iotThingSourceDTO.getDataTreatingMark());
                                 }});
                     viewSourceDTO.setDictList(relationDTOList);
                     return viewSourceDTO;