From 95fa8f7f6e3dbc4f13c0a9b15515f4040fa05f03 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期六, 26 四月 2025 11:16:46 +0800
Subject: [PATCH] 焦化概况 能流图指标数据
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/CokingController.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 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..384e390 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
@@ -63,6 +63,8 @@
@Autowired
private CokingOverviewService cokingOverviewService;
+ @Autowired
+ private CokingOverviewIndService cokingOverviewIndService;
@Autowired
private CokingTraceSuggestService cokingTraceSuggestService;
@@ -88,25 +90,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));
@@ -157,12 +161,19 @@
@GetMapping("/overview/list")
- @Operation(summary = "各工序-概况数据")
+ @Operation(summary = "各工序-概况-整体数据")
public CommonResult<Map<String,List<CokingOverviewDTO>>> getOverviewList(@RequestParam Map<String, Object> params) {
Map<String,List<CokingOverviewDTO>> result = cokingOverviewService.list(params);
return success(result);
}
+ @GetMapping("/overview/indList")
+ @Operation(summary = "各工序-概况-能流图指标数据")
+ public CommonResult<List<CokingOverviewIndEntity>> getOverviewIndList(@RequestParam Map<String, Object> params) {
+ List<CokingOverviewIndEntity> list = cokingOverviewIndService.list(params);
+ return success(list);
+ }
+
@GetMapping("/overview/abnormal-data")
@Operation(summary = "各工序-异常数据")
public CommonResult<List<CokingTraceDataDTO>> getAbnormalData(@RequestParam Map<String, Object> params) {
--
Gitblit v1.9.3