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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
chendaofei
2024-12-09 08:49:14 +08:00
parent 7e130e9eb0 efc075b4a9
commit 63617c92c0
11 changed files with 70 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityServiceImpl.java
View File

@@ -101,7 +101,7 @@ public class CarryCapacityServiceImpl implements CarryCapacityService {
//前2周的数据
List<CarryCapcityData> dataHarmPowerP2List;
List<CarryCapcityData> dataHarmPowerQ2List;
List<CarryCapcityData> dataHarmPowerU2List ;
List<CarryCapcityData> dataHarmPowerU2List;
CarryCapacityDataVO carryCapacityDataVO = new CarryCapacityDataVO();
String lineId = queryParam.getLineId();
@@ -512,7 +512,7 @@ public class CarryCapacityServiceImpl implements CarryCapacityService {
carryCapacitydResultVO.setILevel(iLevel);
//统计安全，3级预警，2级预警1级预警个数
List<Integer> list = Stream.of(utLevel, pftLevel, btLevel, iLevel).collect(Collectors.toList());
int safeCount, warnCount3 , warnCount2 , warnCount1 ;
int safeCount, warnCount3, warnCount2, warnCount1;
safeCount = (int) list.stream()
.filter(temp -> temp == 1)
.count();
@@ -711,7 +711,6 @@ public class CarryCapacityServiceImpl implements CarryCapacityService {
}
@Override
public CarryCapacityDResultVO carryCapacityEvaluate(CarryCapacityEvaluateParam calParam) {
CarryCapacityDResultVO vo = new CarryCapacityDResultVO();
@@ -918,21 +917,22 @@ public class CarryCapacityServiceImpl implements CarryCapacityService {
public static ExcelDataDTO parsingFile(LocalDate startDate, LocalDate endDate, InputStream is) {
// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
List<CarryCapcityData> dataHarmPowerpList ;
List<CarryCapcityData> dataHarmPowerqList ;
List<DataI> dataiList ;
List<CarryCapcityData> dataHarmPowerpList;
List<CarryCapcityData> dataHarmPowerqList;
List<DataI> dataiList;
//前2周的时间
LocalDate startDate2 = startDate.plusWeeks(-1);
LocalDate endDate2 = endDate.plusWeeks(-1);
//前一周的数据
List<CarryCapcityData> dataHarmPowerP2List ;
List<CarryCapcityData> dataHarmPowerQ2List ;
List<CarryCapcityData> dataHarmPowerU2List ;
List<CarryCapcityData> dataHarmPowerP2List;
List<CarryCapcityData> dataHarmPowerQ2List;
List<CarryCapcityData> dataHarmPowerU2List;
try {
List<CarryCapcityDataEexcel> objects = EasyExcelUtil.syncReadModel(is, CarryCapcityDataEexcel.class, 0, 3);
objects = objects.stream().filter(temp -> Objects.nonNull(temp.getTime())).collect(Collectors.toList());
List<CarryCapcityDataIEexcel> iEexcelList = new ArrayList<>();
List<CarryCapcityDataVEexcel> vEexcelList = new ArrayList<>();
List<CarryCapcityDataPEexcel> pEexcelList = new ArrayList<>();