From 4eb5d51d54abef7ed4377f13118f49beaa097be7 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期五, 25 四月 2025 15:39:55 +0800
Subject: [PATCH] 焦化总图-指标分析新增clock判断
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingAnalyTrendServiceImpl.java | 5 ++++-
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/CokingController.java | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+), 1 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 48672bc..c3c856c 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,6 +88,26 @@
@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)) {
+ 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);
+ if (hour >= 8 && hour < 16) {
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
+ clock = DateUtils.format(calendar.getTime()).concat("-").concat("A");
+ } else if (hour >= 16 && hour < 24) {
+ calendar.set(Calendar.HOUR_OF_DAY, 8);
+ clock = DateUtils.format(calendar.getTime()).concat("-").concat("B");
+ } 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");
+ }
+ params.put("clock", clock);
+ }
List<CokingAnalyIndEntity> list = cokingAnalyIndService.list(params);
return success(ConvertUtils.sourceToTarget(list, CokingAnalyIndDTO.class));
}
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingAnalyTrendServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingAnalyTrendServiceImpl.java
index c1f72d5..f84b6f1 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingAnalyTrendServiceImpl.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingAnalyTrendServiceImpl.java
@@ -5,6 +5,7 @@
import com.iailab.module.ansteel.coking.entity.CokingAnalyTrendEntity;
import com.iailab.module.ansteel.coking.service.CokingAnalyTrendService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -25,8 +26,10 @@
@Override
public List<CokingAnalyTrendEntity> list(Map<String, Object> params) {
+ String clock = (String) params.get("clock");
QueryWrapper<CokingAnalyTrendEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.orderByAsc("sort");
+ queryWrapper.eq(StringUtils.isNotBlank(clock),"clock", clock)
+ .orderByAsc("sort");
return cokingAnalyTrendDao.selectList(queryWrapper);
}
}
\ No newline at end of file
--
Gitblit v1.9.3