From 5f84045628543841472685fc92c04324c696a634 Mon Sep 17 00:00:00 2001
From: yangbin <yangbin@qq.com>
Date: 星期三, 19 二月 2025 13:33:16 +0800
Subject: [PATCH] 大屏看板1
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/subcontrol/service/impl/MdcBigScreenServiceImpl.java | 6 +++---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/subcontrol/api/MdcBigScreenController.java | 2 --
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/subcontrol/api/MdcBigScreenController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/subcontrol/api/MdcBigScreenController.java
index 9c88b8b..510efa7 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/subcontrol/api/MdcBigScreenController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/subcontrol/api/MdcBigScreenController.java
@@ -3,14 +3,12 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.mdc.service.IEquipmentLogService;
import org.jeecg.modules.mdc.subcontrol.service.MdcBigScreenService;
import org.jeecg.modules.mdc.subcontrol.vo.AllEquipmentLogVo;
import org.jeecg.modules.mdc.subcontrol.vo.LastWeekDataRankingVo;
import org.jeecg.modules.mdc.subcontrol.vo.MdcEquipmentOpVo;
-import org.jeecg.modules.mdc.vo.MdcEquipmentVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/subcontrol/service/impl/MdcBigScreenServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/subcontrol/service/impl/MdcBigScreenServiceImpl.java
index 376bd55..5f94fd4 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/subcontrol/service/impl/MdcBigScreenServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/subcontrol/service/impl/MdcBigScreenServiceImpl.java
@@ -50,9 +50,9 @@
List<BigDecimal> processingRateList = new ArrayList<>();
List<BigDecimal> shiftRateList = new ArrayList<>();
//鑾峰彇涓婂懆鍛ㄤ竴鏃ユ湡鍜屽懆鍏棩鏈�
- LocalDate today = LocalDate.now();
- LocalDate monday = today.minusDays(7);
- LocalDate saturday = today.minusDays(1);
+ LocalDate today = LocalDate.now().minusDays(7L);
+ LocalDate monday = today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
+ LocalDate saturday = today.with(TemporalAdjusters.nextOrSame(DayOfWeek.SATURDAY));
List<String> dates = getMiddleDate(monday, saturday);
List<String> equipmentIdList = new ArrayList<>();
//鏍规嵁鍘傚尯id鑾峰彇鍘傚尯璁惧淇℃伅
--
Gitblit v1.9.3