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

1.分钟数据转统计数据mysql日表之外添加inflxudb日表

Browse Source 
2.报表默认查询influxdb日表
This commit is contained in:
chendaofei
2024-11-26 19:49:48 +08:00
parent b3015c2dcb
commit 3377da4ae3
3 changed files with 1162 additions and 981 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/CustomReportController.java → pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/report/CustomReportController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.harmonic.controller;
package com.njcn.harmonic.controller.report;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.common.pojo.annotation.OperateInfo;
@@ -42,6 +42,21 @@ public class CustomReportController extends BaseController {
private final CustomReportService customReportService;
/**
* 替换报表数据并返回
* @author qijian
* @date 2022/10/19
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getCustomReport")
@ApiOperation("获取报表")
@ApiImplicitParam(name = "reportSearchParam", value = "查询体", required = false)
public void getCustomReport(@RequestBody ReportSearchParam reportSearchParam, HttpServletResponse response) {
customReportService.getCustomReport(reportSearchParam,response);
}
/**
* 新增自定义报表模板
* @author cdf
@@ -222,19 +237,7 @@ public class CustomReportController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
}
/**
* 替换报表数据并返回
* @author qijian
* @date 2022/10/19
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getCustomReport")
@ApiOperation("获取报表")
@ApiImplicitParam(name = "reportSearchParam", value = "查询体", required = false)
public void getCustomReport(@RequestBody ReportSearchParam reportSearchParam, HttpServletResponse response) {
String methodDescribe = getMethodDescribe("getCustomReport");
customReportService.getCustomReport(reportSearchParam,response);
}
/**

217
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
View File

@@ -119,6 +119,22 @@ public class CustomReportServiceImpl implements CustomReportService {
private final ExecutorService executorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() + 1);
@Override
public void getCustomReport(ReportSearchParam reportSearchParam, HttpServletResponse response) {
ExcelRptTemp excelRptTemp = excelRptTempMapper.selectById(reportSearchParam.getTempId());
if (Objects.isNull(excelRptTemp)) {
throw new BusinessException(HarmonicResponseEnum.CUSTOM_REPORT_ACTIVE);
}
if (Objects.isNull(reportSearchParam.getCustomType())) {
//通用报表
analyzeReport(reportSearchParam, excelRptTemp, response);
} else {
//浙江无线报表
analyzeReportZhejiang(reportSearchParam, excelRptTemp, response);
}
}
@Override
public boolean addCustomReportTemplate(ReportTemplateParam reportTemplateParam) {
checkName(reportTemplateParam, false);
@@ -252,22 +268,6 @@ public class CustomReportServiceImpl implements CustomReportService {
}
@Override
public void getCustomReport(ReportSearchParam reportSearchParam, HttpServletResponse response) {
ExcelRptTemp excelRptTemp = excelRptTempMapper.selectById(reportSearchParam.getTempId());
if (Objects.isNull(excelRptTemp)) {
throw new BusinessException(HarmonicResponseEnum.CUSTOM_REPORT_ACTIVE);
}
if (Objects.isNull(reportSearchParam.getCustomType())) {
//通用报表
analyzeReport(reportSearchParam, excelRptTemp, response);
} else {
//浙江无线报表
analyzeReportZhejiang(reportSearchParam, excelRptTemp, response);
}
}
@Override
public List<ReportTreeVO> reportChooseTree() {
DictData dic = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.CS_DATA_TYPE.getName(), DicDataEnum.EPD.getName()).getData();
@@ -514,6 +514,163 @@ public class CustomReportServiceImpl implements CustomReportService {
* @param assNoPassMap 用于存储不合格的指标
* @date 2023/10/20
*/
private void assSqlNew(List<ReportTemplateDTO> data, StringBuilder sql, List<ReportTemplateDTO> endList, String method, ReportSearchParam reportSearchParam, Map<String, ReportTemplateDTO> limitMap, Map<String, Float> overLimitMap, Map<String, ReportTemplateDTO> assNoPassMap) {
//sql拼接示例：select MAX(IHA2) as IHA2 from power_quality_data where Phase = 'A' and LineId='1324564568' and Stat_Method='max' tz('Asia/Shanghai')
//cp95函数特殊处理 PERCENTILE(field_key, N)
if (InfluxDbSqlConstant.CP95.equals(method)) {
for (int i = 0; i < data.size(); i++) {
if (i == data.size() - 1) {
sql.append(InfluxDbSqlConstant.PERCENTILE)
.append(InfluxDbSqlConstant.LBK)
.append(data.get(i).getTemplateName())
.append(InfluxDbSqlConstant.NUM_95)
.append(InfluxDbSqlConstant.RBK)
.append(InfluxDbSqlConstant.AS).append(InfluxDbSqlConstant.DQM)
.append(data.get(i).getItemName()).append(InfluxDbSqlConstant.DQM);
} else {
sql.append(InfluxDbSqlConstant.PERCENTILE)
.append(InfluxDbSqlConstant.LBK)
.append(data.get(i).getTemplateName())
.append(InfluxDbSqlConstant.NUM_95)
.append(InfluxDbSqlConstant.RBK)
.append(InfluxDbSqlConstant.AS).append(InfluxDbSqlConstant.DQM)
.append(data.get(i).getItemName()).append(InfluxDbSqlConstant.DQM).append(StrUtil.COMMA);
}
}
} else {
for (int i = 0; i < data.size(); i++) {
if (i == data.size() - 1) {
sql.append(method)
.append(InfluxDbSqlConstant.LBK)
.append(data.get(i).getTemplateName())
.append(InfluxDbSqlConstant.RBK)
.append(InfluxDbSqlConstant.AS).append(InfluxDbSqlConstant.DQM)
.append(data.get(i).getItemName()).append(InfluxDbSqlConstant.DQM);
} else {
sql.append(method)
.append(InfluxDbSqlConstant.LBK)
.append(data.get(i).getTemplateName())
.append(InfluxDbSqlConstant.RBK)
.append(InfluxDbSqlConstant.AS).append(InfluxDbSqlConstant.DQM)
.append(data.get(i).getItemName()).append(InfluxDbSqlConstant.DQM).append(StrUtil.COMMA);
}
}
}
sql.append(StrPool.C_SPACE);
String temS = data.get(0).getResourceId().replace("r_stat_data", "day").replace("_d","");
sql.append(InfluxDbSqlConstant.FROM).append(temS);
sql.append(InfluxDbSqlConstant.WHERE)
.append(InfluxDBTableConstant.LINE_ID)
.append(InfluxDbSqlConstant.EQ)
.append(InfluxDbSqlConstant.QM)
.append(reportSearchParam.getLineId())
.append(InfluxDbSqlConstant.QM);
//相别特殊处理
if (!InfluxDBTableConstant.NO_PHASE.equals(data.get(0).getPhase())) {
sql.append(InfluxDbSqlConstant.AND)
.append(InfluxDBTableConstant.PHASIC_TYPE)
.append(InfluxDbSqlConstant.EQ)
.append(InfluxDbSqlConstant.QM)
.append(data.get(0).getPhase())
.append(InfluxDbSqlConstant.QM);
}
//data_flicker、data_fluc、data_plt 无 value_type
if (!InfluxDBTableConstant.DATA_FLICKER.equals(data.get(0).getClassId()) && !InfluxDBTableConstant.DATA_FLUC.equals(data.get(0).getClassId()) && !InfluxDBTableConstant.DATA_PLT.equals(data.get(0).getClassId())) {
sql.append(InfluxDbSqlConstant.AND)
.append(InfluxDBTableConstant.VALUE_TYPE)
.append(InfluxDbSqlConstant.EQ)
.append(InfluxDbSqlConstant.QM)
.append(data.get(0).getStatMethod())
.append(InfluxDbSqlConstant.QM);
}
//频率和频率偏差仅统计T相
if (data.get(0).getTemplateName().equals("freq_dev") || data.get(0).getTemplateName().equals("freq")) {
sql.append(InfluxDbSqlConstant.AND)
.append(InfluxDBTableConstant.PHASIC_TYPE)
.append(InfluxDbSqlConstant.EQ)
.append(InfluxDbSqlConstant.QM)
.append(InfluxDBTableConstant.PHASE_TYPE_T)
.append(InfluxDbSqlConstant.QM);
}
//时间范围处理
sql.append(InfluxDbSqlConstant.AND)
.append(InfluxDbSqlConstant.TIME).append(InfluxDbSqlConstant.GE).append(InfluxDbSqlConstant.QM).append(reportSearchParam.getStartTime()).append(InfluxDbSqlConstant.START_TIME).append(InfluxDbSqlConstant.QM)
.append(InfluxDbSqlConstant.AND)
.append(InfluxDbSqlConstant.TIME).append(InfluxDbSqlConstant.LT).append(InfluxDbSqlConstant.QM).append(reportSearchParam.getEndTime()).append(InfluxDbSqlConstant.END_TIME).append(InfluxDbSqlConstant.QM);
sql.append(InfluxDbSqlConstant.TZ);
long a = System.currentTimeMillis();
List<Map<String, Object>> mapList = influxDbUtils.getMapResult(sql.toString());
long b = System.currentTimeMillis();
System.out.println(sql);
System.out.println("当前sql执行了:"+(b-a)+"ms");
if (CollUtil.isEmpty(mapList)) {
data = data.stream().peek(item -> item.setValue("/")).collect(Collectors.toList());
} else {
Map<String, Object> map = mapList.get(0);
for (ReportTemplateDTO item : data) {
if (Objects.nonNull(map) && map.containsKey(item.getItemName())) {
double v = Double.parseDouble(map.get(item.getItemName()).toString());
item.setValue(String.format("%.3f", v));
if (overLimitMap.containsKey(item.getLimitName())) {
Float tagVal = overLimitMap.get(item.getLimitName());
if (v > tagVal) {
item.setOverLimitFlag(1);
} else {
item.setOverLimitFlag(0);
}
}
//判断是否越限
if (limitMap.size() != 0) {
String key = item.getLimitName() + "#" + item.getStatMethod().toLowerCase() + "#pq_overlimit";
if (limitMap.containsKey(key)) {
ReportTemplateDTO tem = limitMap.get(key);
double limitVal = Double.parseDouble(tem.getValue());
if (v > limitVal) {
tem.setOverLimitFlag(1);
assNoPassMap.put(key, tem);
} else if (!assNoPassMap.containsKey(key)) {
tem.setOverLimitFlag(0);
assNoPassMap.put(key, tem);
}
}
}
} else {
item.setValue("/");
}
}
}
endList.addAll(data);
}
/*
*/
/**
* @param data 同类型的cell模板
* @param sql 单个cell模板
* @param endList 用于返回最终组装好的数据，类似data
* @param limitMap 指标是否合格模板
* @param assNoPassMap 用于存储不合格的指标
* @date 2023/10/20
*//*
private void assSqlNew(List<ReportTemplateDTO> data, StringBuilder sql, List<ReportTemplateDTO> endList, String method, ReportSearchParam reportSearchParam, Map<String, ReportTemplateDTO> limitMap, Map<String, Float> overLimitMap, Map<String, ReportTemplateDTO> assNoPassMap) {
//sql拼接示例：select MAX(IHA2) as IHA2 from power_quality_data where Phase = 'A' and LineId='1324564568' and Stat_Method='max' tz('Asia/Shanghai')
if (InfluxDbSqlConstant.CP95.equals(method)) {
@@ -650,6 +807,7 @@ public class CustomReportServiceImpl implements CustomReportService {
endList.addAll(data);
}
*/
/**
* 处理
@@ -698,32 +856,29 @@ public class CustomReportServiceImpl implements CustomReportService {
long deal = System.currentTimeMillis();
classMap.forEach((classKey, templateValue) -> {
Map<String, List<ReportTemplateDTO>> valueTypeMap = templateValue.stream().collect(Collectors.groupingBy(ReportTemplateDTO::getStatMethod));
futures.add(executorService.submit(() -> {
//avg.max,min,cp95
valueTypeMap.forEach((valueTypeKey, valueTypeVal) -> {
//相别分组
Map<String, List<ReportTemplateDTO>> phaseMap = valueTypeVal.stream().collect(Collectors.groupingBy(ReportTemplateDTO::getPhase));
phaseMap.forEach((phaseKey, phaseVal) -> {
futures.add(executorService.submit(() -> {
StringBuilder sql = new StringBuilder(InfluxDbSqlConstant.SELECT);
if (InfluxDbSqlConstant.MAX.equalsIgnoreCase(valueTypeKey)) {
assSqlNew(phaseVal, sql, endList, InfluxDbSqlConstant.MAX, reportSearchParam, limitTargetMapX, limitMap, assNoPassMap);
} else if (InfluxDbSqlConstant.MIN.equalsIgnoreCase(valueTypeKey)) {
assSqlNew(phaseVal, sql, endList, InfluxDbSqlConstant.MIN, reportSearchParam, limitTargetMapX, limitMap, assNoPassMap);
} else if (InfluxDbSqlConstant.AVG_WEB.equalsIgnoreCase(valueTypeKey)) {
assSqlNew(phaseVal, sql, endList, InfluxDbSqlConstant.AVG_WEB, reportSearchParam, limitTargetMapX, limitMap, assNoPassMap);
assSqlNew(phaseVal, sql, endList, InfluxDbSqlConstant.AVG, reportSearchParam, limitTargetMapX, limitMap, assNoPassMap);
} else if (InfluxDbSqlConstant.CP95.equalsIgnoreCase(valueTypeKey)) {
assSqlNew(phaseVal, sql, endList, InfluxDbSqlConstant.CP95, reportSearchParam, limitTargetMapX, limitMap, assNoPassMap);
}
});
});
}));
});
});
});
@@ -847,8 +1002,7 @@ public class CustomReportServiceImpl implements CustomReportService {
* @date 2023/10/20
*/
private void parseTemplate(JSONArray
jsonArray, List < ReportTemplateDTO > reportTemplateDTOList, List < ReportTemplateDTO > reportLimitList, List < ReportTemplateDTO > terminalList)
{
jsonArray, List<ReportTemplateDTO> reportTemplateDTOList, List<ReportTemplateDTO> reportLimitList, List<ReportTemplateDTO> terminalList) {
try {
//通过文件服务器获取
@@ -1092,8 +1246,7 @@ public class CustomReportServiceImpl implements CustomReportService {
private void assSqlZhejiang(List<ReportTemplateDTO> data, StringBuilder
sql, List<ReportTemplateDTO> endList, String method, ReportSearchParam
reportSearchParam, Map < String, ReportTemplateDTO > limitMap, Map < String, Float > overLimitMap, Map < String, ReportTemplateDTO > assNoPassMap, List < WlRecord > wlRecordList)
{
reportSearchParam, Map<String, ReportTemplateDTO> limitMap, Map<String, Float> overLimitMap, Map<String, ReportTemplateDTO> assNoPassMap, List<WlRecord> wlRecordList) {
//sql拼接示例：select MAX(IHA2) as IHA2 from power_quality_data where Phase = 'A' and LineId='1324564568' and Stat_Method='max' tz('Asia/Shanghai')
//cp95函数特殊处理 PERCENTILE(field_key, N)
if (InfluxDbSqlConstant.PERCENTILE.equals(method)) {
@@ -1349,8 +1502,7 @@ public class CustomReportServiceImpl implements CustomReportService {
* 处理指标超标结论
*/
private void dealTargetResult
(Map < String, ReportTemplateDTO > assNoPassMap, Map < String, ReportTemplateDTO > limitTargetMapX, List < ReportTemplateDTO > endList)
{
(Map<String, ReportTemplateDTO> assNoPassMap, Map<String, ReportTemplateDTO> limitTargetMapX, List<ReportTemplateDTO> endList) {
assNoPassMap.forEach((key, val) -> {
limitTargetMapX.remove(key);
if ("Voltage_Dev".equals(val.getTemplateName()) || "Freq_Dev".equals(val.getTemplateName())) {
@@ -1382,8 +1534,7 @@ public class CustomReportServiceImpl implements CustomReportService {
* @date 2023/10/20
*/
private void parseTemplateZhejiang(JSONArray
jsonArray, List < ReportTemplateDTO > reportTemplateDTOList, List < ReportTemplateDTO > reportLimitList, List < ReportTemplateDTO > terminalList)
{
jsonArray, List<ReportTemplateDTO> reportTemplateDTOList, List<ReportTemplateDTO> reportLimitList, List<ReportTemplateDTO> terminalList) {
try {
//通过文件服务器获取

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

@@ -635,7 +635,7 @@ public class DayDataServiceImpl implements DayDataService {
List<RStatDataPltDPO> dataPltPOList = new ArrayList<>();
List<RStatDataFlickerDPO> dataFlickerPOList = new ArrayList<>();
//day表
/* List<DayV> dayVList = new ArrayList<>();
List<DayV> dayVList = new ArrayList<>();
List<DayI> dayIList = new ArrayList<>();
List<DayFlicker> dayFlickerList = new ArrayList<>();
List<DayFluc> dayFlucList = new ArrayList<>();
@@ -648,7 +648,7 @@ public class DayDataServiceImpl implements DayDataService {
List<DayHarmRateI> dayHarmRateIList = new ArrayList<>();
List<DayInHarmI> dayInHarmIList = new ArrayList<>();
List<DayInHarmV> dayInHarmVList = new ArrayList<>();
List<DayPlt> dayPltList = new ArrayList<>();*/
List<DayPlt> dayPltList = new ArrayList<>();
List<String> lineIds = calculatedParam.getIdList();
//河北数据量较大，以尺寸20分片
@@ -713,13 +713,14 @@ public class DayDataServiceImpl implements DayDataService {
po1.setTime(LocalDate.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_FORMATTER));
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataVPOList.add(po1);
/* DayV dayV = new DayV();
DayV dayV = new DayV();
BeanUtils.copyProperties(item, dayV);
dayV.setTime(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_FORMATTER).toInstant());
dayVList.add(dayV);*/
dayVList.add(dayV);
}
statDataVDService.insert(dataVPOList);
// dayVMapper.insertBatch(dayVList);
dayVMapper.insertBatch(dayVList);
}
//dataI数据入库
if (!CollectionUtils.isEmpty(list2)) {
@@ -729,13 +730,13 @@ public class DayDataServiceImpl implements DayDataService {
po1.setTime(LocalDate.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_FORMATTER));
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataIPOList.add(po1);
/* DayI dayI = new DayI();
DayI dayI = new DayI();
BeanUtils.copyProperties(item, dayI);
dayI.setTime(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_FORMATTER).toInstant());
dayIList.add(dayI);*/
dayIList.add(dayI);
}
statDataIDService.insert(dataIPOList);
//dayIMapper.insertBatch(dayIList);
dayIMapper.insertBatch(dayIList);
}
//dataFlicker数据入库
if (!CollectionUtils.isEmpty(list3)) {
@@ -746,13 +747,13 @@ public class DayDataServiceImpl implements DayDataService {
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataFlickerPOList.add(po1);
/* DayFlicker dayFlicker = new DayFlicker();
DayFlicker dayFlicker = new DayFlicker();
BeanUtils.copyProperties(item, dayFlicker);
dayFlicker.setTime(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_FORMATTER).toInstant());
dayFlickerList.add(dayFlicker);*/
dayFlickerList.add(dayFlicker);
}
statDataFlickerDService.insert(dataFlickerPOList);
//dayFlickerMapper.insertBatch(dayFlickerList);
dayFlickerMapper.insertBatch(dayFlickerList);
}
//dataFluc数据入库
if (!CollectionUtils.isEmpty(list4)) {
@@ -763,13 +764,13 @@ public class DayDataServiceImpl implements DayDataService {
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataFlucPOList.add(po1);
/* DayFluc dayFluc = new DayFluc();
DayFluc dayFluc = new DayFluc();
BeanUtils.copyProperties(item, dayFluc);
dayFluc.setTime(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_FORMATTER).toInstant());
dayFlucList.add(dayFluc);*/
dayFlucList.add(dayFluc);
}
statDataFlucDService.insert(dataFlucPOList);
//dayFlucMapper.insertBatch(dayFlucList);
dayFlucMapper.insertBatch(dayFlucList);
}
//data_harmphasic_i数据入库
if (!CollectionUtils.isEmpty(list5)) {
@@ -780,13 +781,13 @@ public class DayDataServiceImpl implements DayDataService {
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataHarmPhasicIPOList.add(po1);
/* DayHarmPhasicI dayHarmPhasicI = new DayHarmPhasicI();
DayHarmPhasicI dayHarmPhasicI = new DayHarmPhasicI();
BeanUtils.copyProperties(item, dayHarmPhasicI);
dayHarmPhasicI.setTime(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_FORMATTER).toInstant());
dayHarmPhasicIList.add(dayHarmPhasicI);*/
dayHarmPhasicIList.add(dayHarmPhasicI);
}
statDataHarmphasicIDService.insert(dataHarmPhasicIPOList);
//dayHarmPhasicIMapper.insertBatch(dayHarmPhasicIList);
dayHarmPhasicIMapper.insertBatch(dayHarmPhasicIList);
}
//data_harmphasic_v数据入库
if (!CollectionUtils.isEmpty(list6)) {
@@ -797,13 +798,13 @@ public class DayDataServiceImpl implements DayDataService {
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataHarmPhasicVPOList.add(po1);
/* DayHarmPhasicV dayHarmPhasicV = new DayHarmPhasicV();
DayHarmPhasicV dayHarmPhasicV = new DayHarmPhasicV();
BeanUtils.copyProperties(item, dayHarmPhasicV);
dayHarmPhasicV.setTime(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_FORMATTER).toInstant());
dayHarmPhasicVList.add(dayHarmPhasicV);*/
dayHarmPhasicVList.add(dayHarmPhasicV);
}
statDataHarmphasicVDService.insert(dataHarmPhasicVPOList);
//dayHarmPhasicVMapper.insertBatch(dayHarmPhasicVList);
dayHarmPhasicVMapper.insertBatch(dayHarmPhasicVList);
}
//data_harmpower_p数据入库
if (!CollectionUtils.isEmpty(list7)) {
@@ -814,13 +815,13 @@ public class DayDataServiceImpl implements DayDataService {
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataHarmPowerPPOList.add(po1);
/* DayHarmPowerP dayHarmPowerP = new DayHarmPowerP();
DayHarmPowerP dayHarmPowerP = new DayHarmPowerP();
BeanUtils.copyProperties(item, dayHarmPowerP);
dayHarmPowerP.setTime(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_FORMATTER).toInstant());
dayHarmPowerPList.add(dayHarmPowerP);*/
dayHarmPowerPList.add(dayHarmPowerP);
}
statDataHarmpowerPDService.insert(dataHarmPowerPPOList);
//dayHarmPowerPMapper.insertBatch(dayHarmPowerPList);
dayHarmPowerPMapper.insertBatch(dayHarmPowerPList);
}
//data_harmpower_q数据入库
if (!CollectionUtils.isEmpty(list8)) {
@@ -831,13 +832,13 @@ public class DayDataServiceImpl implements DayDataService {
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataHarmPowerQPOList.add(po1);
/* DayHarmPowerQ dayHarmPowerQ = new DayHarmPowerQ();
DayHarmPowerQ dayHarmPowerQ = new DayHarmPowerQ();
BeanUtils.copyProperties(item, dayHarmPowerQ);
dayHarmPowerQ.setTime(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_FORMATTER).toInstant());
dayHarmPowerQList.add(dayHarmPowerQ);*/
dayHarmPowerQList.add(dayHarmPowerQ);
}
statDataHarmpowerQDService.insert(dataHarmPowerQPOList);
//dayHarmPowerQMapper.insertBatch(dayHarmPowerQList);
dayHarmPowerQMapper.insertBatch(dayHarmPowerQList);
}
//data_harmpower_s数据入库
if (!CollectionUtils.isEmpty(list9)) {
@@ -848,13 +849,13 @@ public class DayDataServiceImpl implements DayDataService {
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataHarmPowerSPOList.add(po1);
/* DayHarmPowerS dayHarmPowerS = new DayHarmPowerS();
DayHarmPowerS dayHarmPowerS = new DayHarmPowerS();
BeanUtils.copyProperties(item, dayHarmPowerS);
dayHarmPowerS.setTime(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_FORMATTER).toInstant());
dayHarmPowerSList.add(dayHarmPowerS);*/
dayHarmPowerSList.add(dayHarmPowerS);
}
statDataHarmpowerSDService.insert(dataHarmPowerSPOList);
//dayHarmPowerSMapper.insertBatch(dayHarmPowerSList);
dayHarmPowerSMapper.insertBatch(dayHarmPowerSList);
}
//data_harmrate_i数据入库
if (!CollectionUtils.isEmpty(list10)) {
@@ -865,13 +866,13 @@ public class DayDataServiceImpl implements DayDataService {
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataHarmRateIPOList.add(po1);
/* DayHarmRateI dayHarmRateI = new DayHarmRateI();
DayHarmRateI dayHarmRateI = new DayHarmRateI();
BeanUtils.copyProperties(item, dayHarmRateI);
dayHarmRateI.setTime(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_FORMATTER).toInstant());
dayHarmRateIList.add(dayHarmRateI);*/
dayHarmRateIList.add(dayHarmRateI);
}
statDataHarmRateIDService.insert(dataHarmRateIPOList);
//dayHarmRateIMapper.insertBatch(dayHarmRateIList);
dayHarmRateIMapper.insertBatch(dayHarmRateIList);
}
//data_harmrate_v数据入库
if (!CollectionUtils.isEmpty(list11)) {
@@ -882,13 +883,13 @@ public class DayDataServiceImpl implements DayDataService {
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataHarmRateVPOList.add(po1);
/* DayHarmRateV dayHarmRateV = new DayHarmRateV();
DayHarmRateV dayHarmRateV = new DayHarmRateV();
BeanUtils.copyProperties(item, dayHarmRateV);
dayHarmRateV.setTime(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_FORMATTER).toInstant());
dayHarmRateVList.add(dayHarmRateV);*/
dayHarmRateVList.add(dayHarmRateV);
}
statDataHarmRateVDService.insert(dataHarmRateVPOList);
//dayHarmRateVMapper.insertBatch(dayHarmRateVList);
dayHarmRateVMapper.insertBatch(dayHarmRateVList);
}
//data_inharm_i数据入库
if (!CollectionUtils.isEmpty(list12)) {
@@ -899,13 +900,13 @@ public class DayDataServiceImpl implements DayDataService {
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataInHarmIPOList.add(po1);
/* DayInHarmI dayInHarmI = new DayInHarmI();
DayInHarmI dayInHarmI = new DayInHarmI();
BeanUtils.copyProperties(item, dayInHarmI);
dayInHarmI.setTime(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_FORMATTER).toInstant());
dayInHarmIList.add(dayInHarmI);*/
dayInHarmIList.add(dayInHarmI);
}
statDataInharmIDService.insert(dataInHarmIPOList);
//dayInHarmIMapper.insertBatch(dayInHarmIList);
dayInHarmIMapper.insertBatch(dayInHarmIList);
}
//data_inharm_v数据入库
if (!CollectionUtils.isEmpty(list13)) {
@@ -916,13 +917,13 @@ public class DayDataServiceImpl implements DayDataService {
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataInHarmVPOList.add(po1);
/* DayInHarmV dayInHarmV = new DayInHarmV();
DayInHarmV dayInHarmV = new DayInHarmV();
BeanUtils.copyProperties(item, dayInHarmV);
dayInHarmV.setTime(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_FORMATTER).toInstant());
dayInHarmVList.add(dayInHarmV);*/
dayInHarmVList.add(dayInHarmV);
}
statDataInharmVDService.insert(dataInHarmVPOList);
//dayInHarmVMapper.insertBatch(dayInHarmVList);
dayInHarmVMapper.insertBatch(dayInHarmVList);
}
//data_plt数据入库
if (!CollectionUtils.isEmpty(list16)) {
@@ -933,18 +934,24 @@ public class DayDataServiceImpl implements DayDataService {
po1.setQualityFlag(Integer.parseInt(item.getQualityFlag()));
dataPltPOList.add(po1);
/* DayPlt dayPlt = new DayPlt();
DayPlt dayPlt = new DayPlt();
BeanUtils.copyProperties(item, dayPlt);
dayPlt.setTime(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_FORMATTER).toInstant());
dayPltList.add(dayPlt);*/
dayPltList.add(dayPlt);
}
statDataPltDService.insert(dataPltPOList);
//dayPltMapper.insertBatch(dayPltList);
dayPltMapper.insertBatch(dayPltList);
}
}
/**
* 功能描述:获取dataV数据
*
* @param lineIndex 监测点集合
* @param startTime 起始时间
* @param endTime 结束时间
@@ -1040,6 +1047,7 @@ public class DayDataServiceImpl implements DayDataService {
/**
* 功能描述:获取dataI数据
*
* @param lineIndex 监测点集合
* @param startTime 起始时间
* @param endTime 结束时间
@@ -1115,6 +1123,7 @@ public class DayDataServiceImpl implements DayDataService {
/**
* 功能描述:获取dataFlicker数据
*
* @param lineIndex 监测点集合
* @param startTime 起始时间
* @param endTime 结束时间
@@ -1179,6 +1188,7 @@ public class DayDataServiceImpl implements DayDataService {
/**
* 功能描述:获取dataFluc数据
*
* @param lineIndex 监测点集合
* @param startTime 起始时间
* @param endTime 结束时间
@@ -1234,6 +1244,7 @@ public class DayDataServiceImpl implements DayDataService {
/**
* 功能描述:获取data_harmphasic_i数据
*
* @param lineIndex 监测点集合
* @param startTime 起始时间
* @param endTime 结束时间
@@ -1285,6 +1296,7 @@ public class DayDataServiceImpl implements DayDataService {
/**
* 功能描述:获取data_harmphasic_v数据
*
* @param lineIndex 监测点集合
* @param startTime 起始时间
* @param endTime 结束时间
@@ -1336,6 +1348,7 @@ public class DayDataServiceImpl implements DayDataService {
/**
* 功能描述:获取data_harmpower_p数据
*
* @param lineIndex 监测点集合
* @param startTime 起始时间
* @param endTime 结束时间
@@ -1399,6 +1412,7 @@ public class DayDataServiceImpl implements DayDataService {
/**
* 功能描述:获取data_harmpower_q数据
*
* @param lineIndex 监测点集合
* @param startTime 起始时间
* @param endTime 结束时间
@@ -1454,6 +1468,7 @@ public class DayDataServiceImpl implements DayDataService {
/**
* 功能描述:获取data_harmpower_s数据
*
* @param lineIndex 监测点集合
* @param startTime 起始时间
* @param endTime 结束时间
@@ -1509,6 +1524,7 @@ public class DayDataServiceImpl implements DayDataService {
/**
* 功能描述:获取data_harmrate_i数据
*
* @param lineIndex 监测点集合
* @param startTime 起始时间
* @param endTime 结束时间
@@ -1560,6 +1576,7 @@ public class DayDataServiceImpl implements DayDataService {
/**
* 功能描述:获取data_harmrate_v数据
*
* @param lineIndex 监测点集合
* @param startTime 起始时间
* @param endTime 结束时间
@@ -1611,6 +1628,7 @@ public class DayDataServiceImpl implements DayDataService {
/**
* 功能描述:获取data_inharm_i数据
*
* @param lineIndex 监测点集合
* @param startTime 起始时间
* @param endTime 结束时间
@@ -1662,6 +1680,7 @@ public class DayDataServiceImpl implements DayDataService {
/**
* 功能描述:获取data_inharm_v数据
*
* @param lineIndex 监测点集合
* @param startTime 起始时间
* @param endTime 结束时间
@@ -1713,6 +1732,7 @@ public class DayDataServiceImpl implements DayDataService {
/**
* 功能描述:获取data_inharmrate_i数据
*
* @param lineIndex 监测点集合
* @param startTime 起始时间
* @param endTime 结束时间
@@ -1764,6 +1784,7 @@ public class DayDataServiceImpl implements DayDataService {
/**
* 功能描述:获取data_inharmrate_v数据
*
* @param lineIndex 监测点集合
* @param startTime 起始时间
* @param endTime 结束时间
@@ -1815,6 +1836,7 @@ public class DayDataServiceImpl implements DayDataService {
/**
* 功能描述:获取data_plt数据
*
* @param lineIndex 监测点集合
* @param startTime 起始时间
* @param endTime 结束时间
@@ -1887,4 +1909,9 @@ public class DayDataServiceImpl implements DayDataService {
}
return result;
}
}