diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java index 84c7844d4..1452129f4 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java @@ -83,6 +83,10 @@ public class DayDataController extends BaseController { @PostMapping("dataToDay") @OperateInfo(info = LogEnum.BUSINESS_MEDIUM) public HttpResult dataToDayHandler(@RequestBody LineParam jobParam ){ + //特殊处理后面需要删除 + if(Objects.isNull(jobParam.getLineType())){ + jobParam.setLineType(2); + } String startTime,endTime; log.info(LocalDateTime.now()+"dataToDayHandler开始执行,开始时间-结束时间"+jobParam.getBeginTime()+"___"+jobParam.getEndTime()); String methodDescribe = getMethodDescribe("dataToDayHandler"); @@ -98,10 +102,10 @@ public class DayDataController extends BaseController { log.info(item+"-->开始执行"); startTime = item+" "+"00:00:00"; endTime = item+" "+"23:59:59"; - dayDataService.dataToDayHandler(indexLists,startTime,endTime,2); + dayDataService.dataToDayHandler(indexLists,startTime,endTime,jobParam.getLineType()); } } else { - dayDataService.dataToDayHandler(indexLists,jobParam.getBeginTime(),jobParam.getEndTime(),2); + dayDataService.dataToDayHandler(indexLists,jobParam.getBeginTime(),jobParam.getEndTime(),jobParam.getLineType()); } return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); }