1.调整河北pms国网上送主配网逻辑
This commit is contained in:
@@ -2,6 +2,7 @@ package com.njcn.prepare.harmonic.controller.dim;
|
|||||||
|
|
||||||
import cn.hutool.core.date.DatePattern;
|
import cn.hutool.core.date.DatePattern;
|
||||||
import cn.hutool.core.date.DateUtil;
|
import cn.hutool.core.date.DateUtil;
|
||||||
|
import cn.hutool.core.util.StrUtil;
|
||||||
import com.njcn.common.pojo.annotation.OperateInfo;
|
import com.njcn.common.pojo.annotation.OperateInfo;
|
||||||
import com.njcn.common.pojo.enums.common.LogEnum;
|
import com.njcn.common.pojo.enums.common.LogEnum;
|
||||||
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
|
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
|
||||||
@@ -33,6 +34,7 @@ import org.springframework.web.bind.annotation.*;
|
|||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -143,23 +145,66 @@ public class IRDimBusGlobalDController extends BaseController {
|
|||||||
@GetMapping("/reCalUploadAlgorithm")
|
@GetMapping("/reCalUploadAlgorithm")
|
||||||
@ApiOperation("重新计算四个算法")
|
@ApiOperation("重新计算四个算法")
|
||||||
@ApiImplicitParam(name = "statisticDate", value = "重新计算的日期", required = true)
|
@ApiImplicitParam(name = "statisticDate", value = "重新计算的日期", required = true)
|
||||||
public HttpResult<String> reCalUploadAlgorithm(@DateTimeStrValid @RequestParam("statisticDate") String statisticDate) {
|
public HttpResult<String> reCalUploadAlgorithm(@DateTimeStrValid @RequestParam("statisticDate") String statisticDate,@RequestParam("type") String type) {
|
||||||
|
String methodDescribe = getMethodDescribe("reCalUploadAlgorithm");
|
||||||
String methodDescribe = getMethodDescribe("uploadEvaluationData");
|
|
||||||
BaseParam baseParam = new BaseParam();
|
|
||||||
baseParam.setFullChain(true);
|
|
||||||
baseParam.setRepair(false);
|
|
||||||
baseParam.setDataDate(statisticDate);
|
|
||||||
liteFlowFeignClient.uploadOrgExecutor(baseParam);
|
|
||||||
|
|
||||||
BaseParam baseParamSub = new BaseParam();
|
|
||||||
baseParam.setFullChain(false);
|
|
||||||
baseParam.setRepair(false);
|
|
||||||
baseParam.setDataDate(statisticDate);
|
|
||||||
Set<String> set = new HashSet<>();
|
Set<String> set = new HashSet<>();
|
||||||
set.add("rUploadSubStatisticalData");
|
if(StrUtil.isBlank(type)){
|
||||||
baseParam.setTagNames(set);
|
BaseParam baseParam = new BaseParam();
|
||||||
liteFlowFeignClient.substationExecutor(baseParam);
|
baseParam.setFullChain(true);
|
||||||
|
baseParam.setRepair(false);
|
||||||
|
baseParam.setDataDate(statisticDate);
|
||||||
|
liteFlowFeignClient.uploadOrgExecutor(baseParam);
|
||||||
|
|
||||||
|
baseParam.setFullChain(false);
|
||||||
|
baseParam.setRepair(false);
|
||||||
|
baseParam.setDataDate(statisticDate);
|
||||||
|
|
||||||
|
set.add("r_upload_substation_statistical_data_d");
|
||||||
|
set.add("r_upload_substation_statistical_data_m");
|
||||||
|
baseParam.setTagNames(set);
|
||||||
|
liteFlowFeignClient.substationExecutor(baseParam);
|
||||||
|
}else if("0".equals(type)){
|
||||||
|
//基准
|
||||||
|
BaseParam baseParam = new BaseParam();
|
||||||
|
baseParam.setFullChain(false);
|
||||||
|
baseParam.setRepair(false);
|
||||||
|
set.add("r_upload_evaluation_data_d");
|
||||||
|
set.add("r_upload_evaluation_data_m");
|
||||||
|
baseParam.setDataDate(statisticDate);
|
||||||
|
baseParam.setTagNames(set);
|
||||||
|
liteFlowFeignClient.uploadOrgExecutor(baseParam);
|
||||||
|
}else if("1".equals(type)){
|
||||||
|
//主配网
|
||||||
|
BaseParam baseParam = new BaseParam();
|
||||||
|
baseParam.setFullChain(false);
|
||||||
|
baseParam.setRepair(false);
|
||||||
|
set.add("r_upload_point_statistical_data_d");
|
||||||
|
set.add("r_upload_point_statistical_data_m");
|
||||||
|
baseParam.setDataDate(statisticDate);
|
||||||
|
baseParam.setTagNames(set);
|
||||||
|
liteFlowFeignClient.uploadOrgExecutor(baseParam);
|
||||||
|
}else if("2".equals(type)){
|
||||||
|
//电站
|
||||||
|
BaseParam baseParam = new BaseParam();
|
||||||
|
baseParam.setFullChain(false);
|
||||||
|
baseParam.setRepair(false);
|
||||||
|
set.add("r_upload_substation_statistical_data_d");
|
||||||
|
set.add("r_upload_substation_statistical_data_m");
|
||||||
|
baseParam.setDataDate(statisticDate);
|
||||||
|
baseParam.setTagNames(set);
|
||||||
|
liteFlowFeignClient.substationExecutor(baseParam);
|
||||||
|
}else if("3".equals(type)){
|
||||||
|
//典型
|
||||||
|
BaseParam baseParam = new BaseParam();
|
||||||
|
baseParam.setFullChain(false);
|
||||||
|
baseParam.setRepair(false);
|
||||||
|
set.add("pq_typical_source_create_d");
|
||||||
|
set.add("pq_typical_source_create_m");
|
||||||
|
baseParam.setDataDate(statisticDate);
|
||||||
|
baseParam.setTagNames(set);
|
||||||
|
liteFlowFeignClient.uploadOrgExecutor(baseParam);
|
||||||
|
}
|
||||||
|
|
||||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
|
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user