From fb5aa087eaf6a68cf7ea8114beb270551016e7dd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 29 七月 2025 11:27:45 +0800
Subject: [PATCH] 添加定型指派设备
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 110 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java
index 1bde718..0cae0d9 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java
@@ -1,14 +1,16 @@
package org.jeecg.modules.eam.aspect;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.*;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
-import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
-import org.jeecg.modules.eam.entity.EamEquipment;
-import org.jeecg.modules.eam.entity.EamEquipmentHistoryLog;
+import org.jeecg.modules.eam.constant.*;
+import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.IEamEquipmentHistoryLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -54,7 +56,9 @@
log.setBusinessTable(syslog.businessTable());
log.setOperationTag(syslog.operationTag().name());
convertResult(log, syslog.operationTag(), result);
- equipmentHistoryLogService.save(log);
+ if (StringUtils.isNotBlank(log.getEquipmentId())) {
+ equipmentHistoryLogService.save(log);
+ }
}
}
@@ -62,7 +66,7 @@
private void convertResult(EamEquipmentHistoryLog log, EquipmentOperationTagEnum operationTag, Object result) {
switch (operationTag) {
case ACCEPTANCE:
- if(result instanceof EamEquipment) {
+ if (result instanceof EamEquipment) {
EamEquipment equipment = (EamEquipment) result;
log.setEquipmentId(equipment.getId());
log.setBusinessId(equipment.getId());
@@ -72,30 +76,130 @@
}
break;
case POINT_INSPECTION:
+ if (result instanceof EamInspectionOrder) {
+ EamInspectionOrder order = (EamInspectionOrder) result;
+ if (InspectionStatus.COMPLETE.name().equals(order.getInspectionStatus())) {
+ log.setEquipmentId(order.getEquipmentId());
+ log.setBusinessId(order.getId());
+ log.setOperator(order.getOperator());
+ log.setDescription(order.getConfirmComment());
+ log.setCreateTime(order.getOperateTime());
+ }
+ }
+ break;
+ case WEEK_MAINTENANCE:
+ if (result instanceof EamWeekMaintenanceOrder) {
+ EamWeekMaintenanceOrder order = (EamWeekMaintenanceOrder) result;
+ if (WeekMaintenanceStatusEnum.COMPLETE.name().equals(order.getMaintenanceStatus())) {
+ log.setEquipmentId(order.getEquipmentId());
+ log.setBusinessId(order.getId());
+ log.setOperator(order.getOperator());
+ log.setDescription(order.getFinalAcceptanceComment());
+ log.setCreateTime(order.getActualEndTime());
+ }
+ }
break;
case SECOND_MAINTENANCE:
+ if (result instanceof EamSecondMaintenanceOrder) {
+ EamSecondMaintenanceOrder order = (EamSecondMaintenanceOrder) result;
+ if (SecondMaintenanceStatusEnum.COMPLETE.name().equals(order.getMaintenanceStatus())) {
+ log.setEquipmentId(order.getEquipmentId());
+ log.setBusinessId(order.getId());
+ log.setOperator(order.getOperator());
+ log.setDescription(order.getConfirmComment());
+ log.setCreateTime(order.getActualEndTime());
+ }
+ }
break;
case THIRD_MAINTENANCE:
+ if (result instanceof EamThirdMaintenanceOrder) {
+ EamThirdMaintenanceOrder order = (EamThirdMaintenanceOrder) result;
+ if (ThirdMaintenanceStatusEnum.COMPLETE.name().equals(order.getMaintenanceStatus())) {
+ log.setEquipmentId(order.getEquipmentId());
+ log.setBusinessId(order.getId());
+ log.setOperator(order.getOperator());
+ log.setDescription(order.getLeaderConfirmComment());
+ log.setCreateTime(order.getActualEndTime());
+ }
+ }
break;
case REPORT_REPAIR:
+ if (result instanceof EamReportRepair) {
+ EamReportRepair repair = (EamReportRepair) result;
+ log.setEquipmentId(repair.getEquipmentId());
+ log.setBusinessId(repair.getId());
+ log.setOperator(repair.getCreateBy());
+ log.setDescription(repair.getFaultDescription());
+ log.setCreateTime(repair.getFaultStartTime());
+ }
break;
case REPAIRED:
+ if (result instanceof EamRepairOrder) {
+ EamRepairOrder order = (EamRepairOrder) result;
+ if (ReportRepairEnum.COMPLETE.name().equals(order.getRepairStatus())) {
+ log.setEquipmentId(order.getEquipmentId());
+ log.setBusinessId(order.getId());
+ log.setOperator(order.getRepairer());
+ log.setDescription(order.getRepairDescription());
+ log.setCreateTime(order.getActualEndTime());
+ }
+ }
break;
case MAJOR_REPAIR:
break;
case PARTIAL_REPAIR:
break;
case LEAN_OUT:
+ if (result instanceof EamEquipmentLeanOut) {
+ EamEquipmentLeanOut order = (EamEquipmentLeanOut) result;
+ if (EquipmentLeanOutStatusEnum.COMPLETE.name().equals(order.getLeanStatus())) {
+ log.setEquipmentId(order.getEquipmentId());
+ log.setBusinessId(order.getId());
+ log.setOperator(order.getLeanPerson());
+ log.setDescription(order.getLeanReason());
+ log.setCreateTime(order.getLeanStartTime());
+ }
+ }
break;
case GIVE_BACK:
break;
case SEAL_UP:
+ if (result instanceof EamEquipmentSealUp) {
+ EamEquipmentSealUp order = (EamEquipmentSealUp) result;
+ if (EquipmentSealUpStatusEnum.COMPLETE.name().equals(order.getSealStatus())) {
+ log.setEquipmentId(order.getEquipmentId());
+ log.setBusinessId(order.getId());
+ log.setOperator(order.getReportUser());
+ log.setDescription(order.getSealUpReason());
+ log.setCreateTime(order.getSealEndTime());
+ }
+ }
break;
case UNSEALED:
break;
case TRANSFERRED:
+ if (result instanceof EamEquipmentTransfer) {
+ EamEquipmentTransfer order = (EamEquipmentTransfer) result;
+ if (EquipmentTransferStatusEnum.COMPLETE.name().equals(order.getTransferStatus())) {
+ log.setEquipmentId(order.getEquipmentId());
+ log.setBusinessId(order.getId());
+ log.setOperator(order.getReportUser());
+ log.setDescription(order.getTransferReason());
+ log.setCreateTime(order.getTransferTime());
+ }
+ }
break;
case SCRAPPED:
+ if (result instanceof EamEquipmentScrap) {
+ EamEquipmentScrap order = (EamEquipmentScrap) result;
+ if (EquipmentScrapStatusEnum.COMPLETE.name().equals(order.getScrapStatus())) {
+ log.setEquipmentId(order.getEquipmentId());
+ log.setBusinessId(order.getId());
+ log.setOperator(order.getReportUser());
+ log.setDescription(order.getScrapReason());
+ log.setCreateTime(order.getScrapTime());
+ }
+ }
break;
default:
break;
--
Gitblit v1.9.3