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

修改bug

Browse Source
This commit is contained in:
雨木c
2023-11-14 10:44:02 +08:00
parent c12965b724
commit decc453006
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java
View File

@@ -34,7 +34,7 @@ import org.springframework.util.CollectionUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.time.Instant; import java.time.*;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@@ -307,7 +307,11 @@ public class HarmonicServiceImpl implements IHarmonicService {
if (CollUtil.isNotEmpty(limitRates)) { if (CollUtil.isNotEmpty(limitRates)) {
limitRates.forEach(list -> { limitRates.forEach(list -> {
LimitTarget limitRatePO = BeanUtil.copyProperties(list, LimitTarget.class); LimitTarget limitRatePO = BeanUtil.copyProperties(list, LimitTarget.class);
limitRatePO.setTime(list.getTime().toInstant()); LocalDateTime localDateTime = list.getTime().atStartOfDay();
// 将LocalDateTime转换为Instant
Instant instant = localDateTime.toInstant(ZoneOffset.ofHours(8));
limitRatePO.setTime(instant);
limitRatePO.setLineId(list.getLineId()); limitRatePO.setLineId(list.getLineId());
limitRatePO.setPhasicType(list.getPhasicType()); limitRatePO.setPhasicType(list.getPhasicType());
limitRatePO.setAllTime(list.getAllTime()); limitRatePO.setAllTime(list.getAllTime());
@@ -413,8 +417,8 @@ public class HarmonicServiceImpl implements IHarmonicService {
} }
} }
} }
Map<Date, List<RStatLimitTargetDPO>> map = list.stream().collect(Collectors.groupingBy(RStatLimitTargetDPO::getTime)); Map<LocalDate, List<RStatLimitTargetDPO>> map = list.stream().collect(Collectors.groupingBy(RStatLimitTargetDPO::getTime));
for (Date key : map.keySet()) { for (LocalDate key : map.keySet()) {
int overDay = 0; int overDay = 0;
List<RStatLimitTargetDPO> l = map.get(key); List<RStatLimitTargetDPO> l = map.get(key);
for (RStatLimitTargetDPO pojo : l) { for (RStatLimitTargetDPO pojo : l) {

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

@@ -30,6 +30,11 @@ import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -476,10 +481,13 @@ public class SteadyExceedRateServiceImpl implements SteadyExceedRateService {
if(CollUtil.isNotEmpty(limitRates)){ if(CollUtil.isNotEmpty(limitRates)){
limitRates.forEach(list ->{ limitRates.forEach(list ->{
LimitRatePO limitRatePO = new LimitRatePO(); LimitRatePO limitRatePO = new LimitRatePO();
limitRatePO.setDayStr(DateUtil.format(list.getTime(),"yyyy-MM-dd")); limitRatePO.setDayStr(list.getTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
limitRatePO.setMouthStr(DateUtil.format(list.getTime(),"yyyy-MM")); limitRatePO.setMouthStr(list.getTime().format(DateTimeFormatter.ofPattern("yyyy-MM")));
LocalDateTime localDateTime = list.getTime().atStartOfDay();
Instant instant = localDateTime.toInstant(ZoneOffset.ofHours(8));
limitRatePO.setTime(instant);
limitRatePO.setTime(list.getTime().toInstant());
limitRatePO.setLineId(list.getLineId()); limitRatePO.setLineId(list.getLineId());
limitRatePO.setPhasicType(list.getPhasicType()); limitRatePO.setPhasicType(list.getPhasicType());
limitRatePO.setAllTime(list.getAllTime()); limitRatePO.setAllTime(list.getAllTime());