From 5c4cf4efd45d45d5566167785e575e8a359bff0a Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期一, 31 三月 2025 09:19:08 +0800 Subject: [PATCH] art: 设备管理-保养标准-基础代码 --- lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/MaintenanceCategoryEnum.java | 10 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/MaintenanceStandardStatusEnum.java | 9 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java | 94 ++++++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamMaintenanceStandardMapper.java | 17 + lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardDetailController.java | 167 +++++++++++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamMaintenanceStandardDetailMapper.java | 17 + lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardDetailMapper.xml | 5 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 82 +++++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandardDetail.java | 61 ++++ lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java | 2 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardMapper.xml | 5 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamMaintenanceStandardRequest.java | 70 +++++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java | 26 + lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardDetailService.java | 14 + lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java | 185 +++++++++++++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardDetailServiceImpl.java | 19 + 16 files changed, 783 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam-common/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 index 2afebfd..0c3dcaf 100644 --- a/lxzn-module-eam-common/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 @@ -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:宸插畬鎴� */ diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/MaintenanceCategoryEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/MaintenanceCategoryEnum.java new file mode 100644 index 0000000..6ad4dab --- /dev/null +++ b/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, //鍛ㄤ繚 + ; +} diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/MaintenanceStandardStatusEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/MaintenanceStandardStatusEnum.java new file mode 100644 index 0000000..709577c --- /dev/null +++ b/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,; +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java new file mode 100644 index 0000000..ccbc930 --- /dev/null +++ b/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); + } + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardDetailController.java new file mode 100644 index 0000000..67f73fb --- /dev/null +++ b/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); + } + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java new file mode 100644 index 0000000..cc529f9 --- /dev/null +++ b/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; +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandardDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandardDetail.java new file mode 100644 index 0000000..019c1b6 --- /dev/null +++ b/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; +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamMaintenanceStandardDetailMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamMaintenanceStandardDetailMapper.java new file mode 100644 index 0000000..9d31caf --- /dev/null +++ b/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> { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamMaintenanceStandardMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamMaintenanceStandardMapper.java new file mode 100644 index 0000000..3f841f9 --- /dev/null +++ b/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> { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardDetailMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardDetailMapper.xml new file mode 100644 index 0000000..4ca5a19 --- /dev/null +++ b/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> \ No newline at end of file diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardMapper.xml new file mode 100644 index 0000000..fa971d4 --- /dev/null +++ b/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> \ No newline at end of file diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamMaintenanceStandardRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamMaintenanceStandardRequest.java new file mode 100644 index 0000000..213267c --- /dev/null +++ b/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; + + + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardDetailService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardDetailService.java new file mode 100644 index 0000000..676cfbe --- /dev/null +++ b/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> { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java new file mode 100644 index 0000000..254986a --- /dev/null +++ b/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); +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardDetailServiceImpl.java new file mode 100644 index 0000000..966f604 --- /dev/null +++ b/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 { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java new file mode 100644 index 0000000..5677a85 --- /dev/null +++ b/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; + } +} -- Gitblit v1.9.3