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

预处理兼容pq/pms处理

Browse Source
This commit is contained in:
雨木c
2023-09-21 15:45:40 +08:00
parent 4e7da3a056
commit 79232a34e2
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java
View File

@@ -46,18 +46,20 @@ public class LineParam {
/** /**
* 调度任务开始时间 * 调度任务开始时间
*/ */
@NotBlank(message = "调度任务开始时间不可为空")
private String beginTime; private String beginTime;
/** /**
* 调度任务结束时间 * 调度任务结束时间
*/ */
@NotBlank(message = "调度任务结束时间不可为空")
private String endTime; private String endTime;
/** /**
* 是否补招标识,默认false不补招 * 是否补招标识,默认false不补招
*/ */
@ApiModelProperty(name = "repairFlag",value = "0.不补招 1.补招") @ApiModelProperty(name = "repairFlag",value = "0.不补招 1.补招",example = "false")
private Integer repairFlag = 0; private Boolean repairFlag = false;
} }

7
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java
View File

@@ -27,10 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.*;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
/** /**
* Description: * Description:
@@ -94,7 +91,7 @@ public class DayDataController extends BaseController {
} else{ } else{
indexLists = jobParam.getLineIds(); indexLists = jobParam.getLineIds();
} }
if (jobParam.getRepairFlag() == 1){ if (Objects.nonNull(jobParam.getRepairFlag()) && jobParam.getRepairFlag()){
List<String> timeRange = NjcnDateUtils.findEveryDay(jobParam.getBeginTime(),jobParam.getEndTime()); List<String> timeRange = NjcnDateUtils.findEveryDay(jobParam.getBeginTime(),jobParam.getEndTime());
for (String item : timeRange) { for (String item : timeRange) {
log.info(item+"-->开始执行"); log.info(item+"-->开始执行");

3
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java
View File

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import java.util.Objects;
/** /**
* @author xiaoyao * @author xiaoyao
@@ -58,7 +59,7 @@ public class IntegrityController extends BaseController {
log.info(LocalDateTime.now()+"dataIntegrity开始执行"); log.info(LocalDateTime.now()+"dataIntegrity开始执行");
String methodDescribe = getMethodDescribe("dataIntegrity"); String methodDescribe = getMethodDescribe("dataIntegrity");
String startTime,endTime; String startTime,endTime;
if (lineParam.getRepairFlag() == 1){ if (Objects.nonNull(lineParam.getRepairFlag()) && lineParam.getRepairFlag()){
List<String> timeRange = NjcnDateUtils.findEveryDay(lineParam.getBeginTime(),lineParam.getEndTime()); List<String> timeRange = NjcnDateUtils.findEveryDay(lineParam.getBeginTime(),lineParam.getEndTime());
for (String item : timeRange) { for (String item : timeRange) {
log.info(item+"-->开始执行"); log.info(item+"-->开始执行");