From 7ad769e711c1218257d2ca447203dfda2493eef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Tue, 24 Oct 2023 13:37:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=A4=84=E7=90=86=E5=88=86?= =?UTF-8?q?=E9=92=9F=E6=95=B0=E6=8D=AE=E8=BD=AC=E6=97=A5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../harmonic/controller/line/DayDataController.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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); }