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-10-23 09:00:20 +08:00
parent ff123c680d
commit 050280ddc8
13 changed files with 854 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java
View File

@@ -39,19 +39,19 @@ public class LineParam {
* 标识从那个库里查询数据
*/
@Deprecated
@ApiModelProperty(name = "dataSource",value = "数据源（0:oracle，1:influxdb 2:mysql）")
@ApiModelProperty(name = "dataSource",value = "数据源（0:oracle，1:influxdb 2:mysql）",hidden = true)
private Integer dataSource;
/**
* 调度任务开始时间
*/
@NotBlank(message = "调度任务开始时间不可为空")
@NotBlank(message = "调度任务开始时间不可为空 yyyy-MM-dd hh:mm:ss")
private String beginTime;
/**
* 调度任务结束时间
*/
@NotBlank(message = "调度任务结束时间不可为空")
@NotBlank(message = "调度任务结束时间不可为空 yyyy-MM-dd hh:mm:ss")
private String endTime;

5
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java
View File

@@ -77,6 +77,7 @@ public class DayDataController extends BaseController {
}
}*/
@ApiOperation("day表定时任务(MySQL库)")
@ApiImplicitParam(value = "jobParam",name = "jobParam",required = true)
@PostMapping("dataToDay")
@@ -97,10 +98,10 @@ public class DayDataController extends BaseController {
log.info(item+"-->开始执行");
startTime = item+" "+"00:00:00";
endTime = item+" "+"23:59:59";
dayDataService.dataToDayHandler(indexLists,startTime,endTime);
dayDataService.dataToDayHandler(indexLists,startTime,endTime,2);
}
} else {
dayDataService.dataToDayHandler(indexLists,jobParam.getBeginTime(),jobParam.getEndTime());
dayDataService.dataToDayHandler(indexLists,jobParam.getBeginTime(),jobParam.getEndTime(),2);
}
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
}

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

