From 879d90d579cea34cb64b75001e9182793246bccc Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Wed, 21 Jun 2023 09:20:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/influx/imapper/CommonMapper.java | 2 ++ .../influx/pojo/dto/StatisticalDataDTO.java | 19 +++++++++++++++++++ .../njcn/influx/service/CommonService.java | 13 +++++++++++++ .../service/impl/CommonServiceImpl.java | 10 ++++++++++ 4 files changed, 44 insertions(+) diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/CommonMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/CommonMapper.java index 7a9ee1def..c53833c3d 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/imapper/CommonMapper.java +++ b/pqs-influx/src/main/java/com/njcn/influx/imapper/CommonMapper.java @@ -24,4 +24,6 @@ public interface CommonMapper extends InfluxDbBaseMapper { List getDeviceRtData(InfluxQueryWrapper influxQueryWrapper); List getDeviceRtDataByTime(InfluxQueryWrapper influxQueryWrapper); + + StatisticalDataDTO getLineHistoryData(InfluxQueryWrapper influxQueryWrapper); } diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/StatisticalDataDTO.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/StatisticalDataDTO.java index 377b0cd53..0be9650b4 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/StatisticalDataDTO.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/StatisticalDataDTO.java @@ -32,11 +32,30 @@ public class StatisticalDataDTO { @Column(name = "value_type") private String valueType; + /** + * 指标值 + */ private Double value; + /** + * 指标名称 + */ private String statisticalName; + /** + * 指标 + */ private String target; + /** + * 指标最大值 + */ + private Double maxValue; + + /** + * 指标最小值 + */ + private Double minValue; + } 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 36dbe8b14..47980a6b8 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 @@ -49,4 +49,17 @@ public interface CommonService { * @Date: 2023/6/13 */ List getDeviceRtDataByTime(List lineIds, String tableName, String columnName, String phasic, String dataType,String startTime, String endTime); + + /** + * 根据条件获取监测点时间范围内的最大最小值 + * @param lineId 监测点Id + * @param tableName 表名 + * @param columnName 字段名 + * @param phasic 相别 + * @param dataType 数据类型 + * @return + */ + StatisticalDataDTO getLineHistoryData(String lineId, String tableName, String columnName, String startTime, String endTime); + + } 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 3c5a6a6fe..25fc9b0fa 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 @@ -85,4 +85,14 @@ public class CommonServiceImpl implements CommonService { .eq("value_type",dataType).groupBy("line_id"); return commonMapper.getDeviceRtDataByTime(influxQueryWrapper); } + + @Override + public StatisticalDataDTO getLineHistoryData(String lineId, String tableName, String columnName, String startTime, String endTime) { + InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(tableName,StatisticalDataDTO.class); + influxQueryWrapper.max(columnName,"maxValue") + .min(columnName,"minValue") + .eq("line_id",lineId) + .between("time", startTime, endTime); + return commonMapper.getLineHistoryData(influxQueryWrapper); + } }