art: 设备管理-抽取 common 模块

zhangherong

2025-03-21 1eab27b32154cbde5045569a5cbb5f464f4f9889

art: 设备管理-抽取 common 模块

 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>

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java

ÎļþÃû´Ó lxzn-module-eam/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;

/**
 * è®¾å¤‡å±¥åŽ† åˆ‡é¢å®žçŽ°

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/annotation/EquipmentHistoryLog.java

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/AssetStatusEnum.java

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentMaintenanceStatus.java

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentOperationTagEnum.java

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentRepairStatus.java

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java

ÎļþÃû´Ó lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java ÐÞ¸Ä
@@ -174,4 +174,10 @@
    /**备注*/
    @ApiModelProperty(value = "备注")
    private java.lang.String remark;
    /**
     * ä½¿ç”¨éƒ¨é—¨æ‰€æœ‰ID
     * ä½¿ç”¨éƒ¨é—¨ID + å…¶æ‰€æœ‰çˆ¶çº§ID, ä»¥é€—号分割
     */
    @ApiModelProperty(value = "使用部门所有ID")
    private String orgParentIds;
}

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentExtend.java

ÎļþÃû´Ó lxzn-module-eam/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

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentFaultReason.java

ÎļþÃû´Ó lxzn-module-eam/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;
}

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentHistoryLog.java

ÎļþÃû´Ó lxzn-module-eam/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

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentExtendMapper.java

ÎļþÃû´Ó lxzn-module-eam/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;


 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentFaultReasonMapper.java

ÎļþÃû´Ó lxzn-module-eam/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: è®¾å¤‡æ•…障原因维护

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentHistoryLogMapper.java

ÎļþÃû´Ó lxzn-module-eam/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;


 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentExtendMapper.xml

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentFaultReasonMapper.xml

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentHistoryLogMapper.xml

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentExtendService.java

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentFaultReasonService.java

ÎļþÃû´Ó lxzn-module-eam/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: è®¾å¤‡æ•…障原因维护

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentHistoryLogService.java

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentExtendServiceImpl.java

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentFaultReasonServiceImpl.java

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentHistoryLogServiceImpl.java

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java

 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>

 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;


 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;

/**

 pom.xml

@@ -69,6 +69,7 @@
        <module>lxzn-module-flowable</module>
        <module>lxzn-module-msi</module>
        <module>lxzn-module-eam</module>
        <module>lxzn-module-eam-common</module>
    </modules>

    <repositories>