@@ -3,7 +3,11 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.line;
import com.njcn.harmonic.pojo.po.*;
import com.njcn.harmonic.pojo.po.day.*;
import com.njcn.influx.deprecated.InfluxDBPublicParam;
import com.njcn.influx.imapper.*;
import com.njcn.influx.imapper.day.*;
import com.njcn.influx.pojo.po.*;
import com.njcn.influx.pojo.po.day.*;
import com.njcn.influx.service.*;
import com.njcn.influx.utils.InfluxDbUtils;
import com.njcn.prepare.harmonic.constant.InfluxdbPOConverter;
import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpFlickerReportDPO;
@@ -27,6 +31,7 @@ import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.Instant;
@@ -79,6 +84,24 @@ public class DayDataServiceImpl implements DayDataService {
private final InfluxDbUtils influxDbUtils;
private final DayVMapper dayVMapper;
private final DayIMapper dayIMapper;
private final DayFlickerMapper dayFlickerMapper;
private final DayFlucMapper dayFlucMapper;
private final DayHarmPhasicIMapper dayHarmPhasicIMapper;
private final DayHarmRateVMapper dayHarmRateVMapper;
private final DayHarmRateIMapper dayHarmRateIMapper;
private final DayHarmPowerPMapper dayHarmPowerPMapper;
private final DayHarmPhasicVMapper dayHarmPhasicVMapper;
private final DayHarmPowerQMapper dayHarmPowerQMapper;
private final DayHarmPowerSMapper dayHarmPowerSMapper;
private final DayInHarmVRateMapper dayInHarmVRateMapper;
private final DayInHarmIRateMapper dayInHarmIRateMapper;
private final DayPltMapper dayPltMapper;
/**
* @param indexLists
* @param startTime
@@ -538,7 +561,7 @@ public class DayDataServiceImpl implements DayDataService {
@Override
@Transactional(rollbackFor = {Exception.class})
@Async("asyncExecutor")
public void dataToDayHandler(List<String> indexLists, String startTime, String endTime) {
public void dataToDayHandler(List<String> indexLists, String startTime, String endTime, Integer calType) {
log.info(LocalDateTime.now() + "data表转day开始=====》");
Date time = null;
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -563,8 +586,25 @@ public class DayDataServiceImpl implements DayDataService {
List<RStatDataPltDPO> dataPltPOList = new ArrayList<>();
List<DayV> dayVList = new ArrayList<>();
List<DayI> dayIList = new ArrayList<>();
List<DayFlicker> dayFlickerList = new ArrayList<>();
List<DayFluc> dayFlucList = new ArrayList<>();
List<DayHarmPhasicI> dayHarmPhasicIList = new ArrayList<>();
List<DayHarmPhasicV> dayHarmPhasicVList = new ArrayList<>();
List<DayHarmPowerP> dayHarmPowerPList = new ArrayList<>();
List<DayHarmPowerS> dayHarmPowerSList = new ArrayList<>();
List<DayHarmPowerQ> dayHarmPowerQList = new ArrayList<>();
List<DayHarmRateV> dayHarmRateVList = new ArrayList<>();
List<DayHarmRateI> dayHarmRateIList = new ArrayList<>();
List<DayInHarmI> dayInHarmIList = new ArrayList<>();
List<DayInHarmV> dayInHarmVList = new ArrayList<>();
List<DayPlt> dayPltList = new ArrayList<>();
for (String lineIndex : indexLists) {
/*生成dayV表*/
List<DataV> dataV = getDataV(lineIndex, startTime, endTime);
if (!CollectionUtils.isEmpty(dataV)) {
@@ -574,7 +614,14 @@ public class DayDataServiceImpl implements DayDataService {
po1.setTime(time);
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataVPOList.add(po1);
DayV dayV = new DayV();
BeanUtils.copyProperties(item, dayV);
dayVList.add(dayV);
}
}
/*生成dayI表*/
List<DataI> dataI = getDataI(lineIndex, startTime, endTime);
@@ -585,6 +632,11 @@ public class DayDataServiceImpl implements DayDataService {
po1.setTime(time);
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataIPOList.add(po1);
DayI dayI = new DayI();
BeanUtils.copyProperties(item, dayI);
dayIList.add(dayI);
}
}
/*生成dayFlicker表*/
@@ -596,6 +648,10 @@ public class DayDataServiceImpl implements DayDataService {
po1.setTime(time);
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataFlickerPOList.add(po1);
DayFlicker dayFlicker = new DayFlicker();
BeanUtils.copyProperties(item, dayFlicker);
dayFlickerList.add(dayFlicker);
}
}
/*生成dayFluc表*/
@@ -607,6 +663,10 @@ public class DayDataServiceImpl implements DayDataService {
po1.setTime(time);
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataFlucPOList.add(po1);
DayFluc dayFluc = new DayFluc();
BeanUtils.copyProperties(item, dayFluc);
dayFlucList.add(dayFluc);
}
}
/*生成dayHarmphasicI表*/
@@ -618,6 +678,10 @@ public class DayDataServiceImpl implements DayDataService {
po1.setTime(time);
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataHarmPhasicIPOList.add(po1);
DayHarmPhasicI dayHarmPhasicI = new DayHarmPhasicI();
BeanUtils.copyProperties(item, dayHarmPhasicI);
dayHarmPhasicIList.add(dayHarmPhasicI);
}
}
/*生成dayHarmphasicV表*/
@@ -629,6 +693,10 @@ public class DayDataServiceImpl implements DayDataService {
po1.setTime(time);
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataHarmPhasicVPOList.add(po1);
DayHarmPhasicV dayHarmPhasicV = new DayHarmPhasicV();
BeanUtils.copyProperties(item, dayHarmPhasicV);
dayHarmPhasicVList.add(dayHarmPhasicV);
}
}
/*生成dayHarmPowerP表*/
@@ -640,6 +708,10 @@ public class DayDataServiceImpl implements DayDataService {
po1.setTime(time);
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataHarmPowerPPOList.add(po1);
DayHarmPowerP dayHarmPowerP = new DayHarmPowerP();
BeanUtils.copyProperties(item, dayHarmPowerP);
dayHarmPowerPList.add(dayHarmPowerP);
}
}
/*生成dayHarmPowerQ表*/
@@ -651,6 +723,10 @@ public class DayDataServiceImpl implements DayDataService {
po1.setTime(time);
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataHarmPowerQPOList.add(po1);
DayHarmPowerQ dayHarmPowerQ = new DayHarmPowerQ();
BeanUtils.copyProperties(item, dayHarmPowerQ);
dayHarmPowerQList.add(dayHarmPowerQ);
}
}
/*生成dayHarmPowerS表*/
@@ -662,6 +738,10 @@ public class DayDataServiceImpl implements DayDataService {
po1.setTime(time);
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataHarmPowerSPOList.add(po1);
DayHarmPowerS dayHarmPowerS = new DayHarmPowerS();
BeanUtils.copyProperties(item, dayHarmPowerS);
dayHarmPowerSList.add(dayHarmPowerS);
}
}
/*生成dayHarmRateI*/
@@ -673,6 +753,10 @@ public class DayDataServiceImpl implements DayDataService {
po1.setTime(time);
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataHarmRateIPOList.add(po1);
DayHarmRateI dayHarmRateI = new DayHarmRateI();
BeanUtils.copyProperties(item, dayHarmRateI);
dayHarmRateIList.add(dayHarmRateI);
}
}
/*生成dayHarmRateV*/
@@ -684,6 +768,10 @@ public class DayDataServiceImpl implements DayDataService {
po1.setTime(time);
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataHarmRateVPOList.add(po1);
DayHarmRateV dayHarmRateV = new DayHarmRateV();
BeanUtils.copyProperties(item, dayHarmRateV);
dayHarmRateVList.add(dayHarmRateV);
}
}
/*生成dayInHarmI*/
@@ -695,6 +783,10 @@ public class DayDataServiceImpl implements DayDataService {
po1.setTime(time);
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataInHarmIPOList.add(po1);
DayInHarmI dayInHarmI = new DayInHarmI();
BeanUtils.copyProperties(item, dayInHarmI);
dayInHarmIList.add(dayInHarmI);
}
}
/*生成dayInHarmV*/
@@ -706,6 +798,10 @@ public class DayDataServiceImpl implements DayDataService {
po1.setTime(time);
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataInHarmVPOList.add(po1);
DayInHarmV dayInHarmV = new DayInHarmV();
BeanUtils.copyProperties(item, dayInHarmV);
dayInHarmVList.add(dayInHarmV);
}
}
/*生成dayPlt*/
@@ -717,55 +813,110 @@ public class DayDataServiceImpl implements DayDataService {
po1.setTime(time);
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataPltPOList.add(po1);
DayPlt dayPlt = new DayPlt();
BeanUtils.copyProperties(item, dayPlt);
dayPltList.add(dayPlt);
}
}
}
if (calType == 0 || calType == 2) {
if (!CollectionUtils.isEmpty(dataVPOList)) {
statDataVDService.insert(dataVPOList);
}
if (!CollectionUtils.isEmpty(dataIPOList)) {
statDataIDService.insert(dataIPOList);
}
if (!CollectionUtils.isEmpty(dataFlickerPOList)) {
statDataFlickerDService.insert(dataFlickerPOList);
}
if (!CollectionUtils.isEmpty(dataFlucPOList)) {
statDataFlucDService.insert(dataFlucPOList);
}
if (!CollectionUtils.isEmpty(dataHarmPhasicIPOList)) {
statDataHarmphasicIDService.insert(dataHarmPhasicIPOList);
}
if (!CollectionUtils.isEmpty(dataHarmPhasicVPOList)) {
statDataHarmphasicVDService.insert(dataHarmPhasicVPOList);
}
if (!CollectionUtils.isEmpty(dataHarmPowerPPOList)) {
statDataHarmpowerPDService.insert(dataHarmPowerPPOList);
}
if (!CollectionUtils.isEmpty(dataHarmPowerQPOList)) {
statDataHarmpowerQDService.insert(dataHarmPowerQPOList);
}
if (!CollectionUtils.isEmpty(dataHarmPowerSPOList)) {
statDataHarmpowerSDService.insert(dataHarmPowerSPOList);
}
if (!CollectionUtils.isEmpty(dataHarmRateIPOList)) {
statDataHarmRateIDService.insert(dataHarmRateIPOList);
}
if (!CollectionUtils.isEmpty(dataHarmRateVPOList)) {
statDataHarmRateVDService.insert(dataHarmRateVPOList);
}
if (!CollectionUtils.isEmpty(dataInHarmIPOList)) {
statDataInharmIDService.insert(dataInHarmIPOList);
}
if (!CollectionUtils.isEmpty(dataInHarmVPOList)) {
statDataInharmVDService.insert(dataInHarmVPOList);
}
if (!CollectionUtils.isEmpty(dataPltPOList)) {
statDataPltDService.insert(dataPltPOList);
}
}
if (!CollectionUtils.isEmpty(dataVPOList)) {
statDataVDService.insert(dataVPOList);
}
if (!CollectionUtils.isEmpty(dataIPOList)) {
statDataIDService.insert(dataIPOList);
}
if (!CollectionUtils.isEmpty(dataFlickerPOList)) {
statDataFlickerDService.insert(dataFlickerPOList);
}
if (!CollectionUtils.isEmpty(dataFlucPOList)) {
statDataFlucDService.insert(dataFlucPOList);
}
if (!CollectionUtils.isEmpty(dataHarmPhasicIPOList)) {
statDataHarmphasicIDService.insert(dataHarmPhasicIPOList);
}
if (!CollectionUtils.isEmpty(dataHarmPhasicVPOList)) {
statDataHarmphasicVDService.insert(dataHarmPhasicVPOList);
}
if (!CollectionUtils.isEmpty(dataHarmPowerPPOList)) {
statDataHarmpowerPDService.insert(dataHarmPowerPPOList);
}
if (!CollectionUtils.isEmpty(dataHarmPowerQPOList)) {
statDataHarmpowerQDService.insert(dataHarmPowerQPOList);
}
if (!CollectionUtils.isEmpty(dataHarmPowerSPOList)) {
statDataHarmpowerSDService.insert(dataHarmPowerSPOList);
}
if (!CollectionUtils.isEmpty(dataHarmRateIPOList)) {
statDataHarmRateIDService.insert(dataHarmRateIPOList);
}
if (!CollectionUtils.isEmpty(dataHarmRateVPOList)) {
statDataHarmRateVDService.insert(dataHarmRateVPOList);
}
if (!CollectionUtils.isEmpty(dataInHarmIPOList)) {
statDataInharmIDService.insert(dataInHarmIPOList);
}
if (!CollectionUtils.isEmpty(dataInHarmVPOList)) {
statDataInharmVDService.insert(dataInHarmVPOList);
}
if (!CollectionUtils.isEmpty(dataPltPOList)) {
statDataPltDService.insert(dataPltPOList);
if (calType == 1 || calType == 2) {
if (!CollectionUtils.isEmpty(dayVList)) {
dayVMapper.insertBatch(dayVList);
}
if (!CollectionUtils.isEmpty(dayIList)) {
dayIMapper.insertBatch(dayIList);
}
if (!CollectionUtils.isEmpty(dayFlickerList)) {
dayFlickerMapper.insertBatch(dayFlickerList);
}
if (!CollectionUtils.isEmpty(dayFlucList)) {
dayFlucMapper.insertBatch(dayFlucList);
}
if (!CollectionUtils.isEmpty(dayHarmPhasicIList)) {
dayHarmPhasicIMapper.insertBatch(dayHarmPhasicIList);
}
if (!CollectionUtils.isEmpty(dayHarmPhasicVList)) {
dayHarmPhasicVMapper.insertBatch(dayHarmPhasicVList);
}
if (!CollectionUtils.isEmpty(dayHarmPowerPList)) {
dayHarmPowerPMapper.insertBatch(dayHarmPowerPList);
}
if (!CollectionUtils.isEmpty(dayHarmPowerQList)) {
dayHarmPowerQMapper.insertBatch(dayHarmPowerQList);
}
if (!CollectionUtils.isEmpty(dayHarmPowerSList)) {
dayHarmPowerSMapper.insertBatch(dayHarmPowerSList);
}
if (!CollectionUtils.isEmpty(dayHarmRateIList)) {
dayHarmRateIMapper.insertBatch(dayHarmRateIList);
}
if (!CollectionUtils.isEmpty(dayHarmRateVList)) {
dayHarmRateVMapper.insertBatch(dayHarmRateVList);
}
if (!CollectionUtils.isEmpty(dayInHarmIList)) {
dayInHarmIRateMapper.insertBatch(dayInHarmIList);
}
if (!CollectionUtils.isEmpty(dayInHarmVList)) {
dayInHarmVRateMapper.insertBatch(dayInHarmVList);
}
if (!CollectionUtils.isEmpty(dayPltList)) {
dayPltMapper.insertBatch(dayPltList);
}
}
log.info(LocalDateTime.now() + "data表转day结束=====》");
}

3
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/DayDataService.java
View File

@@ -25,6 +25,7 @@ public interface DayDataService {
* @param indexLists
* @param startTime
* @param endTime
* @param calType 0.mysql 1.influxb 2.两个都处理
*/
void dataToDayHandler(List<String> indexLists, String startTime, String endTime);
void dataToDayHandler(List<String> indexLists, String startTime, String endTime,Integer calType);
}