From 1bd86f65e35b0474c9805991501865eebe4ca01c Mon Sep 17 00:00:00 2001 From: liriming <1343021927@qq.com> Date: 星期五, 25 四月 2025 15:57:55 +0800 Subject: [PATCH] 焦化总图-指标分析新增analy_date,analy_class判断 --- ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/CokingController.java | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/CokingController.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/CokingController.java index c3c856c..f912cd2 100644 --- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/CokingController.java +++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/CokingController.java @@ -88,25 +88,27 @@ @GetMapping("/analy-ind/list") @Operation(summary = "焦化总图-指标分析") public CommonResult<List<CokingAnalyIndDTO>> getCokingAnalyIndList(@RequestParam Map<String, Object> params) { - String clock = (String) params.get("clock"); - if (StringUtils.isBlank(clock)) { + String analyDate = (String) params.get("analyDate"); + if (StringUtils.isBlank(analyDate)) { Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.MILLISECOND, 0); calendar.set(Calendar.SECOND, 0); calendar.set(Calendar.MINUTE, 0); int hour = calendar.get(Calendar.HOUR_OF_DAY); + String analyClass = ""; if (hour >= 8 && hour < 16) { - calendar.set(Calendar.HOUR_OF_DAY, 0); - clock = DateUtils.format(calendar.getTime()).concat("-").concat("A"); + analyDate = DateUtils.format(calendar.getTime()); + analyClass = "甲班"; } else if (hour >= 16 && hour < 24) { - calendar.set(Calendar.HOUR_OF_DAY, 8); - clock = DateUtils.format(calendar.getTime()).concat("-").concat("B"); + analyDate = DateUtils.format(calendar.getTime()); + analyClass = "甲班"; } else if (hour >= 0 && hour < 8) { calendar.add(Calendar.DAY_OF_YEAR, -1); - calendar.set(Calendar.HOUR_OF_DAY, 16); - clock = DateUtils.format(calendar.getTime()).concat("-").concat("B"); + analyDate = DateUtils.format(calendar.getTime()); + analyClass = "甲班"; } - params.put("clock", clock); + params.put("analyDate", analyDate); + params.put("analyClass", analyClass); } List<CokingAnalyIndEntity> list = cokingAnalyIndService.list(params); return success(ConvertUtils.sourceToTarget(list, CokingAnalyIndDTO.class)); -- Gitblit v1.9.3