增加在数据点计算规则后数据点名称加_n的适配

yangys

2024-10-09 7ef593e1e3c35aaeecf9318f0b3941230d3ed002

 collect/src/main/java/com/qianwen/mdc/collect/service/OutputAggregateService.java

@@ -1,17 +1,12 @@
package com.qianwen.mdc.collect.service;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.isession.pool.SessionDataSetWrapper;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.read.common.RowRecord;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.slf4j.Logger;
@@ -20,12 +15,10 @@
import org.springframework.stereotype.Service;

import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.qianwen.mdc.collect.config.IotDBSessionConfig;
import com.qianwen.mdc.collect.constants.IOTDBConstant;
import com.qianwen.mdc.collect.entity.iotdb.AggregateOutput;
import com.qianwen.mdc.collect.entity.iotdb.Output;
import com.qianwen.mdc.collect.enums.WorkstationParamTypeEnum;
import com.qianwen.mdc.collect.mapper.iotdb.OutputMapper;

@DS("iotdb")
@@ -48,7 +41,7 @@
           String pathPprefix = IOTDBConstant.DB_PREFIX+IOTDBConstant.TEMPLATE_OUTPUT+"_"+workstationId;
            //this.workstationAggregateOutputMapper.createTable(workStationId);
            //this.workstationOutputMapper.createTable(workStationId);
           iotDBCommonService.setTemmplateIsNotSet(IOTDBConstant.TEMPLATE_AGGREGATEOUTPUT, pathPprefix);
           iotDBCommonService.setTemmplateIfNotSet(IOTDBConstant.TEMPLATE_AGGREGATEOUTPUT, pathPprefix);
           /*
            List<WorkstationOutput> notSyncWorkstationOutputs = this.workstationOutputMapper.selectList(Wrappers.<WorkstationOutput>lambdaQuery()
                    .eq(WorkstationOutput::getWorkstationId, workStationId)
@@ -93,10 +86,10 @@
     */
    void crateOutputTables(long workstationId){
       String aggregatePathPrefix = IOTDBConstant.DB_PREFIX+IOTDBConstant.TEMPLATE_AGGREGATEOUTPUT+"_"+workstationId;
       iotDBCommonService.setTemmplateIsNotSet(IOTDBConstant.TEMPLATE_AGGREGATEOUTPUT, aggregatePathPrefix);
       iotDBCommonService.setTemmplateIfNotSet(IOTDBConstant.TEMPLATE_AGGREGATEOUTPUT, aggregatePathPrefix);
       
       String outputPathPrefix = IOTDBConstant.DB_PREFIX+IOTDBConstant.TEMPLATE_OUTPUT+"_"+workstationId;
       iotDBCommonService.setTemmplateIsNotSet(IOTDBConstant.TEMPLATE_OUTPUT, outputPathPrefix);
       iotDBCommonService.setTemmplateIfNotSet(IOTDBConstant.TEMPLATE_OUTPUT, outputPathPrefix);
       
    }