Merge remote-tracking branch 'origin/master'

lyh

2025-03-31 8faaceda003257c00056ebdf931ad166318066d6

Merge remote-tracking branch 'origin/master'

 db/Êý¾Ý¿â²úÆ·»¯Éè¼Æ.pdma.json

@@ -4,7 +4,7 @@
  "avatar": "",
  "version": "4.9.2",
  "createdTime": "2025-3-10 16:38:19",
  "updatedTime": "2025-3-21 11:45:26",
  "updatedTime": "2025-3-28 11:35:57",
  "dbConns": [],
  "profile": {
    "default": {
@@ -3803,6 +3803,24 @@
          "id": "E3DCF832-3942-40E3-A580-5F5E12DEEE1A"
        },
        {
          "defKey": "initial_date",
          "defName": "初始日期",
          "comment": "从哪一天开始计算下次保养日期",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098",
          "extProps": {},
          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
          "id": "EBB74A97-DCBD-4D07-925C-B764CC72D78E"
        },
        {
          "defKey": "maintenance_category",
          "defName": "保养分类",
          "comment": "",
@@ -3873,6 +3891,42 @@
          "extProps": {},
          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
          "id": "DDF7469B-D370-47CD-B2ED-908EFB518712"
        },
        {
          "defKey": "file_code",
          "defName": "文件编码",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "id": "41E30E92-FC92-4E2C-AE7D-AFF4D9371B27"
        },
        {
          "defKey": "reference_file",
          "defName": "参考文件",
          "comment": "保养时参考的保养步骤",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "id": "5576D652-16B0-4098-A22E-0B2F5EF98107"
        }
      ],
      "correlations": [],
