提交
This commit is contained in:
@@ -6,12 +6,9 @@ import cn.hutool.core.date.DateTime;
|
|||||||
import cn.hutool.core.date.DateUtil;
|
import cn.hutool.core.date.DateUtil;
|
||||||
import cn.hutool.core.date.LocalDateTimeUtil;
|
import cn.hutool.core.date.LocalDateTimeUtil;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.njcn.common.pojo.response.HttpResult;
|
|
||||||
import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
|
import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
|
||||||
import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
|
import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
|
||||||
import com.njcn.device.pms.pojo.po.RStatOrgPO;
|
|
||||||
import com.njcn.harmonic.pojo.po.*;
|
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.RStatOrgDMapper;
|
||||||
import com.njcn.prepare.harmonic.mapper.mysql.area.RStatOrgMMapper;
|
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.RStatOrgQMapper;
|
||||||
@@ -20,10 +17,9 @@ import com.njcn.prepare.harmonic.mapper.mysql.line.RMpPartHarmonicDetailDMapper;
|
|||||||
import com.njcn.prepare.harmonic.mapper.mysql.line.RMpPartHarmonicDetailMMapper;
|
import com.njcn.prepare.harmonic.mapper.mysql.line.RMpPartHarmonicDetailMMapper;
|
||||||
import com.njcn.prepare.harmonic.mapper.mysql.line.RMpSurplusHarmonicDetailDMapper;
|
import com.njcn.prepare.harmonic.mapper.mysql.line.RMpSurplusHarmonicDetailDMapper;
|
||||||
import com.njcn.prepare.harmonic.mapper.mysql.line.RMpSurplusHarmonicDetailMMapper;
|
import com.njcn.prepare.harmonic.mapper.mysql.line.RMpSurplusHarmonicDetailMMapper;
|
||||||
|
import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
|
||||||
import com.njcn.prepare.harmonic.pojo.mysql.po.*;
|
import com.njcn.prepare.harmonic.pojo.mysql.po.*;
|
||||||
import com.njcn.prepare.harmonic.service.mysql.Impl.line.RMpPartHarmonicDetailDServiceImpl;
|
|
||||||
import com.njcn.prepare.harmonic.service.mysql.area.*;
|
import com.njcn.prepare.harmonic.service.mysql.area.*;
|
||||||
import com.njcn.prepare.harmonic.service.mysql.line.IRMpPartHarmonicDetailDService;
|
|
||||||
import com.njcn.prepare.harmonic.utils.PublicUtil;
|
import com.njcn.prepare.harmonic.utils.PublicUtil;
|
||||||
import com.njcn.system.api.DicDataFeignClient;
|
import com.njcn.system.api.DicDataFeignClient;
|
||||||
import com.njcn.system.enums.DicDataEnum;
|
import com.njcn.system.enums.DicDataEnum;
|
||||||
@@ -31,7 +27,6 @@ import com.njcn.system.enums.DicDataTypeEnum;
|
|||||||
import com.njcn.system.pojo.po.DictData;
|
import com.njcn.system.pojo.po.DictData;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.SneakyThrows;
|
import lombok.SneakyThrows;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
|
||||||
import org.springframework.scheduling.annotation.Async;
|
import org.springframework.scheduling.annotation.Async;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
@@ -294,12 +289,12 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService {
|
|||||||
double asDouble1 = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurementRatio).average().getAsDouble();
|
double asDouble1 = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurementRatio).average().getAsDouble();
|
||||||
asDouble1 = BigDecimal.valueOf(asDouble1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
|
asDouble1 = BigDecimal.valueOf(asDouble1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
|
||||||
rStatHarmonicMPO.setOverLimitMeasurementAverage(asDouble);
|
rStatHarmonicMPO.setOverLimitMeasurementAverage(asDouble);
|
||||||
double sum = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurement).sum();
|
Integer sum = rStatHarmonicDPOList.stream().mapToInt(RStatHarmonicDPO::getOverLimitMeasurement).sum();
|
||||||
rStatHarmonicMPO.setOverLimitMeasurementRatioAverage(asDouble1);
|
rStatHarmonicMPO.setOverLimitMeasurementRatioAverage(asDouble1);
|
||||||
|
|
||||||
int i = BigDecimal.valueOf(asDouble1).setScale(0, BigDecimal.ROUND_HALF_UP).intValue();
|
int i = BigDecimal.valueOf(asDouble1).setScale(0, BigDecimal.ROUND_HALF_UP).intValue();
|
||||||
|
|
||||||
rStatHarmonicMPO.setOverDay(i);
|
rStatHarmonicMPO.setOverDay(sum);
|
||||||
|
|
||||||
if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) {
|
if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) {
|
||||||
//todo为0时如何设值
|
//todo为0时如何设值
|
||||||
@@ -369,12 +364,12 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService {
|
|||||||
double asDouble1 = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurementRatio).average().getAsDouble();
|
double asDouble1 = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurementRatio).average().getAsDouble();
|
||||||
asDouble1 = BigDecimal.valueOf(asDouble1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
|
asDouble1 = BigDecimal.valueOf(asDouble1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
|
||||||
rStatHarmonicMPO.setOverLimitMeasurementAverage(asDouble);
|
rStatHarmonicMPO.setOverLimitMeasurementAverage(asDouble);
|
||||||
double sum = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurement).sum();
|
Integer sum = rStatHarmonicDPOList.stream().mapToInt(RStatHarmonicDPO::getOverLimitMeasurement).sum();
|
||||||
rStatHarmonicMPO.setOverLimitMeasurementRatioAverage(asDouble1);
|
rStatHarmonicMPO.setOverLimitMeasurementRatioAverage(asDouble1);
|
||||||
|
|
||||||
int i = BigDecimal.valueOf(asDouble1).setScale(0, BigDecimal.ROUND_HALF_UP).intValue();
|
int i = BigDecimal.valueOf(asDouble1).setScale(0, BigDecimal.ROUND_HALF_UP).intValue();
|
||||||
|
|
||||||
rStatHarmonicMPO.setOverDay(i);
|
rStatHarmonicMPO.setOverDay(sum);
|
||||||
|
|
||||||
if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) {
|
if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) {
|
||||||
//todo为0时如何设值
|
//todo为0时如何设值
|
||||||
|
|||||||
Reference in New Issue
Block a user