From 759e2d201519933f76bb405ae5a6e0b65d2fa3e6 Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Wed, 11 Oct 2023 09:55:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../influx/pojo/constant/InfluxDBTableConstant.java | 1 + .../java/com/njcn/influx/service/CommonService.java | 6 +++--- .../njcn/influx/service/impl/CommonServiceImpl.java | 12 ++++++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/constant/InfluxDBTableConstant.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/constant/InfluxDBTableConstant.java index 29e7ba647..6e214aebd 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/constant/InfluxDBTableConstant.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/constant/InfluxDBTableConstant.java @@ -88,6 +88,7 @@ public interface InfluxDBTableConstant { * 数据线路号 */ String LINE_ID = "line_id"; + String PROCESS = "process"; /** * 装置ID diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/CommonService.java b/pqs-influx/src/main/java/com/njcn/influx/service/CommonService.java index 29b0162ab..dd4d83242 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/service/CommonService.java +++ b/pqs-influx/src/main/java/com/njcn/influx/service/CommonService.java @@ -34,7 +34,7 @@ public interface CommonService { * @param phasic 相别 * @param dataType 数据类型 */ - List getDeviceRtData(List lineIds, String tableName, String columnName, String phasic, String dataType); + List getDeviceRtData(List lineIds, String tableName, String columnName, String phasic, String dataType,String process); /** * @param lineIds 监测点Id @@ -49,7 +49,7 @@ public interface CommonService { * @Author: clam * @Date: 2023/6/13 */ - List getDeviceRtDataByTime(List lineIds, String tableName, String columnName, String phasic, String dataType, String startTime, String endTime); + List getDeviceRtDataByTime(List lineIds, String tableName, String columnName, String phasic, String dataType, String startTime, String endTime,String process); /** * 根据条件获取监测点时间范围内的最大最小值 @@ -77,5 +77,5 @@ public interface CommonService { * @param columnName Apf_Temp_Env * @return */ - List getTopTemperature(String lineId,String tableName, String columnName); + List getTopTemperature(String lineId,String tableName, String columnName,String process); } diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java b/pqs-influx/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java index 643971bd1..ea9088ecf 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java +++ b/pqs-influx/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java @@ -49,7 +49,7 @@ public class CommonServiceImpl implements CommonService { } @Override - public List getDeviceRtData(List lineIds, String tableName, String columnName, String phasic, String dataType) { + public List getDeviceRtData(List lineIds, String tableName, String columnName, String phasic, String dataType,String process) { List resultList = new ArrayList<>(); for (String lineId: lineIds) { String clDidByLineId = getClDidByLineId(lineId); @@ -59,6 +59,7 @@ public class CommonServiceImpl implements CommonService { .select(StatisticalDataDTO::getValueType) .last(columnName,InfluxDBTableConstant.VALUE) .eq(InfluxDBTableConstant.LINE_ID,lineId) + .eq(InfluxDBTableConstant.PROCESS,process) .eq(InfluxDBTableConstant.PHASIC_TYPE,phasic) .eq(InfluxDBTableConstant.VALUE_TYPE,dataType).eq(InfluxDBTableConstant.CL_DID,clDidByLineId); List deviceRtData = commonMapper.getDeviceRtData(influxQueryWrapper); @@ -69,7 +70,7 @@ public class CommonServiceImpl implements CommonService { } @Override - public List getDeviceRtDataByTime(List lineIds, String tableName, String columnName, String phasic, String dataType, String startTime, String endTime) { + public List getDeviceRtDataByTime(List lineIds, String tableName, String columnName, String phasic, String dataType, String startTime, String endTime,String process) { List resultList = new ArrayList<>(); for (String lineId: lineIds) { String clDidByLineId = getClDidByLineId(lineId); @@ -80,6 +81,7 @@ public class CommonServiceImpl implements CommonService { .select(columnName,InfluxDBTableConstant.VALUE) .eq(InfluxDBTableConstant.LINE_ID,lineId) .eq(InfluxDBTableConstant.PHASIC_TYPE,phasic) + .eq(InfluxDBTableConstant.PROCESS,process) .between(InfluxDBTableConstant.TIME, startTime, endTime) .eq(InfluxDBTableConstant.VALUE_TYPE,dataType).eq(InfluxDBTableConstant.CL_DID,clDidByLineId); List deviceRtData = commonMapper.getDeviceRtDataByTime(influxQueryWrapper); @@ -106,12 +108,14 @@ public class CommonServiceImpl implements CommonService { } @Override - public List getTopTemperature(String lineId, String tableName, String columnName) { + public List getTopTemperature(String lineId, String tableName, String columnName,String process) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(tableName,StatisticalDataDTO.class); influxQueryWrapper.select(StatisticalDataDTO::getLineId) .select(StatisticalDataDTO::getClDid) .last(columnName,InfluxDBTableConstant.VALUE) - .eq(InfluxDBTableConstant.LINE_ID,lineId).groupBy(InfluxDBTableConstant.CL_DID); + .eq(InfluxDBTableConstant.LINE_ID,lineId) + .eq(InfluxDBTableConstant.PROCESS,process) + .groupBy(InfluxDBTableConstant.CL_DID); return commonMapper.getTopTemperature(influxQueryWrapper); }