From 892da32f145c958f0ad9467eb442ed457984005d Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 07 五月 2025 10:52:01 +0800
Subject: [PATCH] 功率因数-电网拓扑
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/CokingController.java | 62 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 14 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 384e390..6aab84e 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
@@ -12,6 +12,7 @@
import com.iailab.module.ansteel.coking.entity.*;
import com.iailab.module.ansteel.coking.service.*;
import com.iailab.module.ansteel.common.enums.ProcessConfDataTypeEnum;
+import com.iailab.module.ansteel.common.enums.TraceProcessTypeEnum;
import com.iailab.module.data.api.ind.IndItemApi;
import com.iailab.module.data.api.ind.dto.ApiIndItemQueryDTO;
import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO;
@@ -96,21 +97,9 @@
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) {
- analyDate = DateUtils.format(calendar.getTime());
- analyClass = "甲班";
- } else if (hour >= 16 && hour < 24) {
- analyDate = DateUtils.format(calendar.getTime());
- analyClass = "乙班";
- } else if (hour >= 0 && hour < 8) {
- calendar.add(Calendar.DAY_OF_YEAR, -1);
- analyDate = DateUtils.format(calendar.getTime());
- analyClass = "丙班";
- }
+ calendar.add(Calendar.DAY_OF_YEAR, -1);
+ analyDate = DateUtils.format(calendar.getTime());
params.put("analyDate", analyDate);
- params.put("analyClass", analyClass);
}
List<CokingAnalyIndEntity> list = cokingAnalyIndService.list(params);
return success(ConvertUtils.sourceToTarget(list, CokingAnalyIndDTO.class));
@@ -196,6 +185,21 @@
@GetMapping("/trace-suggest/list")
@Operation(summary = "焦化工序-异常溯源及优化建议")
public CommonResult<List<CokingTraceSuggestDTO>> getTraceSuggestList(@RequestParam Map<String, Object> params) {
+ String relId = (String) params.get("relId");
+ String processType = (String) params.get("processType");
+ if (StringUtils.isBlank(relId) && StringUtils.isNotBlank(processType)) {
+ // 查找最新的relId
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DAY_OF_YEAR, -1);
+ String clock = DateUtils.format(calendar.getTime(), "yyyy-MM-dd");
+ CokingAnalyIndEntity analyInd = cokingAnalyIndService.get(TraceProcessTypeEnum.getEumByCode(processType).getProcess(), clock);
+ if (analyInd != null) {
+ relId = analyInd.getRelId();
+ params.put("relId", relId);
+ } else {
+ return success(new ArrayList<>());
+ }
+ }
List<CokingTraceSuggestEntity> list = cokingTraceSuggestService.list(params);
return success(ConvertUtils.sourceToTarget(list, CokingTraceSuggestDTO.class));
}
@@ -203,6 +207,21 @@
@GetMapping("/trace-ind/list")
@Operation(summary = "焦化工序-异常溯源指标")
public CommonResult<List<CokingTraceIndDTO>> getTraceIndList(@RequestParam Map<String, Object> params) {
+ String relId = (String) params.get("relId");
+ String processType = (String) params.get("processType");
+ if (StringUtils.isBlank(relId) && StringUtils.isNotBlank(processType)) {
+ // 查找最新的relId
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DAY_OF_YEAR, -1);
+ String clock = DateUtils.format(calendar.getTime(), "yyyy-MM-dd");
+ CokingAnalyIndEntity analyInd = cokingAnalyIndService.get(TraceProcessTypeEnum.getEumByCode(processType).getProcess(), clock);
+ if (analyInd != null) {
+ relId = analyInd.getRelId();
+ params.put("relId", relId);
+ } else {
+ return success(new ArrayList<>());
+ }
+ }
List<CokingTraceIndEntity> list = cokingTraceIndService.list(params);
return success(ConvertUtils.sourceToTarget(list, CokingTraceIndDTO.class));
}
@@ -210,6 +229,21 @@
@GetMapping("/trace-deviation/list")
@Operation(summary = "焦化工序-异常溯源影响因素偏差值")
public CommonResult<List<CokingTraceDeviationDTO>> getTraceDeviationList(@RequestParam Map<String, Object> params) {
+ String relId = (String) params.get("relId");
+ String processType = (String) params.get("processType");
+ if (StringUtils.isBlank(relId) && StringUtils.isNotBlank(processType)) {
+ // 查找最新的relId
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DAY_OF_YEAR, -1);
+ String clock = DateUtils.format(calendar.getTime(), "yyyy-MM-dd");
+ CokingAnalyIndEntity analyInd = cokingAnalyIndService.get(TraceProcessTypeEnum.getEumByCode(processType).getProcess(), clock);
+ if (analyInd != null) {
+ relId = analyInd.getRelId();
+ params.put("relId", relId);
+ } else {
+ return success(new ArrayList<>());
+ }
+ }
List<CokingTraceDeviationEntity> list = cokingTraceDeviationService.list(params);
return success(ConvertUtils.sourceToTarget(list, CokingTraceDeviationDTO.class));
}
--
Gitblit v1.9.3