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

接口调整

Browse Source
This commit is contained in:
雨木c
2023-09-19 11:29:47 +08:00
parent 7da60259b6
commit 0843e11dc5
6 changed files with 60 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java
View File

@@ -38,6 +38,7 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.*;
import java.util.function.BinaryOperator;
@@ -96,12 +97,18 @@ public class PollutionServiceImpl implements PollutionService {
@Async("asyncExecutor")
public void processPollutionData(LineParam lineParam) {
log.info("参数起始时间："+lineParam.getBeginTime());
log.info("参数结束时间："+lineParam.getEndTime());
TimeInterval timer = new TimeInterval();
List<PollutionDTO> pollutionList;
LocalDateTime local = LocalDateTimeUtil.now();
if (StrUtil.isNotBlank(lineParam.getDataDate())){
local = LocalDateTimeUtil.parse(lineParam.getDataDate() + "T00:00:00");
local = LocalDateTimeUtil.parse(lineParam.getBeginTime());
}
List<DictData> dictData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.POLLUTION_STATIS.getCode()).getData();
//时间类型为日的情况下执行influxdb计算
if (Integer.valueOf(BizParamConstant.STAT_BIZ_DAY).equals(lineParam.getType())){
@@ -139,27 +146,10 @@ public class PollutionServiceImpl implements PollutionService {
LogUtil.njcnDebug(log, "监测点污染指标数据MySql插入耗时：{}", timer.intervalRestart());
}
Date dateOut = DateUtil.parse(lineParam.getDataDate());
LocalDateTime localEnd = LocalDateTimeUtil.now();
LocalDateTime localEnd = LocalDateTimeUtil.parse(lineParam.getEndTime());
LambdaQueryWrapper<RMpPollutionDPO> lambdaQuery = new LambdaQueryWrapper<>();
if (Integer.valueOf(BizParamConstant.STAT_BIZ_DAY).equals(lineParam.getType())){
localEnd = LocalDateTimeUtil.parse(lineParam.getDataDate() + "T23:59:59");
}else if (Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH).equals(lineParam.getType())){
Date dateOutb = DateUtil.beginOfMonth(dateOut);
Date dateOute = dateOut;
local = LocalDateTimeUtil.parse(DateUtil.formatDate(dateOutb) + "T00:00:00");
localEnd = LocalDateTimeUtil.parse(DateUtil.formatDate(dateOute) + "T23:59:59");
}else if (Integer.valueOf(BizParamConstant.STAT_BIZ_QUARTER).equals(lineParam.getType())){
Date dateOutb = DateUtil.beginOfQuarter(dateOut);
Date dateOute = dateOut;
local = LocalDateTimeUtil.parse(DateUtil.formatDate(dateOutb) + "T00:00:00");
localEnd = LocalDateTimeUtil.parse(DateUtil.formatDate(dateOute) + "T23:59:59");
}else if (Integer.valueOf(BizParamConstant.STAT_BIZ_YEAR).equals(lineParam.getType())){
Date dateOutb = DateUtil.beginOfYear(dateOut);
Date dateOute = dateOut;
local = LocalDateTimeUtil.parse(DateUtil.formatDate(dateOutb) + "T00:00:00");
localEnd = LocalDateTimeUtil.parse(DateUtil.formatDate(dateOute) + "T23:59:59");
}
log.info("污区数据统计间隔"+local+"----->"+localEnd);
List<RMpPollutionDPO> pollutionDayList =new ArrayList<>();
@@ -527,11 +517,6 @@ public class PollutionServiceImpl implements PollutionService {
List<Double> data;
PublicDTO publicDTO;
List<PublicDTO> lineData = new ArrayList<>();
// String sql = "SELECT * FROM day_i where value_type = 'CP95' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C')"+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +" group by line_id order by time desc limit 3 tz('Asia/Shanghai')";
// InfluxDBResultMapper resultMapper = new InfluxDBResultMapper();
//
// QueryResult sqlResult = influxDbUtils.query(sql);
// List<DayIPO> list = resultMapper.toPOJO(sqlResult, DayIPO.class);
for (RStatDataIDPO dayI : list) {
for (Overlimit overlimit : overLimitList) {
if (Objects.equals(dayI.getLineId(),overlimit.getId())){