From 1eab27b32154cbde5045569a5cbb5f464f4f9889 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 21 三月 2025 11:02:44 +0800
Subject: [PATCH] art: 设备管理-抽取 common 模块
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/AssetStatusEnum.java | 0
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentFaultReasonMapper.java | 5 --
lxzn-module-eam/pom.xml | 5 ++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentExtendServiceImpl.java | 0
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentHistoryLogMapper.java | 3 -
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamProcessParametersController.java | 15 -------
lxzn-module-eam-common/pom.xml | 22 +++++++++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentFaultReasonMapper.xml | 0
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentFaultReasonService.java | 2
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentExtendService.java | 0
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentHistoryLogService.java | 0
pom.xml | 3 +
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentOperationTagEnum.java | 0
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java | 6 +++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentExtendMapper.xml | 0
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java | 5 --
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/annotation/EquipmentHistoryLog.java | 0
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java | 0
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentFaultReason.java | 21 +++++-----
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java | 0
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSysFilesRequest.java | 5 --
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentFaultReasonServiceImpl.java | 0
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentHistoryLog.java | 2
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 0
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentMaintenanceStatus.java | 0
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentExtendMapper.java | 3 -
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 0
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentHistoryLogServiceImpl.java | 0
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java | 0
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentRepairStatus.java | 0
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentExtend.java | 2
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentHistoryLogMapper.xml | 0
32 files changed, 50 insertions(+), 49 deletions(-)
diff --git a/lxzn-module-eam-common/pom.xml b/lxzn-module-eam-common/pom.xml
new file mode 100644
index 0000000..d1d3a8f
--- /dev/null
+++ b/lxzn-module-eam-common/pom.xml
@@ -0,0 +1,22 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jeecgframework.boot</groupId>
+ <artifactId>lxzn-boot-parent</artifactId>
+ <version>3.4.3</version>
+ </parent>
+ <artifactId>lxzn-module-eam-common</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jeecgframework.boot</groupId>
+ <artifactId>lxzn-boot-base-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jeecgframework.boot</groupId>
+ <artifactId>lxzn-system-biz</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/lxzn-module-eam/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
similarity index 94%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java
index f6ee8f9..1bde718 100644
--- a/lxzn-module-eam/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
@@ -12,13 +12,8 @@
import org.jeecg.modules.eam.service.IEamEquipmentHistoryLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Date;
/**
* 璁惧灞ュ巻 鍒囬潰瀹炵幇
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/aspect/annotation/EquipmentHistoryLog.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/annotation/EquipmentHistoryLog.java
similarity index 100%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/aspect/annotation/EquipmentHistoryLog.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/annotation/EquipmentHistoryLog.java
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/constant/AssetStatusEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/AssetStatusEnum.java
similarity index 100%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/constant/AssetStatusEnum.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/AssetStatusEnum.java
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
similarity index 100%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/constant/EquipmentMaintenanceStatus.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentMaintenanceStatus.java
similarity index 100%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/constant/EquipmentMaintenanceStatus.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentMaintenanceStatus.java
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/constant/EquipmentOperationTagEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentOperationTagEnum.java
similarity index 100%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/constant/EquipmentOperationTagEnum.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentOperationTagEnum.java
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/constant/EquipmentRepairStatus.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentRepairStatus.java
similarity index 100%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/constant/EquipmentRepairStatus.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentRepairStatus.java
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
similarity index 97%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
index 7807ceb..337ec93 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
@@ -174,4 +174,10 @@
/**澶囨敞*/
@ApiModelProperty(value = "澶囨敞")
private java.lang.String remark;
+ /**
+ * 浣跨敤閮ㄩ棬鎵�鏈塈D
+ * 浣跨敤閮ㄩ棬ID + 鍏舵墍鏈夌埗绾D, 浠ラ�楀彿鍒嗗壊
+ */
+ @ApiModelProperty(value = "浣跨敤閮ㄩ棬鎵�鏈塈D")
+ private String orgParentIds;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentExtend.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentExtend.java
similarity index 98%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentExtend.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentExtend.java
index f7f741b..25c8c5d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentExtend.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentExtend.java
@@ -11,7 +11,7 @@
import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
-import java.util.Date;
+
/**
* @Description: 璁惧鍙拌处鎵╁睍琛�
* @Author: jeecg-boot
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentFaultReason.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentFaultReason.java
similarity index 83%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentFaultReason.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentFaultReason.java
index a4a4b98..c4ebc41 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentFaultReason.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentFaultReason.java
@@ -13,6 +13,7 @@
import java.io.Serializable;
import java.util.Date;
+
/**
* @Description: 璁惧鏁呴殰鍘熷洜缁存姢
* @Author: jeecg-boot
@@ -29,37 +30,37 @@
/**涓婚敭*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
- private java.lang.String id;
+ private String id;
/**鍒涘缓浜�*/
@ApiModelProperty(value = "鍒涘缓浜�")
- private java.lang.String createBy;
+ private String createBy;
/**鍒涘缓鏃堕棿*/
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private java.util.Date createTime;
+ private Date createTime;
/**鏇存柊浜�*/
@ApiModelProperty(value = "鏇存柊浜�")
- private java.lang.String updateBy;
+ private String updateBy;
/**鏇存柊鏃堕棿*/
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- private java.util.Date updateTime;
+ private Date updateTime;
/**鍒犻櫎鏍囪*/
@ApiModelProperty(value = "鍒犻櫎鏍囪")
- private java.lang.Integer delFlag;
+ private Integer delFlag;
/**鏁呴殰缂栫爜*/
@Excel(name = "鏁呴殰缂栫爜", width = 25)
@ApiModelProperty(value = "鏁呴殰缂栫爜")
- private java.lang.String faultCode;
+ private String faultCode;
/**鏁呴殰绠�绉�*/
@Excel(name = "鏁呴殰绠�绉�", width = 25)
@ApiModelProperty(value = "鏁呴殰绠�绉�")
- private java.lang.String faultName;
+ private String faultName;
/**鏁呴殰鎻忚堪*/
@Excel(name = "鏁呴殰鎻忚堪", width = 50)
@ApiModelProperty(value = "鏁呴殰鎻忚堪")
- private java.lang.String faultDescription;
+ private String faultDescription;
/**鏁呴殰鍒嗙被*/
@Excel(name = "鏁呴殰鍒嗙被", width = 15, dicCode = "fault_reason_category")
@ApiModelProperty(value = "鏁呴殰鍒嗙被")
@Dict(dicCode = "fault_reason_category")
- private java.lang.String faultCategory;
+ private String faultCategory;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentHistoryLog.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentHistoryLog.java
similarity index 98%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentHistoryLog.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentHistoryLog.java
index 80f98c5..917b058 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentHistoryLog.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentHistoryLog.java
@@ -11,7 +11,7 @@
import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
-import java.util.Date;
+
/**
* @Description: 璁惧灞ュ巻
* @Author: jeecg-boot
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentExtendMapper.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentExtendMapper.java
similarity index 83%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentExtendMapper.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentExtendMapper.java
index 52eb8a9..47b3123 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentExtendMapper.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentExtendMapper.java
@@ -1,8 +1,5 @@
package org.jeecg.modules.eam.mapper;
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamEquipmentExtend;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentFaultReasonMapper.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentFaultReasonMapper.java
similarity index 84%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentFaultReasonMapper.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentFaultReasonMapper.java
index ffee336..05c4b9b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentFaultReasonMapper.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentFaultReasonMapper.java
@@ -1,10 +1,7 @@
package org.jeecg.modules.eam.mapper;
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.eam.entity.EamEquipmentFaultReason;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.eam.entity.EamEquipmentFaultReason;
/**
* @Description: 璁惧鏁呴殰鍘熷洜缁存姢
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentHistoryLogMapper.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentHistoryLogMapper.java
similarity index 83%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentHistoryLogMapper.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentHistoryLogMapper.java
index 873a046..bf68bc1 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentHistoryLogMapper.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentHistoryLogMapper.java
@@ -1,8 +1,5 @@
package org.jeecg.modules.eam.mapper;
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamEquipmentHistoryLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java
similarity index 100%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentExtendMapper.xml b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentExtendMapper.xml
similarity index 100%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentExtendMapper.xml
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentExtendMapper.xml
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentFaultReasonMapper.xml b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentFaultReasonMapper.xml
similarity index 100%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentFaultReasonMapper.xml
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentFaultReasonMapper.xml
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentHistoryLogMapper.xml b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentHistoryLogMapper.xml
similarity index 100%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentHistoryLogMapper.xml
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentHistoryLogMapper.xml
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
similarity index 100%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentExtendService.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentExtendService.java
similarity index 100%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentExtendService.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentExtendService.java
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentFaultReasonService.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentFaultReasonService.java
similarity index 99%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentFaultReasonService.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentFaultReasonService.java
index dd64905..e0b0290 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentFaultReasonService.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentFaultReasonService.java
@@ -1,7 +1,7 @@
package org.jeecg.modules.eam.service;
-import org.jeecg.modules.eam.entity.EamEquipmentFaultReason;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.eam.entity.EamEquipmentFaultReason;
/**
* @Description: 璁惧鏁呴殰鍘熷洜缁存姢
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentHistoryLogService.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentHistoryLogService.java
similarity index 100%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentHistoryLogService.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentHistoryLogService.java
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
similarity index 100%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentExtendServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentExtendServiceImpl.java
similarity index 100%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentExtendServiceImpl.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentExtendServiceImpl.java
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentFaultReasonServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentFaultReasonServiceImpl.java
similarity index 100%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentFaultReasonServiceImpl.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentFaultReasonServiceImpl.java
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentHistoryLogServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentHistoryLogServiceImpl.java
similarity index 100%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentHistoryLogServiceImpl.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentHistoryLogServiceImpl.java
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
similarity index 100%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
diff --git a/lxzn-module-eam/pom.xml b/lxzn-module-eam/pom.xml
index 1aaf5a1..8d6c34d 100644
--- a/lxzn-module-eam/pom.xml
+++ b/lxzn-module-eam/pom.xml
@@ -20,6 +20,11 @@
<groupId>org.jeecgframework.boot</groupId>
<artifactId>lxzn-system-biz</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jeecgframework.boot</groupId>
+ <artifactId>lxzn-module-eam-common</artifactId>
+ <version>3.4.3</version>
+ </dependency>
</dependencies>
</project>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamProcessParametersController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamProcessParametersController.java
index c8499af..6fe8e3a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamProcessParametersController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamProcessParametersController.java
@@ -1,40 +1,25 @@
package org.jeecg.modules.eam.controller;
import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.entity.EamProcessParameters;
import org.jeecg.modules.eam.service.IEamProcessParametersService;
-import java.util.Date;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSysFilesRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSysFilesRequest.java
index 75e56c9..43f9b21 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSysFilesRequest.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSysFilesRequest.java
@@ -1,18 +1,13 @@
package org.jeecg.modules.eam.request;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.api.vo.FileUploadResult;
-import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
-import java.util.Date;
import java.util.List;
/**
diff --git a/pom.xml b/pom.xml
index 86773ae..1c6289c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,8 @@
<module>lxzn-module-flowable</module>
<module>lxzn-module-msi</module>
<module>lxzn-module-eam</module>
- </modules>
+ <module>lxzn-module-eam-common</module>
+ </modules>
<repositories>
<repository>
--
Gitblit v1.9.3