From 56c701ab19eb16ebf2f75bdd42b4ea9da1c2a733 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期三, 25 六月 2025 14:19:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/CokingController.java | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 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 1a45dad..c91bd41 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
@@ -97,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));
@@ -199,12 +187,13 @@
public CommonResult<List<CokingTraceSuggestDTO>> getTraceSuggestList(@RequestParam Map<String, Object> params) {
String relId = (String) params.get("relId");
String processType = (String) params.get("processType");
+ String clock = (String) params.get("clock");
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);
+ String clockQ = StringUtils.isNotBlank(clock) ? clock : DateUtils.format(calendar.getTime(), "yyyy-MM-dd");
+ CokingAnalyIndEntity analyInd = cokingAnalyIndService.get(TraceProcessTypeEnum.getEumByCode(processType.toUpperCase()).getProcess(), clockQ);
if (analyInd != null) {
relId = analyInd.getRelId();
params.put("relId", relId);
@@ -221,12 +210,13 @@
public CommonResult<List<CokingTraceIndDTO>> getTraceIndList(@RequestParam Map<String, Object> params) {
String relId = (String) params.get("relId");
String processType = (String) params.get("processType");
+ String clock = (String) params.get("clock");
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);
+ String clockQ = StringUtils.isNotBlank(clock) ? clock : DateUtils.format(calendar.getTime(), "yyyy-MM-dd");
+ CokingAnalyIndEntity analyInd = cokingAnalyIndService.get(TraceProcessTypeEnum.getEumByCode(processType.toUpperCase()).getProcess(), clockQ);
if (analyInd != null) {
relId = analyInd.getRelId();
params.put("relId", relId);
@@ -243,12 +233,13 @@
public CommonResult<List<CokingTraceDeviationDTO>> getTraceDeviationList(@RequestParam Map<String, Object> params) {
String relId = (String) params.get("relId");
String processType = (String) params.get("processType");
+ String clock = (String) params.get("clock");
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);
+ String clockQ = StringUtils.isNotBlank(clock) ? clock : DateUtils.format(calendar.getTime(), "yyyy-MM-dd");
+ CokingAnalyIndEntity analyInd = cokingAnalyIndService.get(TraceProcessTypeEnum.getEumByCode(processType.toUpperCase()).getProcess(), clockQ);
if (analyInd != null) {
relId = analyInd.getRelId();
params.put("relId", relId);
@@ -263,6 +254,23 @@
@GetMapping("/trace-chart/list")
@Operation(summary = "焦化工序-异常溯源折线图")
public CommonResult<List<CokingTraceChartDTO>> getCokingTraceChartList(@RequestParam Map<String, Object> params) {
+ String relId = (String) params.get("relId");
+ String processType = (String) params.get("processType");
+ String clock = (String) params.get("clock");
+ if (StringUtils.isBlank(relId) && StringUtils.isNotBlank(processType)) {
+ // 查找最新的relId
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DAY_OF_YEAR, -1);
+ String clockQ = StringUtils.isNotBlank(clock) ? clock : DateUtils.format(calendar.getTime(), "yyyy-MM-dd");
+ CokingAnalyIndEntity analyInd = cokingAnalyIndService.get(TraceProcessTypeEnum.getEumByCode(processType.toUpperCase()).getProcess(), clockQ);
+ if (analyInd != null) {
+ relId = analyInd.getRelId();
+ params.put("relId", relId);
+ } else {
+ return success(new ArrayList<>());
+ }
+ }
+
List<CokingTraceChartEntity> list = cokingTraceChartService.list(params);
List<CokingTraceChartDTO> result = new ArrayList<>();
if (CollectionUtils.isEmpty(list)) {
--
Gitblit v1.9.3