From 935275e79de8415ee3ca0b9a45da548aa6a2ee34 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 30 六月 2025 08:21:36 +0800
Subject: [PATCH] 更新最新代码，上片页面领取任务传递固定值修改为动态获取线路
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/utilization/controller/UtilizationController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/utilization/controller/UtilizationController.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/utilization/controller/UtilizationController.java
index 0ccf8e6..aa5aa13 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/utilization/controller/UtilizationController.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/utilization/controller/UtilizationController.java
@@ -11,6 +11,7 @@
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -82,12 +83,19 @@
@ResponseBody
public Result getChartData(@RequestBody(required = false) Map<String, Object> params) {
String lineNo = params != null ? (String) params.get("lineNo") : null;
+ Integer dayCount = params != null && params.get("dayCount") != null ? (Integer) params.get("dayCount") : null;
QueryWrapper<Utilization> queryWrapper = new QueryWrapper<Utilization>().orderByAsc("record_time");
if (StringUtils.hasText(lineNo)) {
queryWrapper.eq("line_no", lineNo);
}
- queryWrapper.last("limit 30");
+
+ if (dayCount != null && dayCount > 0) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DAY_OF_MONTH, -dayCount);
+ Date startDate = calendar.getTime();
+ queryWrapper.ge("record_time", startDate);
+ }
List<Utilization> data = utilizationService.list(queryWrapper);
--
Gitblit v1.8.0