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

1.审计用户消息和邮件推送

Browse Source 
2.国网上送母线，变电站，主配网监测点统计，典型源荷统计等算法调整
3.国网上送定时任务调整
This commit is contained in:
wr
2024-03-12 14:52:35 +08:00
parent 93f86feb33
commit df07c79ac8
38 changed files with 571 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/PqTypicalSourceCreatePO.java
View File

@@ -153,6 +153,9 @@ public class PqTypicalSourceCreatePO {
@TableField("interferenceSourceCount")
private Integer interferenceSourceCount;
/**
* 计算日期
*/
private String computeDate;
}

4
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/RUploadEvaluationDataD.java
View File

@@ -130,5 +130,9 @@ public class RUploadEvaluationDataD {
*/
private Integer uploadStatus;
/**
* 计算日期
*/
private String computeDate;
}

4
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/RUploadPointStatisticalDataD.java
View File

@@ -130,4 +130,8 @@ public class RUploadPointStatisticalDataD {
* 上送状态(0:未上送 1:已上送)
*/
private Integer uploadStatus;
/**
* 计算日期
*/
private String computeDate;
}

5
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/RUploadSubstationStatisticalDataD.java
View File

@@ -109,10 +109,13 @@ public class RUploadSubstationStatisticalDataD {
@MppMultiId
private String statisticalType;
private String statisticalMonth;
/**
* 上送状态(0:未上送 1:已上送)
*/
private Integer uploadStatus;
/**
* 计算日期
*/
private String computeDate;
}

18
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java
View File

