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

暂降的有效监测点用在运监测点

Browse Source
This commit is contained in:
hzj
2024-02-26 16:18:23 +08:00
parent ebc623ff1d
commit 5577757d2e
4 changed files with 245 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicServiceImpl.java
View File

@@ -284,9 +284,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService {
eq("harmonic_type", dictData.getId()).
between("data_date",begin,end);
List<RStatHarmonicDPO> rStatHarmonicDPOList = rStatHarmonicDPOService.list(harmonicDPOQueryWrapper);
double asDouble = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurement).average().getAsDouble();
double asDouble = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurement).average().orElse(0.00);
asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
double asDouble1 = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurementRatio).average().getAsDouble();
double asDouble1 = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurementRatio).average().orElse(0.00);
asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
rStatHarmonicMPO.setOverLimitMeasurementAverage(asDouble);
Integer sum = rStatHarmonicDPOList.stream().mapToInt(RStatHarmonicDPO::getOverLimitMeasurement).sum();
@@ -359,9 +359,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService {
eq("harmonic_type", dictData.getId()).
between("data_date",begin,end);
List<RStatHarmonicDPO> rStatHarmonicDPOList = rStatHarmonicDPOService.list(harmonicDPOQueryWrapper);
double asDouble = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurement).average().getAsDouble();
double asDouble = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurement).average().orElse(0.00);
asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
double asDouble1 = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurementRatio).average().getAsDouble();
double asDouble1 = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurementRatio).average().orElse(0.00);
asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
rStatHarmonicMPO.setOverLimitMeasurementAverage(asDouble);
Integer sum = rStatHarmonicDPOList.stream().mapToInt(RStatHarmonicDPO::getOverLimitMeasurement).sum();
@@ -473,9 +473,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService {
eq("harmonic_type", dictData.getId()).
between("data_date",begin,end);
List<RStatHarmonicMPO> list = rStatHarmonicMPOService.list(harmonicMPOQueryWrapper);
double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().getAsDouble();
double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().orElse(0.00);
asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().getAsDouble();
double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().orElse(0.00);
asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
int sum1 = list.stream().mapToInt(RStatHarmonicMPO::getOverDay).sum();
rStatHarmonicQPO.setOverLimitMeasurementAverage(asDouble);
@@ -556,9 +556,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService {
eq("harmonic_type", dictData.getId()).
between("data_date",begin,end);
List<RStatHarmonicMPO> list = rStatHarmonicMPOService.list(harmonicMPOQueryWrapper);
double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().getAsDouble();
double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().orElse(0.00);
asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().getAsDouble();
double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().orElse(0.00);
asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
int sum1 = list.stream().mapToInt(RStatHarmonicMPO::getOverDay).sum();
rStatHarmonicQPO.setOverLimitMeasurementAverage(asDouble);
@@ -680,9 +680,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService {
eq("harmonic_type", dictData.getId()).
between("data_date",begin,end);
List<RStatHarmonicMPO> list = rStatHarmonicMPOService.list(harmonicMPOQueryWrapper);
double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().getAsDouble();
double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().orElse(0.00);
asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().getAsDouble();
double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().orElse(0.00);
asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
int sum1 = list.stream().mapToInt(RStatHarmonicMPO::getOverDay).sum();
rStatHarmonicYPO.setOverLimitMeasurementAverage(asDouble);
@@ -763,9 +763,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService {
eq("harmonic_type", dictData.getId()).
between("data_date",begin,end);
List<RStatHarmonicMPO> list = rStatHarmonicMPOService.list(harmonicMPOQueryWrapper);
double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().getAsDouble();
double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().orElse(0.00);
asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().getAsDouble();
double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().orElse(0.00);
asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
int sum1 = list.stream().mapToInt(RStatHarmonicMPO::getOverDay).sum();
rStatHarmonicYPO.setOverLimitMeasurementAverage(asDouble);
@@ -912,9 +912,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService {
eq("harmonic_type", dictData.getId()).
eq("QUARTER( data_date)", PublicUtil.getNowQuarter (dataDate));
List<RStatHarmonicMPO> list = rStatHarmonicMPOService.list(harmonicMPOQueryWrapper);
double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().getAsDouble();
double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().orElse(0.00);
asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().getAsDouble();
double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().orElse(0.00);
asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
int sum1 = list.stream().mapToInt(RStatHarmonicMPO::getOverDay).sum();
rStatHarmonicYPO.setOverLimitMeasurementAverage(asDouble);
@@ -995,9 +995,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService {
eq("harmonic_type", dictData.getId()).
eq("QUARTER( data_date)", PublicUtil.getNowQuarter (dataDate));
List<RStatHarmonicMPO> list = rStatHarmonicMPOService.list(harmonicMPOQueryWrapper);
double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().getAsDouble();
double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().orElse(0.00);
asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().getAsDouble();
double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().orElse(0.00);
asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
int sum1 = list.stream().mapToInt(RStatHarmonicMPO::getOverDay).sum();
rStatHarmonicYPO.setOverLimitMeasurementAverage(asDouble);
@@ -1115,9 +1115,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService {
eq("harmonic_type", dictData.getId()).
eq("QUARTER( data_date)", PublicUtil.getNowQuarter (dataDate));
List<RStatHarmonicMPO> list = rStatHarmonicMPOService.list(harmonicMPOQueryWrapper);
double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().getAsDouble();
double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().orElse(0.00);
asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().getAsDouble();
double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().orElse(0.00);
asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
int sum1 = list.stream().mapToInt(RStatHarmonicMPO::getOverDay).sum();
rStatHarmonicQPO.setOverLimitMeasurementAverage(asDouble);
@@ -1198,9 +1198,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService {
eq("harmonic_type", dictData.getId()).
eq("QUARTER( data_date)", PublicUtil.getNowQuarter (dataDate));
List<RStatHarmonicMPO> list = rStatHarmonicMPOService.list(harmonicMPOQueryWrapper);
double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().getAsDouble();
double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().orElse(0.00);
asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().getAsDouble();
double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().orElse(0.00);
asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
int sum1 = list.stream().mapToInt(RStatHarmonicMPO::getOverDay).sum();
rStatHarmonicQPO.setOverLimitMeasurementAverage(asDouble);
@@ -1318,9 +1318,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService {
eq("harmonic_type", dictData.getId()).
eq("DATE_FORMAT( data_date ,'%Y-%m')",dataDate.substring(0, 7));
List<RStatHarmonicDPO> rStatHarmonicDPOList = rStatHarmonicDPOService.list(harmonicDPOQueryWrapper);
double asDouble = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurement).average().getAsDouble();
double asDouble = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurement).average().orElse(0.00);
asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
double asDouble1 = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurementRatio).average().getAsDouble();
double asDouble1 = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurementRatio).average().orElse(0.00);
asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
rStatHarmonicMPO.setOverLimitMeasurementAverage(asDouble);
double sum = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurement).sum();
@@ -1393,9 +1393,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService {
eq("harmonic_type", dictData.getId()).
eq("DATE_FORMAT( data_date ,'%Y-%m')",dataDate.substring(0, 7));
List<RStatHarmonicDPO> rStatHarmonicDPOList = rStatHarmonicDPOService.list(harmonicDPOQueryWrapper);
double asDouble = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurement).average().getAsDouble();
double asDouble = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurement).average().orElse(0.00);
asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
double asDouble1 = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurementRatio).average().getAsDouble();
double asDouble1 = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurementRatio).average().orElse(0.00);
asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue();
rStatHarmonicMPO.setOverLimitMeasurementAverage(asDouble);
double sum = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurement).sum();

