From a1d23a55e2cfcdca3e5387e781ebaaf99a1619b3 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 11 七月 2025 19:58:50 +0800
Subject: [PATCH] 二保
---
/dev/null | 139 ----------------------------------------------
1 files changed, 0 insertions(+), 139 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/SecondMaintenanceOrderExpiredJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/SecondMaintenanceOrderExpiredJob.java
deleted file mode 100644
index d9e3f7f..0000000
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/SecondMaintenanceOrderExpiredJob.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.jeecg.modules.eam.job;
-
-import cn.hutool.core.collection.CollectionUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.util.ThrowableUtil;
-import org.jeecg.modules.eam.constant.SecondMaintenanceStatusEnum;
-import org.jeecg.modules.eam.constant.WeekMaintenanceStatusEnum;
-import org.jeecg.modules.eam.entity.EamSecondMaintenanceOrder;
-import org.jeecg.modules.eam.service.IEamSecondMaintenanceOrderService;
-import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
-import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
-import org.jeecg.modules.flowable.service.IFlowTaskService;
-import org.jeecg.modules.quartz.entity.QuartzJob;
-import org.jeecg.modules.quartz.entity.SysQuartzLog;
-import org.jeecg.modules.quartz.service.IQuartzJobService;
-import org.jeecg.modules.quartz.service.ISysQuartzLogService;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDate;
-import java.util.Date;
-import java.util.List;
-
-@Component
-@Slf4j
-public class SecondMaintenanceOrderExpiredJob implements Job {
-
- @Autowired
- private IEamSecondMaintenanceOrderService eamSecondMaintenanceOrderService;
-
- @Autowired
- private IFlowMyBusinessService flowMyBusinessService;
- @Autowired
- private IFlowTaskService flowTaskService;
- @Autowired
- private ISysQuartzLogService sysQuartzLogService;
- @Autowired
- private IQuartzJobService quartzJobService;
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
- //浠诲姟鏃ュ織
- SysQuartzLog quartzLog = new SysQuartzLog();
- quartzLog.setCreateTime(new Date());
- List<QuartzJob> byJobClassName = quartzJobService.findByJobClassName(this.getClass().getName());
- if (byJobClassName != null && !byJobClassName.isEmpty()) {
- quartzLog.setJobId(byJobClassName.get(0).getId());
- }
- long startTime = System.currentTimeMillis();
- LocalDate now = LocalDate.now();
- try {
-
- List<EamSecondMaintenanceOrder> unCompleteOrderList = eamSecondMaintenanceOrderService.lambdaQuery()
- .lt(EamSecondMaintenanceOrder::getMaintenanceDate, now.toString())
- .in(EamSecondMaintenanceOrder::getMaintenanceStatus, SecondMaintenanceStatusEnum.WAIT_MAINTENANCE, SecondMaintenanceStatusEnum.UNDER_MAINTENANCE)
- .orderByDesc(EamSecondMaintenanceOrder::getMaintenanceDate)
- .list();
-
- if (CollectionUtil.isEmpty(unCompleteOrderList)) {
- //娌℃湁闇�瑕佸鐞嗙殑鏁版嵁
- return;
- }
- for (EamSecondMaintenanceOrder order : unCompleteOrderList) {
- if (SecondMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(order.getMaintenanceStatus())) {
- order.setMaintenanceStatus(SecondMaintenanceStatusEnum.ABOLISH.name());
- } else if (WeekMaintenanceStatusEnum.UNDER_MAINTENANCE.name().equals(order.getMaintenanceStatus())) {
- //宸茬粡琚帴鍗� 浣嗘湭鎵ц瀹屾垚
- order.setMaintenanceStatus(SecondMaintenanceStatusEnum.ABOLISH.name());
- //寮哄埗缁撴潫娴佺▼ 鍒犻櫎鐢ㄦ埛鐨勬寰呭姙浠诲姟
- FlowMyBusiness flowMyBusiness = flowMyBusinessService.selectByDataId(order.getId());
- if (flowMyBusiness != null) {
- flowTaskService.end(flowMyBusiness.getProcessInstanceId(), "杩囨湡鍒犻櫎");
- }
- }
- }
- eamSecondMaintenanceOrderService.updateBatchById(unCompleteOrderList);
- quartzLog.setIsSuccess(0);
- } catch (Exception e) {
- log.error("浜屼繚杩囨湡鎵ц瀹氭椂浠诲姟澶辫触锛寋}", e.getMessage(), e);
- quartzLog.setIsSuccess(-1);
- quartzLog.setExceptionDetail(ThrowableUtil.getStackTrace(e));
- }
- long endTime = System.currentTimeMillis();
- quartzLog.setExecutionTime(Integer.parseInt(String.valueOf(endTime - startTime)));
- sysQuartzLogService.save(quartzLog);
- }
-
-}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/SecondMaintenanceOrderGenerateJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/SecondMaintenanceOrderGenerateJob.java
deleted file mode 100644
index 111a0ea..0000000
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/SecondMaintenanceOrderGenerateJob.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package org.jeecg.modules.eam.job;
-
-import cn.hutool.core.collection.CollectionUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.util.DateUtils;
-import org.jeecg.modules.eam.constant.BusinessCodeConst;
-import org.jeecg.modules.eam.constant.MaintenanceCategoryEnum;
-import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
-import org.jeecg.modules.eam.entity.*;
-import org.jeecg.modules.eam.request.EamSecondMaintenanceRequest;
-import org.jeecg.modules.eam.request.EamWeekMaintenanceRequest;
-import org.jeecg.modules.eam.service.IEamMaintenanceStandardDetailService;
-import org.jeecg.modules.eam.service.IEamMaintenanceStandardService;
-import org.jeecg.modules.eam.service.IEamSecondMaintenanceOrderService;
-import org.jeecg.modules.eam.service.IEamWeekMaintenanceOrderService;
-import org.jeecg.common.util.ThrowableUtil;
-import org.jeecg.modules.quartz.entity.QuartzJob;
-import org.jeecg.modules.quartz.entity.SysQuartzLog;
-import org.jeecg.modules.quartz.service.IQuartzJobService;
-import org.jeecg.modules.quartz.service.ISysQuartzLogService;
-import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Component
-@Slf4j
-public class SecondMaintenanceOrderGenerateJob implements Job {
-
- @Autowired
- private IEamSecondMaintenanceOrderService eamSecondMaintenanceOrderService;
- @Autowired
- private IEamMaintenanceStandardService eamMaintenanceStandardService;
- @Autowired
- private IEamMaintenanceStandardDetailService eamMaintenanceStandardDetailService;
- @Autowired
- private ISysBusinessCodeRuleService businessCodeRuleService;
- @Autowired
- private ISysQuartzLogService sysQuartzLogService;
- @Autowired
- private IQuartzJobService quartzJobService;
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-
- //浠诲姟鏃ュ織
- SysQuartzLog quartzLog = new SysQuartzLog();
- quartzLog.setCreateTime(new Date());
- List<QuartzJob> byJobClassName = quartzJobService.findByJobClassName(this.getClass().getName());
- if (byJobClassName != null && !byJobClassName.isEmpty()) {
- quartzLog.setJobId(byJobClassName.get(0).getId());
- }
- long startTime = System.currentTimeMillis();
- /**
- * 鑾峰彇 閰嶇疆浜� 浜屼繚鏍囧噯鐨� 淇℃伅
- */
- List<EamMaintenanceStandard> standardList = eamMaintenanceStandardService.queryListByCategory(MaintenanceCategoryEnum.SECOND_MAINTENANCE.name());
- if (CollectionUtil.isEmpty(standardList)) {
- log.warn("娌℃湁閰嶇疆浠讳綍浜屼繚鏍囧噯锛屼换鍔＄粨鏉�");
- return;
- }
- //褰撳墠鏃ユ湡
- LocalDate now = LocalDate.now();
- try {
- for (EamMaintenanceStandard standard : standardList) {
- if (standard.getMaintenancePeriod() == null || standard.getMaintenancePeriod() < 1) {
- log.error("浜屼繚鏍囧噯鍛ㄦ湡璁剧疆閿欒锛岃鍏堥厤缃爣鍑嗗懆鏈�, standard:{}", standard);
- continue;
- }
- if (standard.getInitialDate() == null) {
- //璁剧疆鍒濆鏃ユ湡涓哄墠涓�澶�
- standard.setInitialDate(DateUtils.localDateToDate(now.minusDays(1)));
- }
- LocalDate generateDate = DateUtils.dateToLocalDate(standard.getInitialDate());
-// if (standard.getLastGenerateTime() != null) {
-// generateDate = DateUtils.dateToLocalDate(standard.getLastGenerateTime());
-// }
- //鍔犲懆鏈�
- do {
- //鍒濆鏃ユ湡璁剧疆鐨勬瘮杈冩棭锛屾垨浠诲姟闀挎椂闂存病鎵ц锛屽繀椤诲懆鏈熷埌浠婂ぉ鎵嶄細鐢熸垚宸ュ崟
- generateDate = generateDate.plusDays(standard.getMaintenancePeriod());
- } while (now.isAfter(generateDate));
- if(!now.isEqual(generateDate)) {
- //杩樻湭鍒扮敓鎴愭棩鏈燂紝璺宠繃鎵ц
- continue;
- }
- //鑾峰彇淇濆吇椤规槑缁�
- List<EamMaintenanceStandardDetail> standardDetailList = eamMaintenanceStandardDetailService.selectByStandardId(standard.getId());
- if(CollectionUtil.isEmpty(standardDetailList)) {
- log.error("浜屼繚鏍囧噯娌℃湁淇濆吇鏄庣粏锛岃鍏堥厤缃繚鍏绘槑缁�, standard:{}", standard);
- continue;
- }
- //寮�濮嬬敓鎴�
- EamSecondMaintenanceRequest request = new EamSecondMaintenanceRequest();
- request.setEquipmentId(standard.getEquipmentId());
- request.setStandardId(standard.getId());
- request.setMaintenanceDate(DateUtils.localDateToDate(generateDate));
- String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.SECOND_MAINTENANCE_CODE_RULE);
- request.setOrderNum(codeSeq);
- request.setCreationMethod(OrderCreationMethodEnum.AUTO.name());
-
- List<EamSecondMaintenanceOrderDetail> tableDetailList = new ArrayList<>();
- for (EamMaintenanceStandardDetail msd : standardDetailList) {
- EamSecondMaintenanceOrderDetail sod = new EamSecondMaintenanceOrderDetail();
- sod.setItemCode(msd.getItemCode());
- sod.setItemCategory(msd.getItemPart());
- sod.setItemName(msd.getItemName());
- sod.setMaintenanceResult(msd.getItemDemand());
- tableDetailList.add(sod);
- }
-// List<EamSecondMaintenanceOrderDetail> collect = standardDetailList.stream().map(EamSecondMaintenanceOrderDetail::new).collect(Collectors.toList());
- request.setTableDetailList(tableDetailList);
- eamSecondMaintenanceOrderService.addMaintenance(request);
-
-// standard.setLastGenerateTime(new Date());
- eamMaintenanceStandardService.updateById(standard);
- }
- quartzLog.setIsSuccess(0);
- } catch (Exception e) {
- log.error("浜屼繚鐢熸垚鎵ц瀹氭椂浠诲姟澶辫触锛寋}", e.getMessage(), e);
- quartzLog.setIsSuccess(-1);
- quartzLog.setExceptionDetail(ThrowableUtil.getStackTrace(e));
- }
- long endTime = System.currentTimeMillis();
- quartzLog.setExecutionTime(Integer.parseInt(String.valueOf(endTime - startTime)));
- sysQuartzLogService.save(quartzLog);
-
- }
-}
--
Gitblit v1.9.3