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:
hzj
2023-11-30 14:57:28 +08:00
parent bd8cba6235
commit 0e0ad3bf66
7 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java
View File

@@ -450,34 +450,34 @@ public class OrgPointExecutor extends BaseExecutor{
/**
* 河北主网新增算法表r_dim_station_target_d/m/y
*/
@LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "rDimStationTarget", nodeType = NodeTypeEnum.COMMON)
public boolean processRDimStationTargetAccess(NodeComponent bindCmp) {
return isAccess(bindCmp);
}
@LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "rDimStationTarget", nodeType = NodeTypeEnum.COMMON)
public void processRDimStationTargetProcess(NodeComponent bindCmp) {
String tag = bindCmp.getTag();
CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam = bindCmp.getRequestData();
if (tag.equalsIgnoreCase("r_dim_station_target_d")) {
//日表
rDimStationTargetDPOService.handleDay(calculatedParam);
} else if (tag.equalsIgnoreCase("r_dim_station_target_m")) {
//数据补招不执行非日表算法
if (!calculatedParam.isRepair()) {
//月表
rDimStationTargetMPOService.handleMonth(calculatedParam);
}
}else if (tag.equalsIgnoreCase("r_dim_station_target_y")) {
//数据补招不执行非日表算法
if (!calculatedParam.isRepair()) {
//年表
rDimStationTargetYPOService.handleYear(calculatedParam);
}
}
}
// /**
// * 河北主网新增算法表r_dim_station_target_d/m/y
// */
// @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "rDimStationTarget", nodeType = NodeTypeEnum.COMMON)
// public boolean processRDimStationTargetAccess(NodeComponent bindCmp) {
// return isAccess(bindCmp);
// }
// @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "rDimStationTarget", nodeType = NodeTypeEnum.COMMON)
// public void processRDimStationTargetProcess(NodeComponent bindCmp) {
// String tag = bindCmp.getTag();
// CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam = bindCmp.getRequestData();
// if (tag.equalsIgnoreCase("r_dim_station_target_d")) {
// //日表
// rDimStationTargetDPOService.handleDay(calculatedParam);
// } else if (tag.equalsIgnoreCase("r_dim_station_target_m")) {
// //数据补招不执行非日表算法
// if (!calculatedParam.isRepair()) {
// //月表
// rDimStationTargetMPOService.handleMonth(calculatedParam);
// }
// }else if (tag.equalsIgnoreCase("r_dim_station_target_y")) {
// //数据补招不执行非日表算法
// if (!calculatedParam.isRepair()) {
// //年表
// rDimStationTargetYPOService.handleYear(calculatedParam);
// }
// }
// }
/**
* 河北主网新增算法表r_dim_bus_target_d/m/y

4
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjGlobalMServiceImpl.java
View File

@@ -52,8 +52,8 @@ public class RDimObjGlobalMServiceImpl extends MppServiceImpl<RDimObjGlobalMMapp
public void handleMonth(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
List<RDimObjGlobalM> rDimObjGlobalMS = new ArrayList<>();
String begin = LocalDateTimeUtil.format(DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
String end = LocalDateTimeUtil.format(DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
String begin = LocalDateTimeUtil.format(DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATE_PATTERN);
String end = LocalDateTimeUtil.format(DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATE_PATTERN);
LocalDate localDate = LocalDateTimeUtil.parseDate(begin, DatePattern.NORM_DATE_PATTERN);
List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(

4
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjGlobalYServiceImpl.java
View File

@@ -52,8 +52,8 @@ public class RDimObjGlobalYServiceImpl extends MppServiceImpl<RDimObjGlobalYMapp
public void handleYear(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
List<RDimObjGlobalY> rDimObjGlobalYS = new ArrayList<>();
String begin = LocalDateTimeUtil.format(DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
String end = LocalDateTimeUtil.format(DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
String begin = LocalDateTimeUtil.format(DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATE_PATTERN);
String end = LocalDateTimeUtil.format(DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATE_PATTERN);
LocalDate localDate = LocalDateTimeUtil.parseDate(begin, DatePattern.NORM_DATE_PATTERN);
List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(

4
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjTargetMServiceImpl.java
View File

@@ -52,8 +52,8 @@ public class RDimObjTargetMServiceImpl extends MppServiceImpl<RDimObjTargetMMapp
public void handleMonth(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
List<RDimObjTargetM> rdiObjTargetMs = new ArrayList<>();
String begin = LocalDateTimeUtil.format(DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
String end = LocalDateTimeUtil.format(DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
String begin = LocalDateTimeUtil.format(DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATE_PATTERN);
String end = LocalDateTimeUtil.format(DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATE_PATTERN);
LocalDate localDate = LocalDateTimeUtil.parseDate(begin, DatePattern.NORM_DATE_PATTERN);
List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(

4
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjTargetYServiceImpl.java
View File

@@ -52,8 +52,8 @@ public class RDimObjTargetYServiceImpl extends MppServiceImpl<RDimObjTargetYMapp
public void handleYear(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
List<RDimObjTargetY> rdiObjTargetys = new ArrayList<>();
String begin = LocalDateTimeUtil.format(DateUtil.beginOfYear(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
String end = LocalDateTimeUtil.format(DateUtil.endOfYear(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
String begin = LocalDateTimeUtil.format(DateUtil.beginOfYear(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATE_PATTERN);
String end = LocalDateTimeUtil.format(DateUtil.endOfYear(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATE_PATTERN);
LocalDate localDate = LocalDateTimeUtil.parseDate(begin, DatePattern.NORM_DATE_PATTERN);
List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(