From 793989f6eb4e39f4b1f47931fdeefb4a12385424 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 30 七月 2025 16:46:32 +0800
Subject: [PATCH] refactor(eims): 优化设备数据定时任务和报告服务
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/ReportServiceImpl.java | 4 ++--
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/DeviceDataIncrJob.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/DeviceDataIncrJob.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/DeviceDataIncrJob.java
index 5b2e888..908eb55 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/DeviceDataIncrJob.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/DeviceDataIncrJob.java
@@ -1,5 +1,6 @@
package org.dromara.eims.job;
+import lombok.extern.slf4j.Slf4j;
import org.dromara.common.redis.utils.RedisUtils;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
@@ -7,6 +8,7 @@
import java.util.Calendar;
+@Slf4j
@Configuration
@EnableScheduling
public class DeviceDataIncrJob {
@@ -17,7 +19,6 @@
*/
@Scheduled(cron = "0/5 * 8-17 * * ?")
public void updateDeviceDataScheduled() {
- System.out.println("鎵ц瀹氭椂浠诲姟锛屾洿鏂拌澶囨暟鎹細锛氾細");
// 妫�鏌ュ綋鍓嶆椂闂存槸鍚﹀湪鏃╀笂8鐐瑰埌涓嬪崍5鐐逛箣闂�
Calendar now = Calendar.getInstance();
int hourOfDay = now.get(Calendar.HOUR_OF_DAY);
@@ -61,8 +62,7 @@
// 鏂板涓�涓畾鏃跺櫒锛岀澶╅浂鐐规竻闆�
@Scheduled(cron = "0 0 0 * * ?")
public void resetDeviceDataScheduled() {
- System.out.println("鎵ц瀹氭椂浠诲姟锛岄噸缃澶囨暟鎹細锛氾細");
-
+ log.info("鎵ц瀹氭椂浠诲姟锛岄噸缃澶囨暟鎹細锛氾細");
RedisUtils.setAtomicValue(DEVICE_DATA_PREFIX + "smtTapeJamCount", 0); // 5/5s
RedisUtils.setAtomicValue(DEVICE_DATA_PREFIX + "smtMaterialJamCount", 0); // 5/5s
RedisUtils.setAtomicValue(DEVICE_DATA_PREFIX + "smtPanelCount", 0); // 100/5s
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/ReportServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/ReportServiceImpl.java
index d103bce..60f61ec 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/ReportServiceImpl.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/ReportServiceImpl.java
@@ -283,11 +283,11 @@
if (allZero) {
return MAINT_0; // 寰呬繚鍏�
}
- boolean allGtOne = orders.stream().allMatch(o -> Integer.parseInt(o.getStatus()) > 1);
+ boolean allGtOne = orders.stream().allMatch(o -> Integer.parseInt(o.getStatus()) == 1);
if (allGtOne) {
return MAINT_2; // 寰呴獙璇�
}
- boolean allGtTwo = orders.stream().allMatch(o -> Integer.parseInt(o.getStatus()) > 2);
+ boolean allGtTwo = orders.stream().allMatch(o -> Integer.parseInt(o.getStatus()) == 2);
if (allGtTwo) {
return MAINT_3; // 宸插畬鎴�
}
--
Gitblit v1.9.3