118
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RStatEventOrgServiceImpl.java
View File

@@ -6,16 +6,13 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.date.LocalDateTimeUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
import com.njcn.harmonic.pojo.po.RStatOrgMPO;
import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
import com.njcn.prepare.harmonic.mapper.mysql.area.RStatOrgDMapper;
import com.njcn.prepare.harmonic.mapper.mysql.area.RStatOrgMMapper;
import com.njcn.prepare.harmonic.mapper.mysql.area.RStatOrgQMapper;
import com.njcn.prepare.harmonic.mapper.mysql.area.RStatOrgYMapper;
import com.njcn.prepare.harmonic.mapper.mysql.newalgorithm.*;
import com.njcn.prepare.harmonic.pojo.mysql.po.RStatHarmonicDPO;
import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
import com.njcn.prepare.harmonic.pojo.mysql.po.RStatOrgQPO;
import com.njcn.prepare.harmonic.pojo.mysql.po.RStatOrgYPO;
import com.njcn.prepare.harmonic.pojo.po.*;
@@ -25,7 +22,6 @@ import com.njcn.system.enums.DicDataEnum;
import com.njcn.system.enums.DicDataTypeEnum;
import com.njcn.system.pojo.po.DictData;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -33,9 +29,7 @@ import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -103,7 +97,7 @@ public class RStatEventOrgServiceImpl implements RStatEventOrgService {
@Override
public void handleDay(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
List<RStatEventOrgDPO> rStatEventOrgDPOS = new ArrayList<>();
DecimalFormat df = new DecimalFormat("0.00");
DecimalFormat df = new DecimalFormat("0.00000");
LocalDate localDate = LocalDateTimeUtil.parseDate(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN);
QueryWrapper<RStatEventDPO> queryWrapper = new QueryWrapper<>();
@@ -116,13 +110,13 @@ public class RStatEventOrgServiceImpl implements RStatEventOrgService {
calculatedParam.getIdList().forEach(deptGetChildrenMoreDTO -> {
int sumEffectiveMeasurement =0;
List<RStatOrgDVO> rStatOrgDVOS = rStatOrgDMapper.listAll( LocalDateTimeUtil.format(localDate,DatePattern.NORM_DATE_PATTERN), deptGetChildrenMoreDTO.getUnitId());
if(CollectionUtils.isEmpty(rStatOrgDVOS)){
sumEffectiveMeasurement=0;
}else {
sumEffectiveMeasurement = rStatOrgDVOS.stream().mapToInt(RStatOrgDVO::getEffectiveMeasurement).sum();
}
int finalSumEffectiveMeasurement = sumEffectiveMeasurement;
// List<RStatOrgDVO> rStatOrgDVOS = rStatOrgDMapper.listAll( LocalDateTimeUtil.format(localDate,DatePattern.NORM_DATE_PATTERN), deptGetChildrenMoreDTO.getUnitId());
// if(CollectionUtils.isEmpty(rStatOrgDVOS)){
// sumEffectiveMeasurement=0;
// }else {
// sumEffectiveMeasurement = rStatOrgDVOS.stream().mapToInt(RStatOrgDVO::getEffectiveMeasurement).sum();
// }
// int finalSumEffectiveMeasurement = sumEffectiveMeasurement;
dataTypeMap.forEach((k, v)->{
eventStatis.forEach(dictData -> {
if (Objects.equals(dictData.getCode(), DicDataEnum.DISTURBANCE.getCode())
@@ -156,10 +150,10 @@ public class RStatEventOrgServiceImpl implements RStatEventOrgService {
rStatEventOrgDPO.setEventMeasurement(sum_event_measurement);
rStatEventOrgDPO.setEventCount(sum_event_count);
rStatEventOrgDPO.setDataType(v.getId());
if (finalSumEffectiveMeasurement == 0) {
rStatEventOrgDPO.setEventMeasurementRatio(0.00f);
if (deptGetChildrenMoreDTO.getLineBaseList().size() == 0) {
rStatEventOrgDPO.setEventMeasurementRatio(0.0000f);
} else {
String value = df.format(((float)sum_event_measurement)/ finalSumEffectiveMeasurement);
String value = df.format(((float)sum_event_measurement)/ deptGetChildrenMoreDTO.getLineBaseList().size());
rStatEventOrgDPO.setEventMeasurementRatio(Float.parseFloat(value));
}
@@ -177,7 +171,7 @@ public class RStatEventOrgServiceImpl implements RStatEventOrgService {
public void handleMonth(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
List<RStatEventOrgMPO> rStatEventOrgMPOS = new ArrayList<>();
DecimalFormat df = new DecimalFormat("0.00");
DecimalFormat df = new DecimalFormat("0.00000");
DateTime begin = DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
DateTime end = DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
LocalDate localDate = LocalDateTimeUtil.parseDate( DateUtil.format(begin, DatePattern.NORM_DATE_PATTERN), DatePattern.NORM_DATE_PATTERN);
@@ -194,18 +188,18 @@ public class RStatEventOrgServiceImpl implements RStatEventOrgService {
Map<String, DictData> dataTypeMap = dataTypeList.stream().collect(Collectors.toMap(DictData::getCode, dictData -> dictData));
calculatedParam.getIdList().forEach(deptGetChildrenMoreDTO -> {
int sumEffectiveMeasurement =0;
rStatOrgMPOQueryWrapper.clear();
rStatOrgMPOQueryWrapper.select("IFNULL(effective_measurement_accrued,0) effective_measurement_accrued").
eq("org_no",deptGetChildrenMoreDTO.getUnitId()).
between("data_date",begin,end);
List<RStatOrgMPO> rStatOrgMPOS = rStatOrgMMapper.selectList(rStatOrgMPOQueryWrapper);
if(CollectionUtils.isEmpty(rStatOrgMPOS)){
sumEffectiveMeasurement=0;
}else {
sumEffectiveMeasurement = rStatOrgMPOS.stream().mapToInt(RStatOrgMPO::getEffectiveMeasurementAccrued).sum();
}
int finalSumEffectiveMeasurement = sumEffectiveMeasurement;
// int sumEffectiveMeasurement =0;
// rStatOrgMPOQueryWrapper.clear();
// rStatOrgMPOQueryWrapper.select("IFNULL(effective_measurement_accrued,0) effective_measurement_accrued").
// eq("org_no",deptGetChildrenMoreDTO.getUnitId()).
// between("data_date",begin,end);
// List<RStatOrgMPO> rStatOrgMPOS = rStatOrgMMapper.selectList(rStatOrgMPOQueryWrapper);
// if(CollectionUtils.isEmpty(rStatOrgMPOS)){
// sumEffectiveMeasurement=0;
// }else {
// sumEffectiveMeasurement = rStatOrgMPOS.stream().mapToInt(RStatOrgMPO::getEffectiveMeasurementAccrued).sum();
// }
// int finalSumEffectiveMeasurement = sumEffectiveMeasurement;
dataTypeMap.forEach((k, v)->{
eventStatis.forEach(dictData -> {
@@ -267,10 +261,10 @@ public class RStatEventOrgServiceImpl implements RStatEventOrgService {
rStatEventOrgMPO.setEventMeasurementRatioAverage(Float.parseFloat( df.format(asDouble)));
if (finalSumEffectiveMeasurement == 0) {
if (deptGetChildrenMoreDTO.getLineBaseList().size() == 0) {
rStatEventOrgMPO.setEventMeasurementRatioAccrued(0.00f);
} else {
String value = df.format(((float)sum_event_measurement)/ finalSumEffectiveMeasurement);
String value = df.format(((float)sum_event_measurement)/ deptGetChildrenMoreDTO.getLineBaseList().size());
rStatEventOrgMPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
}
@@ -288,7 +282,7 @@ public class RStatEventOrgServiceImpl implements RStatEventOrgService {
public void handleQtr(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
List<RStatEventOrgQPO> rStatEventOrgQPOS = new ArrayList<>();
DecimalFormat df = new DecimalFormat("0.00");
DecimalFormat df = new DecimalFormat("0.00000");
DateTime begin = DateUtil.beginOfQuarter(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
DateTime end = DateUtil.endOfQuarter(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
@@ -307,18 +301,18 @@ public class RStatEventOrgServiceImpl implements RStatEventOrgService {
Map<String, DictData> dataTypeMap = dataTypeList.stream().collect(Collectors.toMap(DictData::getCode, dictData -> dictData));
calculatedParam.getIdList().forEach(deptGetChildrenMoreDTO -> {
int sumEffectiveMeasurement =0;
rStatOrgQPOQueryWrapper.clear();
rStatOrgQPOQueryWrapper.select("IFNULL(effective_measurement_accrued,0) effective_measurement_accrued").
eq("org_no",deptGetChildrenMoreDTO.getUnitId()).
between("data_date",begin,end);
List<RStatOrgQPO> rStatOrgQPOS = rStatOrgQMapper.selectList(rStatOrgQPOQueryWrapper);
if(CollectionUtils.isEmpty(rStatOrgQPOS)){
sumEffectiveMeasurement=0;
}else {
sumEffectiveMeasurement = rStatOrgQPOS.stream().mapToInt(RStatOrgQPO::getEffectiveMeasurementAccrued).sum();
}
int finalSumEffectiveMeasurement = sumEffectiveMeasurement;
// int sumEffectiveMeasurement =0;
// rStatOrgQPOQueryWrapper.clear();
// rStatOrgQPOQueryWrapper.select("IFNULL(effective_measurement_accrued,0) effective_measurement_accrued").
// eq("org_no",deptGetChildrenMoreDTO.getUnitId()).
// between("data_date",begin,end);
// List<RStatOrgQPO> rStatOrgQPOS = rStatOrgQMapper.selectList(rStatOrgQPOQueryWrapper);
// if(CollectionUtils.isEmpty(rStatOrgQPOS)){
// sumEffectiveMeasurement=0;
// }else {
// sumEffectiveMeasurement = rStatOrgQPOS.stream().mapToInt(RStatOrgQPO::getEffectiveMeasurementAccrued).sum();
// }
// int finalSumEffectiveMeasurement = sumEffectiveMeasurement;
dataTypeMap.forEach((k, v)->{
eventStatis.forEach(dictData -> {
@@ -381,10 +375,10 @@ public class RStatEventOrgServiceImpl implements RStatEventOrgService {
rStatEventOrgQPO.setEventMeasurementAccrued(sum_event_measurement);
rStatEventOrgQPO.setEventCount(event_count);
rStatEventOrgQPO.setEventMeasurementRatioAverage(Float.parseFloat( df.format(event_measurement_ratio_average)));
if (finalSumEffectiveMeasurement == 0) {
if (deptGetChildrenMoreDTO.getLineBaseList().size() == 0) {
rStatEventOrgQPO.setEventMeasurementRatioAccrued(0.00f);
} else {
String value = df.format(((float)sum_event_measurement)/ finalSumEffectiveMeasurement);
String value = df.format(((float)sum_event_measurement)/ deptGetChildrenMoreDTO.getLineBaseList().size() );
rStatEventOrgQPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
}
if (event_measurement_all == 0) {
@@ -428,18 +422,18 @@ public class RStatEventOrgServiceImpl implements RStatEventOrgService {
Map<String, DictData> dataTypeMap = dataTypeList.stream().collect(Collectors.toMap(DictData::getCode, dictData -> dictData));
calculatedParam.getIdList().forEach(deptGetChildrenMoreDTO -> {
int sumEffectiveMeasurement =0;
rStatOrgYPOQueryWrapper.clear();
rStatOrgYPOQueryWrapper.select("IFNULL(effective_measurement_accrued,0) effective_measurement_accrued").
eq("org_no",deptGetChildrenMoreDTO.getUnitId()).
between("data_date",begin,end);
List<RStatOrgYPO> rStatOrgYPOS = rStatOrgYMapper.selectList(rStatOrgYPOQueryWrapper);
if(CollectionUtils.isEmpty(rStatOrgYPOS)){
sumEffectiveMeasurement=0;
}else {
sumEffectiveMeasurement = rStatOrgYPOS.stream().mapToInt(RStatOrgYPO::getEffectiveMeasurementAccrued).sum();
}
int finalSumEffectiveMeasurement = sumEffectiveMeasurement;
// int sumEffectiveMeasurement =0;
// rStatOrgYPOQueryWrapper.clear();
// rStatOrgYPOQueryWrapper.select("IFNULL(effective_measurement_accrued,0) effective_measurement_accrued").
// eq("org_no",deptGetChildrenMoreDTO.getUnitId()).
// between("data_date",begin,end);
// List<RStatOrgYPO> rStatOrgYPOS = rStatOrgYMapper.selectList(rStatOrgYPOQueryWrapper);
// if(CollectionUtils.isEmpty(rStatOrgYPOS)){
// sumEffectiveMeasurement=0;
// }else {
// sumEffectiveMeasurement = rStatOrgYPOS.stream().mapToInt(RStatOrgYPO::getEffectiveMeasurementAccrued).sum();
// }
// int finalSumEffectiveMeasurement = sumEffectiveMeasurement;
dataTypeMap.forEach((k, v)->{
eventStatis.forEach(dictData -> {
@@ -502,10 +496,10 @@ public class RStatEventOrgServiceImpl implements RStatEventOrgService {
rStatEventOrgYPO.setEventMeasurementAccrued(sum_event_measurement);
rStatEventOrgYPO.setEventCount(event_count);
rStatEventOrgYPO.setEventMeasurementRatioAverage(Float.parseFloat( df.format(event_measurement_ratio_average)));
if (finalSumEffectiveMeasurement == 0) {
if (deptGetChildrenMoreDTO.getLineBaseList().size() == 0) {
rStatEventOrgYPO.setEventMeasurementRatioAccrued(0.00f);
} else {
String value = df.format(((float)sum_event_measurement)/ finalSumEffectiveMeasurement);
String value = df.format(((float)sum_event_measurement)/ deptGetChildrenMoreDTO.getLineBaseList().size() );
rStatEventOrgYPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
}
if (event_measurement_all == 0) {

210
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RStatEventServiceImpl.java
View File

@@ -5,14 +5,12 @@ import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.date.LocalDateTimeUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
import com.njcn.harmonic.pojo.po.RMpEventDetailDPO;
import com.njcn.harmonic.pojo.po.RMpEventDetailMPO;
import com.njcn.harmonic.pojo.po.RStatOrgDPO;
import com.njcn.harmonic.pojo.po.RStatOrgMPO;
import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
import com.njcn.prepare.harmonic.mapper.mysql.area.RStatOrgDMapper;
import com.njcn.prepare.harmonic.mapper.mysql.area.RStatOrgMMapper;
import com.njcn.prepare.harmonic.mapper.mysql.area.RStatOrgQMapper;
@@ -21,9 +19,13 @@ import com.njcn.prepare.harmonic.mapper.mysql.line.RMpEventDetailDMapper;
import com.njcn.prepare.harmonic.mapper.mysql.line.RMpEventDetailMMapper;
import com.njcn.prepare.harmonic.mapper.mysql.newalgorithm.RStatEventDPOMapper;
import com.njcn.prepare.harmonic.mapper.mysql.newalgorithm.RStatEventMPOMapper;
import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
import com.njcn.prepare.harmonic.pojo.mysql.po.RStatOrgQPO;
import com.njcn.prepare.harmonic.pojo.mysql.po.RStatOrgYPO;
import com.njcn.prepare.harmonic.pojo.po.*;
import com.njcn.prepare.harmonic.pojo.po.RStatEventDPO;
import com.njcn.prepare.harmonic.pojo.po.RStatEventMPO;
import com.njcn.prepare.harmonic.pojo.po.RStatEventQPO;
import com.njcn.prepare.harmonic.pojo.po.RStatEventYPO;
import com.njcn.prepare.harmonic.service.mysql.newalgorithm.*;
import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.enums.DicDataEnum;
@@ -82,7 +84,7 @@ public class RStatEventServiceImpl implements RStatEventService {
@Override
public void handleDay(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
List<RStatEventDPO> rStatEventDPOList = new ArrayList<>();
DecimalFormat df = new DecimalFormat("0.00");
DecimalFormat df = new DecimalFormat("0.00000");
LocalDate localDate = LocalDateTimeUtil.parseDate(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN);
@@ -139,16 +141,16 @@ public class RStatEventServiceImpl implements RStatEventService {
rStatEventDPO.setEventMeasurement(transientStatisData.get(0));
rStatEventDPO.setEventCount(transientStatisData.get(1));
rStatEventDPO.setDataType(dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId());
if (Objects.isNull(rStatOrgDPO)) {
rStatEventDPO.setEventMeasurementRatio(0.00f);
} else {
if (rStatOrgDPO.getEffectiveMeasurement() == 0) {
rStatEventDPO.setEventMeasurementRatio(0.00f);
} else {
String value = df.format(rStatEventDPO.getEventMeasurement() / rStatOrgDPO.getEffectiveMeasurement().floatValue());
// if (Objects.isNull(rStatOrgDPO)) {
// rStatEventDPO.setEventMeasurementRatio(0.00f);
// } else {
// if (rStatOrgDPO.getEffectiveMeasurement() == 0) {
// rStatEventDPO.setEventMeasurementRatio(0.00f);
// } else {
String value = df.format(Double.valueOf(rStatEventDPO.getEventMeasurement()) / collect1.size());
rStatEventDPO.setEventMeasurementRatio(Float.parseFloat(value));
}
}
// }
// }
rStatEventDPOList.add(rStatEventDPO);
}
@@ -193,16 +195,16 @@ public class RStatEventServiceImpl implements RStatEventService {
rStatEventDPO.setEventMeasurement(transientStatisData.get(0));
rStatEventDPO.setEventCount(transientStatisData.get(1));
rStatEventDPO.setDataType(dataTypeMap.get(DicDataEnum.DISTRIBUTION_POINT.getCode()).getId());
if (Objects.isNull(rStatOrgDPO)) {
rStatEventDPO.setEventMeasurementRatio(0.00f);
} else {
if (rStatOrgDPO.getEffectiveMeasurement() == 0) {
rStatEventDPO.setEventMeasurementRatio(0.00f);
} else {
String value = df.format(rStatEventDPO.getEventMeasurement() / rStatOrgDPO.getEffectiveMeasurement().floatValue());
// if (Objects.isNull(rStatOrgDPO)) {
// rStatEventDPO.setEventMeasurementRatio(0.00f);
// } else {
// if (rStatOrgDPO.getEffectiveMeasurement() == 0) {
// rStatEventDPO.setEventMeasurementRatio(0.00f);
// } else {
String value = df.format(Double.valueOf(rStatEventDPO.getEventMeasurement()) / collect1.size());
rStatEventDPO.setEventMeasurementRatio(Float.parseFloat(value));
}
}
// }
// }
rStatEventDPOList.add(rStatEventDPO);
}
);
@@ -218,7 +220,7 @@ public class RStatEventServiceImpl implements RStatEventService {
@Override
public void handleMonth(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
List<RStatEventMPO> rStatEventMPOList = new ArrayList<>();
DecimalFormat df = new DecimalFormat("0.00");
DecimalFormat df = new DecimalFormat("0.00000");
DateTime begin = DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
DateTime end = DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
@@ -257,13 +259,13 @@ public class RStatEventServiceImpl implements RStatEventService {
between("data_date",begin,end);
List<RMpEventDetailMPO> rMpEventDetailMPOS = rMpEventDetailMMapper.selectList(rMpEventDetailMPOQueryWrapper);
rStatOrgMPOQueryWrapper.clear();
rStatOrgMPOQueryWrapper.select("effective_measurement_accrued").
eq("org_no", deptGetChildrenMoreDTO.getUnitId()).
eq("measurement_type_class", k).
eq("data_type", dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId()).
between("data_date",begin,end);
RStatOrgMPO rStatOrgMPO = rStatOrgMMapper.selectOne(rStatOrgMPOQueryWrapper);
// rStatOrgMPOQueryWrapper.clear();
// rStatOrgMPOQueryWrapper.select("effective_measurement_accrued").
// eq("org_no", deptGetChildrenMoreDTO.getUnitId()).
// eq("measurement_type_class", k).
// eq("data_type", dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId()).
// between("data_date",begin,end);
// RStatOrgMPO rStatOrgMPO = rStatOrgMMapper.selectOne(rStatOrgMPOQueryWrapper);
//天表
rStatEventDPOQueryWrapper.clear();
@@ -318,16 +320,16 @@ public class RStatEventServiceImpl implements RStatEventService {
String value = df.format(sumEC.get(dictData.getId()) / sumEM.get(dictData.getId()).floatValue());
rStatEventMPO.setEventFreq(Float.parseFloat(value));
}
if (Objects.isNull(rStatOrgMPO)) {
rStatEventMPO.setEventMeasurementRatioAccrued(0.00f);
} else {
if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) {
rStatEventMPO.setEventMeasurementRatioAccrued(0.00f);
} else {
String value = df.format(statisData / rStatOrgMPO.getEffectiveMeasurementAccrued().floatValue());
// if (Objects.isNull(rStatOrgMPO)) {
// rStatEventMPO.setEventMeasurementRatioAccrued(0.00f);
// } else {
// if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) {
// rStatEventMPO.setEventMeasurementRatioAccrued(0.00f);
// } else {
String value = df.format(Double.valueOf(statisData) / collect1.size());
rStatEventMPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
}
}
// }
// }
rStatEventMPOList.add(rStatEventMPO);
});
});
@@ -408,16 +410,16 @@ public class RStatEventServiceImpl implements RStatEventService {
String value = df.format(sumEC.get(dictData.getId()) / sumEM.get(dictData.getId()).floatValue());
rStatEventMPO.setEventFreq(Float.parseFloat(value));
}
if (Objects.isNull(rStatOrgMPO)) {
rStatEventMPO.setEventMeasurementRatioAccrued(0.00f);
} else {
if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) {
rStatEventMPO.setEventMeasurementRatioAccrued(0.00f);
} else {
String value = df.format(statisData / rStatOrgMPO.getEffectiveMeasurementAccrued().floatValue());
// if (Objects.isNull(rStatOrgMPO)) {
// rStatEventMPO.setEventMeasurementRatioAccrued(0.00f);
// } else {
// if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) {
// rStatEventMPO.setEventMeasurementRatioAccrued(0.00f);
// } else {
String value = df.format(Double.valueOf(statisData) / collect1.size());
rStatEventMPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
}
}
// }
// }
rStatEventMPOList.add(rStatEventMPO);
});
});
@@ -432,7 +434,7 @@ public class RStatEventServiceImpl implements RStatEventService {
@Override
public void handleQtr(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
List<RStatEventQPO> rStatEventQPOList = new ArrayList<>();
DecimalFormat df = new DecimalFormat("0.00");
DecimalFormat df = new DecimalFormat("0.00000");
DateTime begin = DateUtil.beginOfQuarter(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
DateTime end = DateUtil.endOfQuarter(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
@@ -474,15 +476,15 @@ public class RStatEventServiceImpl implements RStatEventService {
between("data_date", begin, end);
List<RMpEventDetailMPO> rMpEventDetailMPOS = rMpEventDetailMMapper.selectList(rMpEventDetailMPOQueryWrapper);
//季表
rStatOrgQPOQueryWrapper.clear();
rStatOrgQPOQueryWrapper.select("effective_measurement_accrued").
eq("org_no", deptGetChildrenMoreDTO.getUnitId()).
eq("measurement_type_class", k).
eq("data_type", dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId()).
between("data_date", begin, end);
;
RStatOrgQPO rStatOrgQPO = rStatOrgQMapper.selectOne(rStatOrgQPOQueryWrapper);
// //季表
// rStatOrgQPOQueryWrapper.clear();
// rStatOrgQPOQueryWrapper.select("effective_measurement_accrued").
// eq("org_no", deptGetChildrenMoreDTO.getUnitId()).
// eq("measurement_type_class", k).
// eq("data_type", dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId()).
// between("data_date", begin, end);
// ;
// RStatOrgQPO rStatOrgQPO = rStatOrgQMapper.selectOne(rStatOrgQPOQueryWrapper);
//天表
rStatEventDPOQueryWrapper.clear();
@@ -551,16 +553,16 @@ public class RStatEventServiceImpl implements RStatEventService {
String value = df.format(sumEC.get(dictData.getId()) / sumEM.get(dictData.getId()).floatValue());
rStatEventQPO.setEventFreq(Float.parseFloat(value));
}
if (Objects.isNull(rStatOrgQPO)) {
rStatEventQPO.setEventMeasurementRatioAccrued(0.00f);
} else {
if (rStatOrgQPO.getEffectiveMeasurementAccrued() == 0) {
rStatEventQPO.setEventMeasurementRatioAccrued(0.00f);
} else {
String value = df.format(statisData / rStatOrgQPO.getEffectiveMeasurementAccrued().floatValue());
// if (Objects.isNull(rStatOrgQPO)) {
// rStatEventQPO.setEventMeasurementRatioAccrued(0.00f);
// } else {
// if (rStatOrgQPO.getEffectiveMeasurementAccrued() == 0) {
// rStatEventQPO.setEventMeasurementRatioAccrued(0.00f);
// } else {
String value = df.format(Double.valueOf(statisData) / collect1.size());
rStatEventQPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
}
}
// }
// }
rStatEventQPOList.add(rStatEventQPO);
});
});
@@ -655,16 +657,16 @@ public class RStatEventServiceImpl implements RStatEventService {
String value = df.format(sumEC.get(dictData.getId()) / sumEM.get(dictData.getId()).floatValue());
rStatEventQPO.setEventFreq(Float.parseFloat(value));
}
if (Objects.isNull(rStatOrgQPO)) {
rStatEventQPO.setEventMeasurementRatioAccrued(0.00f);
} else {
if (rStatOrgQPO.getEffectiveMeasurementAccrued() == 0) {
rStatEventQPO.setEventMeasurementRatioAccrued(0.00f);
} else {
String value = df.format(statisData / rStatOrgQPO.getEffectiveMeasurementAccrued().floatValue());
// if (Objects.isNull(rStatOrgQPO)) {
// rStatEventQPO.setEventMeasurementRatioAccrued(0.00f);
// } else {
// if (rStatOrgQPO.getEffectiveMeasurementAccrued() == 0) {
// rStatEventQPO.setEventMeasurementRatioAccrued(0.00f);
// } else {
String value = df.format(Double.valueOf(statisData) / collect1.size());
rStatEventQPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
}
}
// }
// }
rStatEventQPOList.add(rStatEventQPO);
});
});
@@ -680,7 +682,7 @@ public class RStatEventServiceImpl implements RStatEventService {
@Override
public void handleYear(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
List<RStatEventYPO> rStatEventYPOList = new ArrayList<>();
DecimalFormat df = new DecimalFormat("0.00");
DecimalFormat df = new DecimalFormat("0.00000");
DateTime begin = DateUtil.beginOfYear(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
DateTime end = DateUtil.endOfYear(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
@@ -721,15 +723,15 @@ public class RStatEventServiceImpl implements RStatEventService {
between("data_date", begin, end);
List<RMpEventDetailMPO> rMpEventDetailMPOS = rMpEventDetailMMapper.selectList(rMpEventDetailMPOQueryWrapper);
//年表
rStatOrgYPOQueryWrapper.clear();
rStatOrgYPOQueryWrapper.select("effective_measurement_accrued").
eq("org_no", deptGetChildrenMoreDTO.getUnitId()).
eq("measurement_type_class", k).
eq("data_type", dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId()).
between("data_date", begin, end);
RStatOrgYPO rStatOrgYPO = rStatOrgYMapper.selectOne(rStatOrgYPOQueryWrapper);
// //年表
// rStatOrgYPOQueryWrapper.clear();
// rStatOrgYPOQueryWrapper.select("effective_measurement_accrued").
// eq("org_no", deptGetChildrenMoreDTO.getUnitId()).
// eq("measurement_type_class", k).
// eq("data_type", dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId()).
// between("data_date", begin, end);
//
// RStatOrgYPO rStatOrgYPO = rStatOrgYMapper.selectOne(rStatOrgYPOQueryWrapper);
//天表
rStatEventDPOQueryWrapper.clear();
@@ -798,16 +800,16 @@ public class RStatEventServiceImpl implements RStatEventService {
String value = df.format(sumEC.get(dictData.getId()) / sumEM.get(dictData.getId()).floatValue());
rStatEventYPO.setEventFreq(Float.parseFloat(value));
}
if (Objects.isNull(rStatOrgYPO)) {
rStatEventYPO.setEventMeasurementRatioAccrued(0.00f);
} else {
if (rStatOrgYPO.getEffectiveMeasurementAccrued() == 0) {
rStatEventYPO.setEventMeasurementRatioAccrued(0.00f);
} else {
String value = df.format(statisData / rStatOrgYPO.getEffectiveMeasurementAccrued().floatValue());
// if (Objects.isNull(rStatOrgYPO)) {
// rStatEventYPO.setEventMeasurementRatioAccrued(0.00f);
// } else {
// if (rStatOrgYPO.getEffectiveMeasurementAccrued() == 0) {
// rStatEventYPO.setEventMeasurementRatioAccrued(0.00f);
// } else {
String value = df.format(Double.valueOf(statisData) / collect1.size());
rStatEventYPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
}
}
// }
// }
rStatEventYPOList.add(rStatEventYPO);
});
});
@@ -903,16 +905,16 @@ public class RStatEventServiceImpl implements RStatEventService {
String value = df.format(sumEC.get(dictData.getId()) / sumEM.get(dictData.getId()).floatValue());
rStatEventYPO.setEventFreq(Float.parseFloat(value));
}
if (Objects.isNull(rStatOrgYPO)) {
rStatEventYPO.setEventMeasurementRatioAccrued(0.00f);
} else {
if (rStatOrgYPO.getEffectiveMeasurementAccrued() == 0) {
rStatEventYPO.setEventMeasurementRatioAccrued(0.00f);
} else {
String value = df.format(statisData / rStatOrgYPO.getEffectiveMeasurementAccrued().floatValue());
// if (Objects.isNull(rStatOrgYPO)) {
// rStatEventYPO.setEventMeasurementRatioAccrued(0.00f);
// } else {
// if (rStatOrgYPO.getEffectiveMeasurementAccrued() == 0) {
// rStatEventYPO.setEventMeasurementRatioAccrued(0.00f);
// } else {
String value = df.format(Double.valueOf(statisData) / collect1.size());
rStatEventYPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
}
}
// }
// }
rStatEventYPOList.add(rStatEventYPO);
});
});

119
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RStatEventVoltageServiceImpl.java
View File

@@ -8,21 +8,22 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
import com.njcn.harmonic.pojo.po.*;
import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
import com.njcn.prepare.harmonic.mapper.mysql.area.RStatOrgDMapper;
import com.njcn.prepare.harmonic.mapper.mysql.area.RStatOrgMMapper;
import com.njcn.prepare.harmonic.mapper.mysql.line.RMpEventDetailDMapper;
import com.njcn.prepare.harmonic.mapper.mysql.line.RMpEventDetailMMapper;
import com.njcn.prepare.harmonic.mapper.mysql.newalgorithm.RStatEventDPOMapper;
import com.njcn.prepare.harmonic.mapper.mysql.newalgorithm.RStatEventVoltageDPOMapper;
import com.njcn.prepare.harmonic.pojo.mysql.RMpEventDetailPO;
import com.njcn.prepare.harmonic.pojo.po.*;
import com.njcn.prepare.harmonic.service.mysql.newalgorithm.*;
import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
import com.njcn.prepare.harmonic.pojo.po.RMpEventDetailDNewPO;
import com.njcn.prepare.harmonic.pojo.po.RStatEventVoltageDPO;
import com.njcn.prepare.harmonic.pojo.po.RStatEventVoltageMPO;
import com.njcn.prepare.harmonic.service.mysql.newalgorithm.RStatEventVoltageDPOService;
import com.njcn.prepare.harmonic.service.mysql.newalgorithm.RStatEventVoltageMPOService;
import com.njcn.prepare.harmonic.service.mysql.newalgorithm.RStatEventVoltageService;
import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.enums.DicDataEnum;
import com.njcn.system.enums.DicDataTypeEnum;
import com.njcn.system.pojo.po.DictData;
import com.njcn.user.api.DeptFeignClient;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -32,9 +33,7 @@ import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -69,7 +68,7 @@ public class RStatEventVoltageServiceImpl implements RStatEventVoltageService {
@Override
public void handleDay(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
List<RStatEventVoltageDPO> rStatEventVoltageDPOS = new ArrayList<>();
DecimalFormat df = new DecimalFormat("0.00");
DecimalFormat df = new DecimalFormat("0.00000");
LocalDate localDate = LocalDateTimeUtil.parseDate(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN);
@@ -108,13 +107,13 @@ public class RStatEventVoltageServiceImpl implements RStatEventVoltageService {
eq("data_date",localDate);
List<RMpEventDetailDPO> rMpEventDetailDPOS = rMpEventDetailDMapper.selectList(rMpEventDetailDPOQueryWrapper);
rStatOrgDPOQueryWrapper.clear();
rStatOrgDPOQueryWrapper.select("effective_measurement").
eq("org_no", deptGetChildrenMoreDTO.getUnitId()).
eq("measurement_type_class", k).
eq("data_type", dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId()).
eq("data_date",localDate);
RStatOrgDPO rStatOrgDPO = rStatOrgDMapper.selectOne(rStatOrgDPOQueryWrapper);
// rStatOrgDPOQueryWrapper.clear();
// rStatOrgDPOQueryWrapper.select("effective_measurement").
// eq("org_no", deptGetChildrenMoreDTO.getUnitId()).
// eq("measurement_type_class", k).
// eq("data_type", dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId()).
// eq("data_date",localDate);
// RStatOrgDPO rStatOrgDPO = rStatOrgDMapper.selectOne(rStatOrgDPOQueryWrapper);
eventStatis.forEach(dictData -> {
if (Objects.equals(dictData.getCode(), DicDataEnum.DISTURBANCE.getCode())
@@ -134,16 +133,16 @@ public class RStatEventVoltageServiceImpl implements RStatEventVoltageService {
rStatEventVoltageDPO.setEventMeasurement(transientStatisData.get(0));
rStatEventVoltageDPO.setEventCount(transientStatisData.get(1));
rStatEventVoltageDPO.setDataType(dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId());
if (Objects.isNull(rStatOrgDPO)) {
rStatEventVoltageDPO.setEventMeasurementRatio(0.00f);
} else {
if (rStatOrgDPO.getEffectiveMeasurement() == 0) {
rStatEventVoltageDPO.setEventMeasurementRatio(0.00f);
} else {
String value = df.format(rStatEventVoltageDPO.getEventMeasurement() / rStatOrgDPO.getEffectiveMeasurement().floatValue());
// if (Objects.isNull(rStatOrgDPO)) {
// rStatEventVoltageDPO.setEventMeasurementRatio(0.00f);
// } else {
// if (rStatOrgDPO.getEffectiveMeasurement() == 0) {
// rStatEventVoltageDPO.setEventMeasurementRatio(0.00f);
// } else {
String value = df.format(Double.valueOf(rStatEventVoltageDPO.getEventMeasurement() )/ collect1.size());
rStatEventVoltageDPO.setEventMeasurementRatio(Float.parseFloat(value));
}
}
// }
// }
rStatEventVoltageDPOS.add(rStatEventVoltageDPO);
}
@@ -194,16 +193,16 @@ public class RStatEventVoltageServiceImpl implements RStatEventVoltageService {
rStatEventVoltageDPO.setEventMeasurement(transientStatisData.get(0));
rStatEventVoltageDPO.setEventCount(transientStatisData.get(1));
rStatEventVoltageDPO.setDataType(dataTypeMap.get(DicDataEnum.DISTRIBUTION_POINT.getCode()).getId());
if (Objects.isNull(rStatOrgDPO)) {
rStatEventVoltageDPO.setEventMeasurementRatio(0.00f);
} else {
if (rStatOrgDPO.getEffectiveMeasurement() == 0) {
rStatEventVoltageDPO.setEventMeasurementRatio(0.00f);
} else {
String value = df.format(rStatEventVoltageDPO.getEventMeasurement() / rStatOrgDPO.getEffectiveMeasurement().floatValue());
// if (Objects.isNull(rStatOrgDPO)) {
// rStatEventVoltageDPO.setEventMeasurementRatio(0.00f);
// } else {
// if (rStatOrgDPO.getEffectiveMeasurement() == 0) {
// rStatEventVoltageDPO.setEventMeasurementRatio(0.00f);
// } else {
String value = df.format(Double.valueOf(rStatEventVoltageDPO.getEventMeasurement() )/ collect1.size());
rStatEventVoltageDPO.setEventMeasurementRatio(Float.parseFloat(value));
}
}
// }
// }
rStatEventVoltageDPOS.add(rStatEventVoltageDPO);
@@ -244,7 +243,7 @@ public class RStatEventVoltageServiceImpl implements RStatEventVoltageService {
@Override
public void handleMonth(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
List<RStatEventVoltageMPO> rStatEventVoltageMPOS = new ArrayList<>();
DecimalFormat df = new DecimalFormat("0.00");
DecimalFormat df = new DecimalFormat("0.00000");
DateTime begin = DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
DateTime end = DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
@@ -291,13 +290,13 @@ public class RStatEventVoltageServiceImpl implements RStatEventVoltageService {
between("data_date",begin,end);
List<RMpEventDetailMPO> rMpEventDetailMPOS = rMpEventDetailMMapper.selectList(rMpEventDetailMPOQueryWrapper);
rStatOrgMPOQueryWrapper.clear();
rStatOrgMPOQueryWrapper.select("effective_measurement_accrued").
eq("org_no", deptGetChildrenMoreDTO.getUnitId()).
eq("measurement_type_class", k).
eq("data_type", dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId()).
between("data_date",begin,end);
RStatOrgMPO rStatOrgMPO = rStatOrgMMapper.selectOne(rStatOrgMPOQueryWrapper);
// rStatOrgMPOQueryWrapper.clear();
// rStatOrgMPOQueryWrapper.select("effective_measurement_accrued").
// eq("org_no", deptGetChildrenMoreDTO.getUnitId()).
// eq("measurement_type_class", k).
// eq("data_type", dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId()).
// between("data_date",begin,end);
// RStatOrgMPO rStatOrgMPO = rStatOrgMMapper.selectOne(rStatOrgMPOQueryWrapper);
@@ -357,16 +356,16 @@ public class RStatEventVoltageServiceImpl implements RStatEventVoltageService {
asDouble2 = BigDecimal.valueOf(asDouble2).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
rStatEventVoltageMPO.setEventMeasurementRatioAverage(Float.parseFloat(asDouble2+""));
if (Objects.isNull(rStatOrgMPO)) {
rStatEventVoltageMPO.setEventMeasurementRatioAccrued(0.00f);
} else {
if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) {
rStatEventVoltageMPO.setEventMeasurementRatioAccrued(0.00f);
} else {
String value = df.format(rStatEventVoltageMPO.getEventMeasurementAccrued() / rStatOrgMPO.getEffectiveMeasurementAccrued().floatValue());
// if (Objects.isNull(rStatOrgMPO)) {
// rStatEventVoltageMPO.setEventMeasurementRatioAccrued(0.00f);
// } else {
// if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) {
// rStatEventVoltageMPO.setEventMeasurementRatioAccrued(0.00f);
// } else {
String value = df.format(Double.valueOf(rStatEventVoltageMPO.getEventMeasurementAccrued()) / collect1.size());
rStatEventVoltageMPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
}
}
// }
// }
rStatEventVoltageMPOS.add(rStatEventVoltageMPO);
});
});
@@ -452,16 +451,16 @@ public class RStatEventVoltageServiceImpl implements RStatEventVoltageService {
asDouble2 = BigDecimal.valueOf(asDouble2).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
rStatEventVoltageMPO.setEventMeasurementRatioAverage(Float.parseFloat(asDouble2+""));
if (Objects.isNull(rStatOrgMPO)) {
rStatEventVoltageMPO.setEventMeasurementRatioAccrued(0.00f);
} else {
if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) {
rStatEventVoltageMPO.setEventMeasurementRatioAccrued(0.00f);
} else {
String value = df.format(rStatEventVoltageMPO.getEventMeasurementAccrued() / rStatOrgMPO.getEffectiveMeasurementAccrued().floatValue());
// if (Objects.isNull(rStatOrgMPO)) {
// rStatEventVoltageMPO.setEventMeasurementRatioAccrued(0.00f);
// } else {
// if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) {
// rStatEventVoltageMPO.setEventMeasurementRatioAccrued(0.00f);
// } else {
String value = df.format(Double.valueOf(rStatEventVoltageMPO.getEventMeasurementAccrued()) / collect1.size());
rStatEventVoltageMPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
}
}
// }
// }
rStatEventVoltageMPOS.add(rStatEventVoltageMPO);
});