Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

提交

Browse Source
This commit is contained in:
huangzj
2023-10-11 09:55:08 +08:00
parent 11c3fd8c72
commit 759e2d2015
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pqs-influx/src/main/java/com/njcn/influx/pojo/constant/InfluxDBTableConstant.java
View File

@@ -88,6 +88,7 @@ public interface InfluxDBTableConstant {
* 数据线路号
*/
String LINE_ID = "line_id";
String PROCESS = "process";
/**
* 装置ID

6
pqs-influx/src/main/java/com/njcn/influx/service/CommonService.java
View File

@@ -34,7 +34,7 @@ public interface CommonService {
* @param phasic 相别
* @param dataType 数据类型
*/
List<StatisticalDataDTO> getDeviceRtData(List<String> lineIds, String tableName, String columnName, String phasic, String dataType);
List<StatisticalDataDTO> getDeviceRtData(List<String> 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<StatisticalDataDTO> getDeviceRtDataByTime(List<String> lineIds, String tableName, String columnName, String phasic, String dataType, String startTime, String endTime);
List<StatisticalDataDTO> getDeviceRtDataByTime(List<String> 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<StatisticalDataDTO> getTopTemperature(String lineId,String tableName, String columnName);
List<StatisticalDataDTO> getTopTemperature(String lineId,String tableName, String columnName,String process);
}

12
pqs-influx/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java
View File

@@ -49,7 +49,7 @@ public class CommonServiceImpl implements CommonService {
}
@Override
public List<StatisticalDataDTO> getDeviceRtData(List<String> lineIds, String tableName, String columnName, String phasic, String dataType) {
public List<StatisticalDataDTO> getDeviceRtData(List<String> lineIds, String tableName, String columnName, String phasic, String dataType,String process) {
List<StatisticalDataDTO> 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<StatisticalDataDTO> deviceRtData = commonMapper.getDeviceRtData(influxQueryWrapper);
@@ -69,7 +70,7 @@ public class CommonServiceImpl implements CommonService {
}
@Override
public List<StatisticalDataDTO> getDeviceRtDataByTime(List<String> lineIds, String tableName, String columnName, String phasic, String dataType, String startTime, String endTime) {
public List<StatisticalDataDTO> getDeviceRtDataByTime(List<String> lineIds, String tableName, String columnName, String phasic, String dataType, String startTime, String endTime,String process) {
List<StatisticalDataDTO> 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<StatisticalDataDTO> deviceRtData = commonMapper.getDeviceRtDataByTime(influxQueryWrapper);
@@ -106,12 +108,14 @@ public class CommonServiceImpl implements CommonService {
}
@Override
public List<StatisticalDataDTO> getTopTemperature(String lineId, String tableName, String columnName) {
public List<StatisticalDataDTO> 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);
}