电能质量问题修改

This commit is contained in:
hzj
2024-04-10 10:47:45 +08:00
parent 859be88988
commit c348b24b51
9 changed files with 73 additions and 36 deletions

View File

@@ -81,7 +81,7 @@ public class CarryCapcityServiceImpl implements CarryCapcityService {
private final RedisUtil redisUtil;
private final CarryCapacityResultPOService carryCapacityResultPOService;
private final CarryCapacityUserPOService carryCapacityUserPOService;
private static final double DEFAULTVALUE=31415.926;
private static final double DEFAULTVALUE=3141.5926;
private final FileStorageUtil fileStorageUtil;
@@ -622,10 +622,10 @@ public class CarryCapcityServiceImpl implements CarryCapcityService {
public boolean uploadExcel(ExcelDataParam excelDataParam) {
String lineId = excelDataParam.getLineId();
// LineDetailDataVO data = lineFeignClient.getLineDetailData(lineId).getData();
LineDetailDataVO data = lineFeignClient.getLineDetailData(lineId).getData();
// //时间间隔
// Integer timeInterval = data.getTimeInterval();
Integer timeInterval =10;
Integer timeInterval = data.getTimeInterval();
// Integer timeInterval =10;
//根据时间间隔算出最低数据量 7天*6小时*60分钟*3项*90%/时间间隔
// int minDataNum = 7*6*60*3*90/(100*timeInterval);
int minDataNum =0;
@@ -740,8 +740,8 @@ public class CarryCapcityServiceImpl implements CarryCapcityService {
dataIList);
//todo 将文件存入文件服务器获取url
String filePath = fileStorageUtil.uploadMultipart(excelDataParam.getFile(), OssPath.CARRY_CAPCITY_DATA);
String url = "temp";
CarryCapacityDataPO carryCapacityDataPO = new CarryCapacityDataPO(lineId,startDate,endDate,url);
// String url = "temp";
CarryCapacityDataPO carryCapacityDataPO = new CarryCapacityDataPO(lineId,startDate,endDate,filePath);
carryCapacityDataPOService.saveOrUpdateByMultiId(carryCapacityDataPO);