预处理兼容pq/pms处理
This commit is contained in:
@@ -27,10 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* Description:
|
||||
@@ -94,7 +91,7 @@ public class DayDataController extends BaseController {
|
||||
} else{
|
||||
indexLists = jobParam.getLineIds();
|
||||
}
|
||||
if (jobParam.getRepairFlag() == 1){
|
||||
if (Objects.nonNull(jobParam.getRepairFlag()) && jobParam.getRepairFlag()){
|
||||
List<String> timeRange = NjcnDateUtils.findEveryDay(jobParam.getBeginTime(),jobParam.getEndTime());
|
||||
for (String item : timeRange) {
|
||||
log.info(item+"-->开始执行");
|
||||
|
||||
@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* @author xiaoyao
|
||||
@@ -58,7 +59,7 @@ public class IntegrityController extends BaseController {
|
||||
log.info(LocalDateTime.now()+"dataIntegrity开始执行");
|
||||
String methodDescribe = getMethodDescribe("dataIntegrity");
|
||||
String startTime,endTime;
|
||||
if (lineParam.getRepairFlag() == 1){
|
||||
if (Objects.nonNull(lineParam.getRepairFlag()) && lineParam.getRepairFlag()){
|
||||
List<String> timeRange = NjcnDateUtils.findEveryDay(lineParam.getBeginTime(),lineParam.getEndTime());
|
||||
for (String item : timeRange) {
|
||||
log.info(item+"-->开始执行");
|
||||
|
||||
Reference in New Issue
Block a user