@@ -4138,8 +4192,44 @@
          "id": "2DCD0BA1-6667-4437-BCFF-435A35241D87"
        },
        {
          "defKey": "standard_id",
          "defName": "标准id",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "id": "3C255F33-FF50-4CCE-AE46-814FE2C49E17"
        },
        {
          "defKey": "item_code",
          "defName": "项目序号",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811",
          "extProps": {},
          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
          "id": "CEA9D86B-B482-47B7-977D-D9BA958F0E12"
        },
        {
          "defKey": "item_name",
          "defName": "保养项名称",
          "defName": "保养项目",
          "comment": "",
          "type": "",
          "len": "",
@@ -4156,6 +4246,24 @@
          "id": "95BC61CF-E7E8-4252-B0A5-A18A99449834"
        },
        {
          "defKey": "sub_item_name",
          "defName": "子项目",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "id": "8D5380F2-3F75-4123-81BA-7242CE698481"
        },
        {
          "defKey": "item_demand",
          "defName": "保养要求",
          "comment": "",

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

@@ -7,6 +7,8 @@
    String PROCESS_PARAMETERS_RULE = "ProcessParametersRule";
    //设备故障原因编码规则
    String EQUIPMENT_FAULT_REASON_RULE = "EquipmentFaultReasonRule";
    //保养标准编码规则
    String MAINTENANCE_STANDARD_CODE_RULE = "MaintenanceStandardCodeRule";
    /**
     * å¤‡ä»¶è¯·è´­å•çŠ¶æ€ 1:已创建 2:已提交 3:已通过 4:已驳回 5:已完成
     */

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
package org.jeecg.modules.eam.constant;

/**
 * ä¿å…»åˆ†ç±»
 */
public enum MaintenanceCategoryEnum {
    POINT_INSPECTION, //点检
    WEEK_MAINTENANCE, //周保
    ;
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
package org.jeecg.modules.eam.constant;

/**
 * ä¿å…»æ ‡å‡†çŠ¶æ€
 */
public enum MaintenanceStandardStatusEnum {
    NORMAL,
    ABOLISH,;
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,185 @@
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 cn.hutool.core.collection.CollectionUtil;
import org.jeecg.common.api.vo.Result;
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.EamMaintenanceStandard;
import org.jeecg.modules.eam.request.EamMaintenanceStandardRequest;
import org.jeecg.modules.eam.service.IEamMaintenanceStandardService;
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;

 /**
 * @Description: ä¿å…»æ ‡å‡†
 * @Author: jeecg-boot
 * @Date:   2025-03-26
 * @Version: V1.0
 */
@Slf4j
@Api(tags="保养标准")
@RestController
@RequestMapping("/eam/maintenanceStandard")
public class EamMaintenanceStandardController extends JeecgController<EamMaintenanceStandard, IEamMaintenanceStandardService> {
    @Autowired
    private IEamMaintenanceStandardService eamMaintenanceStandardService;
     @Autowired
     private ISysBusinessCodeRuleService businessCodeRuleService;
	
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param eamMaintenanceStandard
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @AutoLog(value = "保养标准-分页列表查询")
    @ApiOperation(value="保养标准-分页列表查询", notes="保养标准-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamMaintenanceStandard eamMaintenanceStandard,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<EamMaintenanceStandard> queryWrapper = QueryGenerator.initQueryWrapper(eamMaintenanceStandard, req.getParameterMap());
        Page<EamMaintenanceStandard> page = new Page<EamMaintenanceStandard>(pageNo, pageSize);
        IPage<EamMaintenanceStandard> pageList = eamMaintenanceStandardService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
	
    /**
     * æ·»åŠ 
     *
     * @param standardRequest
     * @return
     */
    @AutoLog(value = "保养标准-添加")
    @ApiOperation(value="保养标准-添加", notes="保养标准-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamMaintenanceStandardRequest standardRequest) {
        if(standardRequest == null){
            return Result.error("添加的对象不能为空！");
        }
        if(CollectionUtil.isEmpty(standardRequest.getTableDetailList())) {
            return Result.error("保养项不能为空！");
        }
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.MAINTENANCE_STANDARD_CODE_RULE);
        standardRequest.setStandardCode(codeSeq);
        boolean b = eamMaintenanceStandardService.addMaintenanceStandard(standardRequest);
        if(!b) {
            return Result.error("添加失败！");
        }
        return Result.OK("添加成功！");
    }
	
    /**
     * ç¼–辑
     *
     * @param standardRequest
     * @return
     */
    @AutoLog(value = "保养标准-编辑")
    @ApiOperation(value="保养标准-编辑", notes="保养标准-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<?> edit(@RequestBody EamMaintenanceStandardRequest standardRequest) {
//        eamMaintenanceStandardService.updateById(eamMaintenanceStandard);
        return Result.OK("编辑成功!");
    }
	
    /**
     * é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "保养标准-通过id删除")
    @ApiOperation(value="保养标准-通过id删除", notes="保养标准-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<?> delete(@RequestParam(name="id",required=true) String id) {
        eamMaintenanceStandardService.removeById(id);
        return Result.OK("删除成功!");
    }
	
    /**
     * æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "保养标准-批量删除")
    @ApiOperation(value="保养标准-批量删除", notes="保养标准-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.eamMaintenanceStandardService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功！");
    }
	
    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    @AutoLog(value = "保养标准-通过id查询")
    @ApiOperation(value="保养标准-通过id查询", notes="保养标准-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
        EamMaintenanceStandard eamMaintenanceStandard = eamMaintenanceStandardService.getById(id);
        return Result.OK(eamMaintenanceStandard);
    }

  /**
   * å¯¼å‡ºexcel
   *
   * @param request
   * @param eamMaintenanceStandard
   */
  @RequestMapping(value = "/exportXls")
  public ModelAndView exportXls(HttpServletRequest request, EamMaintenanceStandard eamMaintenanceStandard) {
      return super.exportXls(request, eamMaintenanceStandard, EamMaintenanceStandard.class, "保养标准");
  }

  /**
   * é€šè¿‡excel导入数据
   *
   * @param request
   * @param response
   * @return
   */
  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
      return super.importExcel(request, response, EamMaintenanceStandard.class);
  }

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardDetailController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,167 @@
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.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
import org.jeecg.modules.eam.service.IEamMaintenanceStandardDetailService;
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.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;

 /**
 * @Description: ä¿å…»æ ‡å‡†æ˜Žç»†
 * @Author: jeecg-boot
 * @Date:   2025-03-26
 * @Version: V1.0
 */
@Slf4j
@Api(tags="保养标准明细")
@RestController
@RequestMapping("/eam/eamMaintenanceStandardDetail")
public class EamMaintenanceStandardDetailController extends JeecgController<EamMaintenanceStandardDetail, IEamMaintenanceStandardDetailService> {
    @Autowired
    private IEamMaintenanceStandardDetailService eamMaintenanceStandardDetailService;
	
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param eamMaintenanceStandardDetail
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @AutoLog(value = "保养标准明细-分页列表查询")
    @ApiOperation(value="保养标准明细-分页列表查询", notes="保养标准明细-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamMaintenanceStandardDetail eamMaintenanceStandardDetail,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<EamMaintenanceStandardDetail> queryWrapper = QueryGenerator.initQueryWrapper(eamMaintenanceStandardDetail, req.getParameterMap());
        Page<EamMaintenanceStandardDetail> page = new Page<EamMaintenanceStandardDetail>(pageNo, pageSize);
        IPage<EamMaintenanceStandardDetail> pageList = eamMaintenanceStandardDetailService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
	
    /**
     * æ·»åŠ 
     *
     * @param eamMaintenanceStandardDetail
     * @return
     */
    @AutoLog(value = "保养标准明细-添加")
    @ApiOperation(value="保养标准明细-添加", notes="保养标准明细-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamMaintenanceStandardDetail eamMaintenanceStandardDetail) {
        eamMaintenanceStandardDetailService.save(eamMaintenanceStandardDetail);
        return Result.OK("添加成功！");
    }
	
    /**
     * ç¼–辑
     *
     * @param eamMaintenanceStandardDetail
     * @return
     */
    @AutoLog(value = "保养标准明细-编辑")
    @ApiOperation(value="保养标准明细-编辑", notes="保养标准明细-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<?> edit(@RequestBody EamMaintenanceStandardDetail eamMaintenanceStandardDetail) {
        eamMaintenanceStandardDetailService.updateById(eamMaintenanceStandardDetail);
        return Result.OK("编辑成功!");
    }
	
    /**
     * é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "保养标准明细-通过id删除")
    @ApiOperation(value="保养标准明细-通过id删除", notes="保养标准明细-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<?> delete(@RequestParam(name="id",required=true) String id) {
        eamMaintenanceStandardDetailService.removeById(id);
        return Result.OK("删除成功!");
    }
	
    /**
     * æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "保养标准明细-批量删除")
    @ApiOperation(value="保养标准明细-批量删除", notes="保养标准明细-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.eamMaintenanceStandardDetailService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功！");
    }
	
    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    @AutoLog(value = "保养标准明细-通过id查询")
    @ApiOperation(value="保养标准明细-通过id查询", notes="保养标准明细-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
        EamMaintenanceStandardDetail eamMaintenanceStandardDetail = eamMaintenanceStandardDetailService.getById(id);
        return Result.OK(eamMaintenanceStandardDetail);
    }

  /**
   * å¯¼å‡ºexcel
   *
   * @param request
   * @param eamMaintenanceStandardDetail
   */
  @RequestMapping(value = "/exportXls")
  public ModelAndView exportXls(HttpServletRequest request, EamMaintenanceStandardDetail eamMaintenanceStandardDetail) {
      return super.exportXls(request, eamMaintenanceStandardDetail, EamMaintenanceStandardDetail.class, "保养标准明细");
  }

  /**
   * é€šè¿‡excel导入数据
   *
   * @param request
   * @param response
   * @return
   */
  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
      return super.importExcel(request, response, EamMaintenanceStandardDetail.class);
  }

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,94 @@
package org.jeecg.modules.eam.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;
/**
 * @Description: ä¿å…»æ ‡å‡†
 * @Author: jeecg-boot
 * @Date:   2025-03-26
 * @Version: V1.0
 */
@Data
@TableName("eam_maintenance_standard")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="eam_maintenance_standard对象", description="保养标准")
public class EamMaintenanceStandard implements Serializable {
    
    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**创建人*/
    @Excel(name = "创建人", width = 15)
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**创建时间*/
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**更新人*/
    @Excel(name = "更新人", width = 15)
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新时间*/
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
    /**删除标记*/
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    private Integer delFlag;
    /**标准编码*/
    @Excel(name = "标准编码", width = 15)
    @ApiModelProperty(value = "标准编码")
    private String standardCode;
    /**标准名称*/
    @Excel(name = "标准名称", width = 15)
    @ApiModelProperty(value = "标准名称")
    private String standardName;
    /**保养周期;单位:天*/
    @Excel(name = "保养周期;单位:天", width = 15)
    @ApiModelProperty(value = "保养周期;单位:天")
    private Integer maintenancePeriod;
    /**初始日期 ä»Žå“ªä¸€å¤©å¼€å§‹è®¡ç®—下次保养日期*/
    @Excel(name = "初始日期", width = 15, format = "yyyy-MM-dd")
    @ApiModelProperty(value = "初始日期")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date initialDate;
    /**保养分类*/
    @Excel(name = "保养分类", width = 15)
    @ApiModelProperty(value = "保养分类")
    private String maintenanceCategory;
    /**设备ID*/
    @Excel(name = "设备ID", width = 15)
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**标准状态*/
    @Excel(name = "标准状态", width = 15)
    @ApiModelProperty(value = "标准状态")
    private String standardStatus;
    /**标准版本*/
    @Excel(name = "标准版本", width = 15)
    @ApiModelProperty(value = "标准版本")
    private Integer standardVersion;
    /**文件编号*/
    @Excel(name = "文件编号", width = 15)
    @ApiModelProperty(value = "文件编号")
    private String fileCode;
    /**参考文件*/
    @Excel(name = "参考文件", width = 15)
    @ApiModelProperty(value = "参考文件")
    private String referenceFile;
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
package org.jeecg.modules.eam.entity;

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 java.io.Serializable;
import java.util.Date;
/**
 * @Description: ä¿å…»æ ‡å‡†æ˜Žç»†
 * @Author: jeecg-boot
 * @Date:   2025-03-26
 * @Version: V1.0
 */
@Data
@TableName("eam_maintenance_standard_detail")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="eam_maintenance_standard_detail对象", description="保养标准明细")
public class EamMaintenanceStandardDetail implements Serializable {
    
    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**创建人*/
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**创建时间*/
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**更新人*/
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新时间*/
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
    /**删除标记*/
    @ApiModelProperty(value = "删除标记")
    private Integer delFlag;
    /**保养标准ID*/
    @ApiModelProperty(value = "保养标准ID")
    private String standardId;
    /**保养项序号*/
    @ApiModelProperty(value = "保养项序号")
    private String itemCode;
    /**保养项*/
    @ApiModelProperty(value = "保养项")
    private String itemName;
    /**子保养项*/
    @ApiModelProperty(value = "子保养项")
    private String subItemName;
    /**保养要求*/
    @ApiModelProperty(value = "保养要求")
    private String itemDemand;
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package org.jeecg.modules.eam.mapper;

import java.util.List;

import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * @Description: ä¿å…»æ ‡å‡†æ˜Žç»†
 * @Author: jeecg-boot
 * @Date:   2025-03-26
 * @Version: V1.0
 */
public interface EamMaintenanceStandardDetailMapper extends BaseMapper<EamMaintenanceStandardDetail> {

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package org.jeecg.modules.eam.mapper;

import java.util.List;

import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * @Description: ä¿å…»æ ‡å‡†
 * @Author: jeecg-boot
 * @Date:   2025-03-26
 * @Version: V1.0
 */
public interface EamMaintenanceStandardMapper extends BaseMapper<EamMaintenanceStandard> {

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.EamMaintenanceStandardDetailMapper">

</mapper>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.EamMaintenanceStandardMapper">

</mapper>

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamMaintenanceStandardRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,70 @@
package org.jeecg.modules.eam.request;

import com.fasterxml.jackson.annotation.JsonFormat;
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.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;
import java.util.List;

@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="eam_maintenance_standard对象", description="保养标准")
public class EamMaintenanceStandardRequest implements Serializable {

    /**主键*/
    @ApiModelProperty(value = "主键")
    private String id;
    /**标准编码*/
    @ApiModelProperty(value = "标准编码")
    private String standardCode;
    /**标准名称*/
    @ApiModelProperty(value = "标准名称")
    private String standardName;
    /**保养周期;单位:天*/
    @ApiModelProperty(value = "保养周期;单位:天")
    private Integer maintenancePeriod;
    /**初始日期 ä»Žå“ªä¸€å¤©å¼€å§‹è®¡ç®—下次保养日期*/
    @ApiModelProperty(value = "初始日期")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date initialDate;
    /**保养分类*/
    @ApiModelProperty(value = "保养分类")
    private String maintenanceCategory;
    /**设备ID*/
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**标准状态*/
    @ApiModelProperty(value = "标准状态")
    private String standardStatus;
    /**标准版本*/
    @ApiModelProperty(value = "标准版本")
    private Integer standardVersion;
    /**文件编号*/
    @ApiModelProperty(value = "文件编号")
    private String fileCode;
    /**参考文件*/
    @ApiModelProperty(value = "参考文件")
    private String referenceFile;
    /**上传文件对系*/
    @ApiModelProperty(value = "上传文件对象")
    private List<FileUploadResult> fileList;
    /**列表 ä¿å…»é¡¹æ˜Žç»†*/
    @ApiModelProperty(value = "列表 ä¿å…»é¡¹æ˜Žç»†")
    private List<EamMaintenanceStandardDetail> tableDetailList;
    /**删除 ä¿å…»é¡¹æ˜Žç»†*/
    @ApiModelProperty(value = "删除 ä¿å…»é¡¹æ˜Žç»†")
    private List<EamMaintenanceStandardDetail> removeDetailList;



}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package org.jeecg.modules.eam.service;

import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * @Description: ä¿å…»æ ‡å‡†æ˜Žç»†
 * @Author: jeecg-boot
 * @Date:   2025-03-26
 * @Version: V1.0
 */
public interface IEamMaintenanceStandardDetailService extends IService<EamMaintenanceStandardDetail> {

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
package org.jeecg.modules.eam.service;

import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.request.EamMaintenanceStandardRequest;

/**
 * @Description: ä¿å…»æ ‡å‡†
 * @Author: jeecg-boot
 * @Date:   2025-03-26
 * @Version: V1.0
 */
public interface IEamMaintenanceStandardService extends IService<EamMaintenanceStandard> {

    /**
     * æ–°å¢ž ä¿å…»æ ‡å‡†
     * @param standardRequest
     */
    boolean addMaintenanceStandard(EamMaintenanceStandardRequest standardRequest);

    /**
     * æ–°å¢ž ä¿å…»æ ‡å‡†
     * @param standardRequest
     */
    boolean editMaintenanceStandard(EamMaintenanceStandardRequest standardRequest);
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package org.jeecg.modules.eam.service.impl;

import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
import org.jeecg.modules.eam.mapper.EamMaintenanceStandardDetailMapper;
import org.jeecg.modules.eam.service.IEamMaintenanceStandardDetailService;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

/**
 * @Description: ä¿å…»æ ‡å‡†æ˜Žç»†
 * @Author: jeecg-boot
 * @Date:   2025-03-26
 * @Version: V1.0
 */
@Service
public class EamMaintenanceStandardDetailServiceImpl extends ServiceImpl<EamMaintenanceStandardDetailMapper, EamMaintenanceStandardDetail> implements IEamMaintenanceStandardDetailService {

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,82 @@
package org.jeecg.modules.eam.service.impl;

import cn.hutool.core.collection.CollectionUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.json.JsonMapper;
import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.modules.eam.constant.MaintenanceStandardStatusEnum;
import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
import org.jeecg.modules.eam.mapper.EamMaintenanceStandardMapper;
import org.jeecg.modules.eam.request.EamMaintenanceStandardRequest;
import org.jeecg.modules.eam.service.IEamMaintenanceStandardDetailService;
import org.jeecg.modules.eam.service.IEamMaintenanceStandardService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;

/**
 * @Description: ä¿å…»æ ‡å‡†
 * @Author: jeecg-boot
 * @Date:   2025-03-26
 * @Version: V1.0
 */
@Service
public class EamMaintenanceStandardServiceImpl extends ServiceImpl<EamMaintenanceStandardMapper, EamMaintenanceStandard> implements IEamMaintenanceStandardService {

    @Resource
    private EamMaintenanceStandardMapper eamMaintenanceStandardMapper;

    @Autowired
    private IEamMaintenanceStandardDetailService eamMaintenanceStandardDetailService;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean addMaintenanceStandard(EamMaintenanceStandardRequest standardRequest) {
        EamMaintenanceStandard entity = new EamMaintenanceStandard();
        entity.setStandardCode(standardRequest.getStandardCode());
        entity.setStandardName(standardRequest.getStandardName());
        entity.setMaintenanceCategory(standardRequest.getMaintenanceCategory());
        entity.setMaintenancePeriod(standardRequest.getMaintenancePeriod());
        entity.setInitialDate(standardRequest.getInitialDate());
        entity.setFileCode(standardRequest.getFileCode());
        entity.setStandardStatus(MaintenanceStandardStatusEnum.NORMAL.name());
        //版本递增
        entity.setStandardVersion(CommonConstant.OPERATE_TYPE_1);
        //设备处理
        entity.setEquipmentId(standardRequest.getEquipmentId());
        //重复性校验
        //TODO
        //处理附件
        if(CollectionUtil.isNotEmpty(standardRequest.getFileList())) {
            FileUploadResult fileUploadResult = standardRequest.getFileList().get(0);
            ObjectMapper mapper = new ObjectMapper();
            try {
                String referenceFile = mapper.writeValueAsString(fileUploadResult);
                entity.setReferenceFile(referenceFile);
            } catch (JsonProcessingException e) {
                log.error("JSON转换失败：" + e.getMessage(), e);
            }
        }
        eamMaintenanceStandardMapper.insert(entity);
        //处理明细数据
        if(CollectionUtil.isNotEmpty(standardRequest.getTableDetailList())) {
            standardRequest.getTableDetailList().forEach(tableDetail -> {
                tableDetail.setStandardId(entity.getId());
            });
            eamMaintenanceStandardDetailService.saveBatch(standardRequest.getTableDetailList());
        }
        return true;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean editMaintenanceStandard(EamMaintenanceStandardRequest standardRequest) {
        return false;
    }
}