From e0af988ce4827018fdb3091aee4f1ad649fd2263 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Wed, 9 Jul 2025 16:05:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/influx/service/CommonService.java | 2 ++ .../service/impl/CommonServiceImpl.java | 21 +++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/njcn/influx/service/CommonService.java b/src/main/java/com/njcn/influx/service/CommonService.java index 4775481..b5948a3 100644 --- a/src/main/java/com/njcn/influx/service/CommonService.java +++ b/src/main/java/com/njcn/influx/service/CommonService.java @@ -87,4 +87,6 @@ public interface CommonService { List getEachModule(CommonQueryParam param); StatisticalDataDTO getDataCounts(String lineId, String tableName, String columnName,String resultName, String phasic, String dataType, String clDid, String process,String startTime, String endTime); + + List getModuleData(CommonQueryParam param); } diff --git a/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java b/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java index 77341a4..b2d4618 100644 --- a/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java +++ b/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java @@ -10,9 +10,7 @@ import com.njcn.influx.service.CommonService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; +import java.util.*; /** * Description: @@ -187,7 +185,22 @@ public class CommonServiceImpl implements CommonService { .eq(InfluxDBTableConstant.CL_DID,clDid) .eq(InfluxDBTableConstant.PROCESS,process) .between(InfluxDBTableConstant.TIME, startTime, endTime); - System.out.println("sql==:" + influxQueryWrapper.generateSql()); return commonMapper.getLineRtData(influxQueryWrapper); } + + @Override + public List getModuleData(CommonQueryParam param) { + InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(param.getTableName(),StatisticalDataDTO.class); + influxQueryWrapper + .select(StatisticalDataDTO::getLineId) + .select(StatisticalDataDTO::getPhaseType) + .select("Apf_RmsI_ModOut","value") + .select("Apf_RmsI_Load","avgValue") + .between(InfluxDBTableConstant.TIME, param.getStartTime(), param.getEndTime()) + .eq(InfluxDBTableConstant.LINE_ID,param.getLineId()) + .eq(InfluxDBTableConstant.VALUE_TYPE,"avg") + .eq(InfluxDBTableConstant.PROCESS,param.getProcess()) + .eq(InfluxDBTableConstant.CL_DID,param.getClDid()); + return commonMapper.getDeviceRtDataByTime(influxQueryWrapper); + } }