@@ -99,6 +99,9 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
if (Objects.equals(dataType, "02")) {
return DateUtil.format(DateUtil.beginOfMonth(DateUtil.parse(searchBeginTime, DatePattern.NORM_MONTH_PATTERN)), DatePattern.NORM_MONTH_PATTERN);
}
if (Objects.equals(dataType, "01")) {
return DateUtil.format(DateUtil.beginOfMonth(DateUtil.parse(searchBeginTime, DatePattern.NORM_YEAR_PATTERN)), DatePattern.NORM_YEAR_PATTERN);
}
return searchBeginTime;
}
@@ -144,22 +147,21 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
.in(PqTypicalSourceCreatePO::getStatisticalLevel, Stream.of("3","4").collect(Collectors.toList()))
.list();
}
List<PqTypicalSourceCreateDTO> dtoList = BeanUtil.copyToList(list, PqTypicalSourceCreateDTO.class);
//以尺寸100分片
List<List<PqTypicalSourceCreateDTO>> pendingIds = ListUtils.partition(dtoList, 100);
pendingIds.forEach(temp->{
List<List<PqTypicalSourceCreatePO>> partition = ListUtils.partition(list, 100);
partition.forEach(temp->{
List<PqTypicalSourceCreateDTO> dtoList = BeanUtil.copyToList(temp, PqTypicalSourceCreateDTO.class);
SendParam sendParam = new SendParam();
sendParam.setStats(temp);
sendParam.setStatisticalDate(temp.get(0).getStatisticalDate());
sendParam.setStats(dtoList);
sendParam.setStatisticalDate(temp.get(0).getComputeDate());
String s = JSONObject.toJSONStringWithDateFormat(sendParam, JSON.DEFFAULT_DATE_FORMAT);
log.info(Thread.currentThread().getName() + "获取返回体 换流站指标统计明细数据接口数据：" + s + "开始----！");
Map<String, String> send = GwSendUtil.send(sendParam, GWSendEnum.TYPICAL_SOURCE);
log.info(Thread.currentThread().getName() + "获取返回体换流站指标统计明细数据接口响应结果：" + send + "结束----！");
List<String> trIds = temp.stream().map(PqTypicalSourceCreateDTO::getId).distinct().collect(Collectors.toList());
List<String> trIds = dtoList.stream().map(PqTypicalSourceCreateDTO::getId).distinct().collect(Collectors.toList());
returnInformation(1, trIds, send);
});
return "成功";
}

14
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java
View File

@@ -94,19 +94,17 @@ public class PointStatisticalDataServiceImpl extends ServiceImpl<RUploadPointSta
}
list = list.stream().peek(item->item.setStationType(dictDataMap.get(item.getStationType()).getValue())).collect(Collectors.toList());
List<MonitorStatisticalDTO> dtoList = BeanUtil.copyToList(list, MonitorStatisticalDTO.class);
//以尺寸100分片
List<List<MonitorStatisticalDTO>> pendingIds = ListUtils.partition(dtoList, 100);
List<List<RUploadPointStatisticalDataD>> partition = ListUtils.partition(list, 100);
//分片上传
for (int i = 0; i < pendingIds.size(); i++) {
for (int i = 0; i < partition.size(); i++) {
List<MonitorStatisticalDTO> dtoList = BeanUtil.copyToList(partition.get(i), MonitorStatisticalDTO.class);
SendParam sp = new SendParam();
sp.setStats(pendingIds.get(i));
sp.setStatisticalDate(param.getTime());
sp.setStats(dtoList);
sp.setStatisticalDate(partition.get(i).get(0).getComputeDate());
//上送数据
Map<String, String> send = GwSendUtil.send(sp, GWSendEnum.STATISTICAL_CREATE);
//获取返回结果
List<String> l = pendingIds.get(i).stream().map(MonitorStatisticalDTO::getId).collect(Collectors.toList());
List<String> l = dtoList.stream().map(MonitorStatisticalDTO::getId).collect(Collectors.toList());
returnInformation(i,l,send);
}
return "上送成功:成功数据" + list.size() + "条";

31
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java
View File

@@ -107,49 +107,50 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
.in(RUploadEvaluationDataD::getStatisticalLevel, Stream.of("3","4").collect(Collectors.toList()))
.list();
}
List<PqEvaluationCreateDTO> dtoList = BeanUtil.copyToList(list, PqEvaluationCreateDTO.class);
//以尺寸100分片
List<List<PqEvaluationCreateDTO>> pendingIds = ListUtils.partition(dtoList, 100);
List<List<RUploadEvaluationDataD>> partition = ListUtils.partition(list, 100);
//分片上传
for (int i = 0; i < pendingIds.size(); i++) {
for (int i = 0; i < partition.size(); i++) {
//处理数据
List<PqEvaluationCreateDTO> l1 = pendingIds.get(i).stream().peek(item->{
if (Objects.equals(item.getAvgValue(),3.1415926)){
List<RUploadEvaluationDataD> collect = partition.get(i).stream().peek(item -> {
if (Objects.equals(item.getAvgValue(), 3.1415926)) {
item.setAvgValue(0d);
} else {
BigDecimal four = BigDecimal.valueOf(item.getAvgValue());
double value = four.setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue();
double value = four.setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue();
item.setAvgValue(value);
}
if (Objects.equals(item.getStandardDeviation(),3.1415926)){
if (Objects.equals(item.getStandardDeviation(), 3.1415926)) {
item.setStandardDeviation(0d);
}
if (Objects.equals(item.getHarmonicNum(),0)){
if (Objects.equals(item.getHarmonicNum(), 0)) {
item.setHarmonicNum(null);
}
if (Objects.equals(item.getVoltageLevel(),"0")){
if (Objects.equals(item.getVoltageLevel(), "0")) {
item.setVoltageLevel(null);
} else {
item.setVoltageLevel(getVoltage(item.getVoltageLevel()));
}
if (Objects.equals(item.getCityId(),"")){
if (Objects.equals(item.getCityId(), "")) {
item.setCityId(null);
}
if (Objects.equals(item.getCountyId(),"")){
if (Objects.equals(item.getCountyId(), "")) {
item.setCountyId(null);
}
BigDecimal four = BigDecimal.valueOf(item.getMonitorBusRate());
double value = four.setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue();
double value = four.setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue();
item.setMonitorBusRate(value);
}).collect(Collectors.toList());
List<PqEvaluationCreateDTO> dtoList = BeanUtil.copyToList(collect, PqEvaluationCreateDTO.class);
//组装数据
SendParam sp = new SendParam();
sp.setStats(l1);
sp.setStatisticalDate(param.getTime());
sp.setStats(dtoList);
sp.setStatisticalDate(collect.get(0).getComputeDate());
//上送数据
Map<String, String> send = GwSendUtil.send(sp, GWSendEnum.EVALUATION);
//获取返回结果
List<String> l = pendingIds.get(i).stream().map(PqEvaluationCreateDTO::getId).collect(Collectors.toList());
List<String> l = dtoList.stream().map(PqEvaluationCreateDTO::getId).collect(Collectors.toList());
returnInformation(i,l,send);
}
return "上送成功:成功数据" + list.size() + "条";

24
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java
View File

@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
@@ -12,6 +13,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.harmonic.mapper.upload.RUploadSubstationStatisticalDataDMapper;
import com.njcn.harmonic.pojo.dto.PqTypicalSourceCreateDTO;
import com.njcn.harmonic.pojo.dto.upload.SubstationQualityStatisticsDTO;
import com.njcn.harmonic.pojo.param.UploadDataParam;
import com.njcn.harmonic.pojo.param.UploadParam;
@@ -86,21 +88,21 @@ public class RSubstationStatisticalDataServiceImpl extends ServiceImpl<RUploadSu
//.eq(RUploadSubstationStatisticalDataD::getCountyId,"")
.list();
}
//处理时间
String[] arr = param.getTime().split("-");
String time = arr[0]+"-"+arr[1];
List<SubstationQualityStatisticsDTO> dtoList = BeanUtil.copyToList(list, SubstationQualityStatisticsDTO.class);
//以尺寸100分片
List<List<SubstationQualityStatisticsDTO>> pendingIds = ListUtils.partition(dtoList, 100);
List<List<RUploadSubstationStatisticalDataD>> partition = ListUtils.partition(list, 100);
//分片上传
for (int i = 0; i < pendingIds.size(); i++) {
for (int i = 0; i < partition.size(); i++) {
List<RUploadSubstationStatisticalDataD> collect = partition.get(i).stream().peek(item -> {
item.setStatisticalDate(item.getComputeDate().substring(0, 7));
}).collect(Collectors.toList());
List<SubstationQualityStatisticsDTO> dtoList = BeanUtil.copyToList(collect, SubstationQualityStatisticsDTO.class);
SendParam sp = new SendParam();
sp.setStats(pendingIds.get(i));
sp.setStatisticalDate(time);
sp.setStats(dtoList);
sp.setStatisticalDate(partition.get(i).get(0).getComputeDate());
//上送数据
Map<String, String> send = GwSendUtil.send(sp, GWSendEnum.SUBSTATION_MONITOR);
//获取返回结果
List<String> l = pendingIds.get(i).stream().map(SubstationQualityStatisticsDTO::getId).collect(Collectors.toList());
List<String> l = dtoList.stream().map(SubstationQualityStatisticsDTO::getId).collect(Collectors.toList());
returnInformation(i,l,send);
}
return "上送成功:成功数据" + list.size() + "条";
@@ -143,9 +145,7 @@ public class RSubstationStatisticalDataServiceImpl extends ServiceImpl<RUploadSu
if (Objects.equals(dataType, "02")) {
return DateUtil.format(DateUtil.beginOfMonth(DateUtil.parse(searchBeginTime, DatePattern.NORM_MONTH_PATTERN)), DatePattern.NORM_MONTH_PATTERN);
}else if(Objects.equals(dataType, "01")){
String year = DateUtil.format(DateUtil.parse(searchBeginTime,DatePattern.NORM_DATE_PATTERN),DatePattern.NORM_YEAR_PATTERN);
String month = DateUtil.format(new Date(),DatePattern.NORM_MONTH_PATTERN).split("-")[1];
return year+"-"+month;
return DateUtil.format(DateUtil.parse(searchBeginTime,DatePattern.NORM_DATE_PATTERN),DatePattern.NORM_YEAR_PATTERN);
}
return searchBeginTime;
}