iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/MeasureHandle.java

@@ -5,6 +5,7 @@
import com.iailab.module.data.channel.http.collector.asdb.HttpCollectorForAsdb;
import com.iailab.module.data.channel.http.collector.asdb.HttpCollectorForAsdc;
import com.iailab.module.data.channel.http.collector.asdb.HttpCollectorForAsde;
import com.iailab.module.data.channel.http.collector.asdb.HttpCollectorForAsdy;
import com.iailab.module.data.channel.http.collector.ihdb.HttpCollectorForIhd;
import com.iailab.module.data.channel.opcda.collector.OpcDACollector;
import com.iailab.module.data.common.enums.CommonConstant;
@@ -68,6 +69,9 @@
    @Autowired
    private HttpCollectorForAsdc httpCollectorForAsdc;

    @Autowired
    private HttpCollectorForAsdy httpCollectorForAsdy;

    @Resource
    private DaPointService daPointService;

@@ -89,6 +93,7 @@
        List<Object[]> httpTagAsdb = new ArrayList<>();
        List<Object[]> httpTagAsde = new ArrayList<>();
        List<Object[]> httpTagAsdc = new ArrayList<>();
        List<Object[]> httpTagAsdy = new ArrayList<>();

        dtos.stream().forEach(item -> {
            if (DataSourceType.OPCUA.getCode().equals(item.getSourceType())) {
@@ -115,6 +120,10 @@
                } else if (SourceApiEnum.ASDC.getCode().equals(item.getSourceName())) {
                    if (item.getTagNo() != null && item.getDimension() != null && item.getValueType() != null) {
                        httpTagAsdc.add(new Object[]{item.getSourceId(), item.getTagNo(), item.getDimension(), item.getValueType()});
                    }
                } else if (SourceApiEnum.ASDY.getCode().equals(item.getSourceName())) {
                    if (item.getTagNo() != null && item.getDimension() != null && item.getValueType() != null) {
                        httpTagAsdy.add(new Object[]{item.getSourceId(), item.getTagNo(), item.getDimension(), item.getValueType()});
                    }
                }
            }
@@ -144,6 +153,9 @@
        }
        if (!CollectionUtils.isEmpty(httpTagAsdc)) {
            tagValues.putAll(httpCollectorForAsdc.getTagValues(httpTagAsdc, collectTime));
        }
        if (!CollectionUtils.isEmpty(httpTagAsdy)) {
            tagValues.putAll(httpCollectorForAsdy.getTagValues(httpTagAsdy, collectTime));
        }
        this.toCommonResult(collectTime, dtos, tagValues, dataMap, result,listGood,listBad);
        log.info("测量点处理结束");
@@ -238,6 +250,8 @@
                                value = httpCollectorForAsde.getTagValue(item.getSourceId(), item.getTagNo());
                            } else if (SourceApiEnum.ASDC.getCode().equals(item.getSourceName())) {
                                value = httpCollectorForAsdc.getTagValue(item.getSourceId(), item.getTagNo());
                            } else if (SourceApiEnum.ASDY.getCode().equals(item.getSourceName())) {
                                value = httpCollectorForAsdy.getTagValue(item.getSourceId(), item.getTagNo());
                            }
                        } else {
                            log.info("没有匹配的TagNo=" + item.getTagNo());