From 2b9ff0c274a847af41b2f5a04de1b23ed6fbb9bb Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 25 八月 2025 15:50:15 +0800
Subject: [PATCH] mdc模块更新
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningOEEJob.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningOverallEquipmentEfficiencyJob.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningOEEJob.java
similarity index 67%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningOverallEquipmentEfficiencyJob.java
rename to lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningOEEJob.java
index 304cc7b..57c88ca 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningOverallEquipmentEfficiencyJob.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningOEEJob.java
@@ -1,9 +1,11 @@
package org.jeecg.modules.mdc.job;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.util.DateUtils;
-import org.jeecg.modules.mdc.service.IMdcOverallEquipmentEfficiencyService;
+import org.jeecg.modules.mdc.service.IMdcOeeInfoService;
import org.jeecg.modules.mdc.util.ThrowableUtil;
+import org.jeecg.modules.mdc.vo.MdcOeeComputeVo;
import org.jeecg.modules.quartz.entity.QuartzJob;
import org.jeecg.modules.quartz.entity.SysQuartzLog;
import org.jeecg.modules.quartz.service.IQuartzJobService;
@@ -12,18 +14,19 @@
import org.quartz.*;
import javax.annotation.Resource;
+import java.time.LocalDate;
import java.util.Date;
import java.util.List;
/**
- * @Description: 瀹氭椂璁＄畻璁惧缁煎悎鏁堢巼OEE浠诲姟
- * @author: LiuS
- * @create: 2023-07-24 10:26
+ * @Author: Lius
+ * @CreateTime: 2025-04-24
+ * @Description: OEE
*/
@PersistJobDataAfterExecution
@DisallowConcurrentExecution
@Slf4j
-public class RunningOverallEquipmentEfficiencyJob implements Job {
+public class RunningOEEJob implements Job {
/**
* 鑻ュ弬鏁板彉閲忓悕淇敼 QuartzJobController涓篃闇�瀵瑰簲淇敼 鏃堕棿锛� yyyyMMdd 渚嬶細 20230414
@@ -44,7 +47,7 @@
private ISysQuartzLogService sysQuartzLogService;
@Resource
- private IMdcOverallEquipmentEfficiencyService mdcOverallEquipmentEfficiencyService;
+ private IMdcOeeInfoService mdcOeeInfoService;
@Override
public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
@@ -55,20 +58,26 @@
quartzLog.setJobId(byJobClassName.get(0).getId());
}
quartzLog.setParams(this.parameter);
- log.info("瀹氭椂璁＄畻璁惧缁煎悎鏁堢巼OEE浠诲姟 RunningOverallEquipmentEfficiencyJob start! 鏃堕棿:" + DateUtils.now(), this.parameter);
+ log.info("瀹氭椂璁＄畻璁惧缁煎悎鏁堢巼OEE浠诲姟 RunningOEEJob start! 鏃堕棿:" + DateUtils.now(), this.parameter);
long startTime = System.currentTimeMillis();
try {
- mdcOverallEquipmentEfficiencyService.runningOverallEquipmentEfficiency(this.parameter);
+ MdcOeeComputeVo mdcOeeComputeVo = new MdcOeeComputeVo();
+ String dateTime = LocalDate.now().plusDays(-1).toString();
+ if (StringUtils.isNotBlank(this.parameter)) {
+ dateTime = DateUtils.date2Str(DateUtils.str2Date(this.parameter, DateUtils.yyyyMMdd.get()), DateUtils.date_sdf.get());
+ }
+ mdcOeeComputeVo.setStartTime(dateTime);
+ mdcOeeComputeVo.setEndTime(dateTime);
+ mdcOeeInfoService.computeOee(mdcOeeComputeVo);
quartzLog.setIsSuccess(0);
} catch (Exception e) {
quartzLog.setIsSuccess(-1);
quartzLog.setExceptionDetail(ThrowableUtil.getStackTrace(e));
// 鍙戦�佹秷鎭�氱煡
- sysAnnouncementService.jobSendMessage("瀹氭椂缁熻娈垫椂闂翠换鍔�", quartzLog.getExceptionDetail());
+ sysAnnouncementService.jobSendMessage("瀹氭椂璁＄畻璁惧缁煎悎鏁堢巼OEE浠诲姟", quartzLog.getExceptionDetail());
}
long endTime = System.currentTimeMillis();
quartzLog.setExecutionTime(Integer.parseInt(String.valueOf(endTime - startTime)));
sysQuartzLogService.save(quartzLog);
}
-
}
--
Gitblit v1.9.3