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

1.国网上送代码调整

Browse Source 
2.技术监督模块策略添加类型判断
This commit is contained in:
cdf
2024-03-25 10:59:00 +08:00
parent df194ef852
commit 1c06a03166
3 changed files with 100 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/dim/IRDimBusGlobalDController.java
View File

@@ -1,11 +1,13 @@
package com.njcn.prepare.harmonic.controller.dim;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.common.utils.LogUtil;
@@ -32,10 +34,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDate;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.*;
/**
* pqs
@@ -212,4 +211,58 @@ public class IRDimBusGlobalDController extends BaseController {
}
/**
* 新增重算月数据
* @author cdf
* @date 2024/3/22
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@GetMapping("/reCalMonthUploadAlgorithm")
@ApiOperation("重新计算四个算法")
@ApiImplicitParam(name = "statisticDate", value = "重新计算的月份", required = true)
public HttpResult<String> reCalUploadAlgorithmAllMonth(@DateTimeStrValid(format = "yyyy-MM") @RequestParam("statisticDate") String statisticDate,@RequestParam("type") String type) {
String methodDescribe = getMethodDescribe("reCalUploadAlgorithmAllMonth");
Set<String> set = new HashSet<>();
String startDate = DateUtil.format(DateUtil.beginOfDay(DateUtil.parse(statisticDate,DatePattern.NORM_MONTH_PATTERN)),DatePattern.NORM_DATE_PATTERN);
String endDate = DateUtil.format(new Date(),DatePattern.NORM_DATE_PATTERN);
BaseParam baseParam = new BaseParam();
baseParam.setFullChain(false);
baseParam.setRepair(true);
baseParam.setBeginTime(startDate);
baseParam.setEndTime(endDate);
if(StrUtil.isBlank(type)){
throw new BusinessException("请选择需要重新计算的类型");
}else if("0".equals(type)){
//基准
set.add("r_upload_evaluation_data_d");
baseParam.setTagNames(set);
liteFlowFeignClient.uploadOrgExecutor(baseParam);
}else if("1".equals(type)){
//主配网
set.add("r_upload_point_statistical_data_d");
baseParam.setTagNames(set);
liteFlowFeignClient.uploadOrgExecutor(baseParam);
}else if("2".equals(type)){
//电站
baseParam.setFullChain(false);
baseParam.setRepair(false);
baseParam.setDataDate(endDate);
set.add("r_upload_substation_statistical_data_m");
baseParam.setTagNames(set);
liteFlowFeignClient.substationExecutor(baseParam);
}else if("3".equals(type)){
//典型
set.add("pq_typical_source_create_d");
baseParam.setDataDate(statisticDate);
baseParam.setTagNames(set);
liteFlowFeignClient.uploadOrgExecutor(baseParam);
}
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
}