From 666ff147ab32ae2676e4decf7a8836d22ba80e04 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 17 Oct 2025 16:04:48 +0800 Subject: [PATCH] =?UTF-8?q?feat(eqp):=20=E6=B7=BB=E5=8A=A0=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=AE=A1=E7=90=86=E3=80=81=E5=8F=82=E6=95=B0=E5=8F=8A?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增设备管理域对象、业务对象、控制器、映射器及相关服务实现- 新增设备参数域对象、业务对象、控制器、映射器及相关服务实现 - 新增设备类型域对象、业务对象、控制器、映射器及相关服务实现 - 配置MyBatis XML映射文件支持新实体类字段映射- 提供完整的CRUD操作接口，包括分页查询、导出Excel等功能 --- .../EqpEquipmentManagementController.java | 99 ++++++++++++++ .../EqpEquipmentParamController.java | 99 ++++++++++++++ .../EqpEquipmentTypeController.java | 99 ++++++++++++++ .../EqpInspectedEquipmentController.java | 99 ++++++++++++++ .../EqpInspectionRecordController.java | 99 ++++++++++++++ .../controller/EqpSparePartController.java | 99 ++++++++++++++ .../EqpSparePartsChangeController.java | 99 ++++++++++++++ .../controller/EqpTypeParamController.java | 99 ++++++++++++++ .../eqp/domain/EqpEquipmentManagement.java | 91 +++++++++++++ .../klp/mes/eqp/domain/EqpEquipmentParam.java | 61 +++++++++ .../klp/mes/eqp/domain/EqpEquipmentType.java | 45 +++++++ .../mes/eqp/domain/EqpInspectedEquipment.java | 59 +++++++++ .../mes/eqp/domain/EqpInspectionRecord.java | 59 +++++++++ .../com/klp/mes/eqp/domain/EqpSparePart.java | 61 +++++++++ .../mes/eqp/domain/EqpSparePartsChange.java | 59 +++++++++ .../com/klp/mes/eqp/domain/EqpTypeParam.java | 65 ++++++++++ .../domain/bo/EqpEquipmentManagementBo.java | 98 ++++++++++++++ .../eqp/domain/bo/EqpEquipmentParamBo.java | 61 +++++++++ .../mes/eqp/domain/bo/EqpEquipmentTypeBo.java | 41 ++++++ .../domain/bo/EqpInspectedEquipmentBo.java | 58 +++++++++ .../eqp/domain/bo/EqpInspectionRecordBo.java | 58 +++++++++ .../klp/mes/eqp/domain/bo/EqpSparePartBo.java | 61 +++++++++ .../eqp/domain/bo/EqpSparePartsChangeBo.java | 58 +++++++++ .../klp/mes/eqp/domain/bo/EqpTypeParamBo.java | 66 ++++++++++ .../domain/vo/EqpEquipmentManagementVo.java | 120 +++++++++++++++++ .../eqp/domain/vo/EqpEquipmentParamVo.java | 73 +++++++++++ .../mes/eqp/domain/vo/EqpEquipmentTypeVo.java | 47 +++++++ .../domain/vo/EqpInspectedEquipmentVo.java | 68 ++++++++++ .../eqp/domain/vo/EqpInspectionRecordVo.java | 68 ++++++++++ .../klp/mes/eqp/domain/vo/EqpSparePartVo.java | 72 +++++++++++ .../eqp/domain/vo/EqpSparePartsChangeVo.java | 68 ++++++++++ .../klp/mes/eqp/domain/vo/EqpTypeParamVo.java | 81 ++++++++++++ .../mapper/EqpEquipmentManagementMapper.java | 15 +++ .../eqp/mapper/EqpEquipmentParamMapper.java | 15 +++ .../eqp/mapper/EqpEquipmentTypeMapper.java | 15 +++ .../mapper/EqpInspectedEquipmentMapper.java | 15 +++ .../eqp/mapper/EqpInspectionRecordMapper.java | 15 +++ .../mes/eqp/mapper/EqpSparePartMapper.java | 15 +++ .../eqp/mapper/EqpSparePartsChangeMapper.java | 15 +++ .../mes/eqp/mapper/EqpTypeParamMapper.java | 15 +++ .../IEqpEquipmentManagementService.java | 49 +++++++ .../service/IEqpEquipmentParamService.java | 49 +++++++ .../eqp/service/IEqpEquipmentTypeService.java | 49 +++++++ .../IEqpInspectedEquipmentService.java | 49 +++++++ .../service/IEqpInspectionRecordService.java | 49 +++++++ .../mes/eqp/service/IEqpSparePartService.java | 49 +++++++ .../service/IEqpSparePartsChangeService.java | 49 +++++++ .../mes/eqp/service/IEqpTypeParamService.java | 49 +++++++ .../EqpEquipmentManagementServiceImpl.java | 121 ++++++++++++++++++ .../impl/EqpEquipmentParamServiceImpl.java | 114 +++++++++++++++++ .../impl/EqpEquipmentTypeServiceImpl.java | 110 ++++++++++++++++ .../EqpInspectedEquipmentServiceImpl.java | 113 ++++++++++++++++ .../impl/EqpInspectionRecordServiceImpl.java | 113 ++++++++++++++++ .../service/impl/EqpSparePartServiceImpl.java | 114 +++++++++++++++++ .../impl/EqpSparePartsChangeServiceImpl.java | 113 ++++++++++++++++ .../service/impl/EqpTypeParamServiceImpl.java | 115 +++++++++++++++++ .../eqp/EqpEquipmentManagementMapper.xml | 31 +++++ .../mapper/eqp/EqpEquipmentParamMapper.xml | 24 ++++ .../mapper/eqp/EqpEquipmentTypeMapper.xml | 20 +++ .../eqp/EqpInspectedEquipmentMapper.xml | 23 ++++ .../mapper/eqp/EqpInspectionRecordMapper.xml | 23 ++++ .../mapper/eqp/EqpSparePartMapper.xml | 24 ++++ .../mapper/eqp/EqpSparePartsChangeMapper.xml | 23 ++++ .../mapper/eqp/EqpTypeParamMapper.xml | 25 ++++ 64 files changed, 4008 insertions(+) create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpEquipmentManagementController.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpEquipmentParamController.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpEquipmentTypeController.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpInspectedEquipmentController.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpInspectionRecordController.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpSparePartController.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpSparePartsChangeController.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpTypeParamController.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentManagement.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentParam.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentType.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpInspectedEquipment.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpInspectionRecord.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpSparePart.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpSparePartsChange.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpTypeParam.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentManagementBo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentParamBo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentTypeBo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpInspectedEquipmentBo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpInspectionRecordBo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpSparePartBo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpSparePartsChangeBo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpTypeParamBo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentManagementVo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentParamVo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentTypeVo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpInspectedEquipmentVo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpInspectionRecordVo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpSparePartVo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpSparePartsChangeVo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpTypeParamVo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpEquipmentManagementMapper.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpEquipmentParamMapper.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpEquipmentTypeMapper.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpInspectedEquipmentMapper.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpInspectionRecordMapper.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpSparePartMapper.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpSparePartsChangeMapper.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpTypeParamMapper.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpEquipmentManagementService.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpEquipmentParamService.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpEquipmentTypeService.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpInspectedEquipmentService.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpInspectionRecordService.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpSparePartService.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpSparePartsChangeService.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpTypeParamService.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentManagementServiceImpl.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentParamServiceImpl.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentTypeServiceImpl.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpInspectedEquipmentServiceImpl.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpInspectionRecordServiceImpl.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpSparePartServiceImpl.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpSparePartsChangeServiceImpl.java create mode 100644 klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpTypeParamServiceImpl.java create mode 100644 klp-mes/src/main/resources/mapper/eqp/EqpEquipmentManagementMapper.xml create mode 100644 klp-mes/src/main/resources/mapper/eqp/EqpEquipmentParamMapper.xml create mode 100644 klp-mes/src/main/resources/mapper/eqp/EqpEquipmentTypeMapper.xml create mode 100644 klp-mes/src/main/resources/mapper/eqp/EqpInspectedEquipmentMapper.xml create mode 100644 klp-mes/src/main/resources/mapper/eqp/EqpInspectionRecordMapper.xml create mode 100644 klp-mes/src/main/resources/mapper/eqp/EqpSparePartMapper.xml create mode 100644 klp-mes/src/main/resources/mapper/eqp/EqpSparePartsChangeMapper.xml create mode 100644 klp-mes/src/main/resources/mapper/eqp/EqpTypeParamMapper.xml diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpEquipmentManagementController.java b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpEquipmentManagementController.java new file mode 100644 index 00000000..1b1c1105 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpEquipmentManagementController.java @@ -0,0 +1,99 @@ +package com.klp.mes.eqp.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.mes.eqp.domain.vo.EqpEquipmentManagementVo; +import com.klp.mes.eqp.domain.bo.EqpEquipmentManagementBo; +import com.klp.mes.eqp.service.IEqpEquipmentManagementService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 设备管理（合并在役和退役设备） + * + * @author Joshi + * @date 2025-10-17 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/eqp/equipmentManagement") +public class EqpEquipmentManagementController extends BaseController { + + private final IEqpEquipmentManagementService iEqpEquipmentManagementService; + + /** + * 查询设备管理（合并在役和退役设备）列表 + */ + @GetMapping("/list") + public TableDataInfo list(EqpEquipmentManagementBo bo, PageQuery pageQuery) { + return iEqpEquipmentManagementService.queryPageList(bo, pageQuery); + } + + /** + * 导出设备管理（合并在役和退役设备）列表 + */ + @Log(title = "设备管理（合并在役和退役设备）", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EqpEquipmentManagementBo bo, HttpServletResponse response) { + List list = iEqpEquipmentManagementService.queryList(bo); + ExcelUtil.exportExcel(list, "设备管理（合并在役和退役设备）", EqpEquipmentManagementVo.class, response); + } + + /** + * 获取设备管理（合并在役和退役设备）详细信息 + * + * @param equipmentId 主键 + */ + @GetMapping("/{equipmentId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long equipmentId) { + return R.ok(iEqpEquipmentManagementService.queryById(equipmentId)); + } + + /** + * 新增设备管理（合并在役和退役设备） + */ + @Log(title = "设备管理（合并在役和退役设备）", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EqpEquipmentManagementBo bo) { + return toAjax(iEqpEquipmentManagementService.insertByBo(bo)); + } + + /** + * 修改设备管理（合并在役和退役设备） + */ + @Log(title = "设备管理（合并在役和退役设备）", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EqpEquipmentManagementBo bo) { + return toAjax(iEqpEquipmentManagementService.updateByBo(bo)); + } + + /** + * 删除设备管理（合并在役和退役设备） + * + * @param equipmentIds 主键串 + */ + @Log(title = "设备管理（合并在役和退役设备）", businessType = BusinessType.DELETE) + @DeleteMapping("/{equipmentIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] equipmentIds) { + return toAjax(iEqpEquipmentManagementService.deleteWithValidByIds(Arrays.asList(equipmentIds), true)); + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpEquipmentParamController.java b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpEquipmentParamController.java new file mode 100644 index 00000000..b7982449 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpEquipmentParamController.java @@ -0,0 +1,99 @@ +package com.klp.mes.eqp.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.mes.eqp.domain.vo.EqpEquipmentParamVo; +import com.klp.mes.eqp.domain.bo.EqpEquipmentParamBo; +import com.klp.mes.eqp.service.IEqpEquipmentParamService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 设备参数 + * + * @author Joshi + * @date 2025-10-17 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/eqp/equipmentParam") +public class EqpEquipmentParamController extends BaseController { + + private final IEqpEquipmentParamService iEqpEquipmentParamService; + + /** + * 查询设备参数列表 + */ + @GetMapping("/list") + public TableDataInfo list(EqpEquipmentParamBo bo, PageQuery pageQuery) { + return iEqpEquipmentParamService.queryPageList(bo, pageQuery); + } + + /** + * 导出设备参数列表 + */ + @Log(title = "设备参数", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EqpEquipmentParamBo bo, HttpServletResponse response) { + List list = iEqpEquipmentParamService.queryList(bo); + ExcelUtil.exportExcel(list, "设备参数", EqpEquipmentParamVo.class, response); + } + + /** + * 获取设备参数详细信息 + * + * @param paramId 主键 + */ + @GetMapping("/{paramId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long paramId) { + return R.ok(iEqpEquipmentParamService.queryById(paramId)); + } + + /** + * 新增设备参数 + */ + @Log(title = "设备参数", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EqpEquipmentParamBo bo) { + return toAjax(iEqpEquipmentParamService.insertByBo(bo)); + } + + /** + * 修改设备参数 + */ + @Log(title = "设备参数", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EqpEquipmentParamBo bo) { + return toAjax(iEqpEquipmentParamService.updateByBo(bo)); + } + + /** + * 删除设备参数 + * + * @param paramIds 主键串 + */ + @Log(title = "设备参数", businessType = BusinessType.DELETE) + @DeleteMapping("/{paramIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] paramIds) { + return toAjax(iEqpEquipmentParamService.deleteWithValidByIds(Arrays.asList(paramIds), true)); + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpEquipmentTypeController.java b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpEquipmentTypeController.java new file mode 100644 index 00000000..db93c0c1 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpEquipmentTypeController.java @@ -0,0 +1,99 @@ +package com.klp.mes.eqp.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.mes.eqp.domain.vo.EqpEquipmentTypeVo; +import com.klp.mes.eqp.domain.bo.EqpEquipmentTypeBo; +import com.klp.mes.eqp.service.IEqpEquipmentTypeService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 设备类型 + * + * @author Joshi + * @date 2025-10-17 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/eqp/equipmentType") +public class EqpEquipmentTypeController extends BaseController { + + private final IEqpEquipmentTypeService iEqpEquipmentTypeService; + + /** + * 查询设备类型列表 + */ + @GetMapping("/list") + public TableDataInfo list(EqpEquipmentTypeBo bo, PageQuery pageQuery) { + return iEqpEquipmentTypeService.queryPageList(bo, pageQuery); + } + + /** + * 导出设备类型列表 + */ + @Log(title = "设备类型", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EqpEquipmentTypeBo bo, HttpServletResponse response) { + List list = iEqpEquipmentTypeService.queryList(bo); + ExcelUtil.exportExcel(list, "设备类型", EqpEquipmentTypeVo.class, response); + } + + /** + * 获取设备类型详细信息 + * + * @param typeId 主键 + */ + @GetMapping("/{typeId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long typeId) { + return R.ok(iEqpEquipmentTypeService.queryById(typeId)); + } + + /** + * 新增设备类型 + */ + @Log(title = "设备类型", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EqpEquipmentTypeBo bo) { + return toAjax(iEqpEquipmentTypeService.insertByBo(bo)); + } + + /** + * 修改设备类型 + */ + @Log(title = "设备类型", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EqpEquipmentTypeBo bo) { + return toAjax(iEqpEquipmentTypeService.updateByBo(bo)); + } + + /** + * 删除设备类型 + * + * @param typeIds 主键串 + */ + @Log(title = "设备类型", businessType = BusinessType.DELETE) + @DeleteMapping("/{typeIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] typeIds) { + return toAjax(iEqpEquipmentTypeService.deleteWithValidByIds(Arrays.asList(typeIds), true)); + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpInspectedEquipmentController.java b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpInspectedEquipmentController.java new file mode 100644 index 00000000..a48b39a8 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpInspectedEquipmentController.java @@ -0,0 +1,99 @@ +package com.klp.mes.eqp.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.mes.eqp.domain.vo.EqpInspectedEquipmentVo; +import com.klp.mes.eqp.domain.bo.EqpInspectedEquipmentBo; +import com.klp.mes.eqp.service.IEqpInspectedEquipmentService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 待检设备 + * + * @author Joshi + * @date 2025-10-17 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/eqp/inspectedEquipment") +public class EqpInspectedEquipmentController extends BaseController { + + private final IEqpInspectedEquipmentService iEqpInspectedEquipmentService; + + /** + * 查询待检设备列表 + */ + @GetMapping("/list") + public TableDataInfo list(EqpInspectedEquipmentBo bo, PageQuery pageQuery) { + return iEqpInspectedEquipmentService.queryPageList(bo, pageQuery); + } + + /** + * 导出待检设备列表 + */ + @Log(title = "待检设备", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EqpInspectedEquipmentBo bo, HttpServletResponse response) { + List list = iEqpInspectedEquipmentService.queryList(bo); + ExcelUtil.exportExcel(list, "待检设备", EqpInspectedEquipmentVo.class, response); + } + + /** + * 获取待检设备详细信息 + * + * @param inspectId 主键 + */ + @GetMapping("/{inspectId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long inspectId) { + return R.ok(iEqpInspectedEquipmentService.queryById(inspectId)); + } + + /** + * 新增待检设备 + */ + @Log(title = "待检设备", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EqpInspectedEquipmentBo bo) { + return toAjax(iEqpInspectedEquipmentService.insertByBo(bo)); + } + + /** + * 修改待检设备 + */ + @Log(title = "待检设备", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EqpInspectedEquipmentBo bo) { + return toAjax(iEqpInspectedEquipmentService.updateByBo(bo)); + } + + /** + * 删除待检设备 + * + * @param inspectIds 主键串 + */ + @Log(title = "待检设备", businessType = BusinessType.DELETE) + @DeleteMapping("/{inspectIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] inspectIds) { + return toAjax(iEqpInspectedEquipmentService.deleteWithValidByIds(Arrays.asList(inspectIds), true)); + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpInspectionRecordController.java b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpInspectionRecordController.java new file mode 100644 index 00000000..08c99e8b --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpInspectionRecordController.java @@ -0,0 +1,99 @@ +package com.klp.mes.eqp.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.mes.eqp.domain.vo.EqpInspectionRecordVo; +import com.klp.mes.eqp.domain.bo.EqpInspectionRecordBo; +import com.klp.mes.eqp.service.IEqpInspectionRecordService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 检修记录 + * + * @author Joshi + * @date 2025-10-17 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/eqp/inspectionRecord") +public class EqpInspectionRecordController extends BaseController { + + private final IEqpInspectionRecordService iEqpInspectionRecordService; + + /** + * 查询检修记录列表 + */ + @GetMapping("/list") + public TableDataInfo list(EqpInspectionRecordBo bo, PageQuery pageQuery) { + return iEqpInspectionRecordService.queryPageList(bo, pageQuery); + } + + /** + * 导出检修记录列表 + */ + @Log(title = "检修记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EqpInspectionRecordBo bo, HttpServletResponse response) { + List list = iEqpInspectionRecordService.queryList(bo); + ExcelUtil.exportExcel(list, "检修记录", EqpInspectionRecordVo.class, response); + } + + /** + * 获取检修记录详细信息 + * + * @param recordId 主键 + */ + @GetMapping("/{recordId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long recordId) { + return R.ok(iEqpInspectionRecordService.queryById(recordId)); + } + + /** + * 新增检修记录 + */ + @Log(title = "检修记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EqpInspectionRecordBo bo) { + return toAjax(iEqpInspectionRecordService.insertByBo(bo)); + } + + /** + * 修改检修记录 + */ + @Log(title = "检修记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EqpInspectionRecordBo bo) { + return toAjax(iEqpInspectionRecordService.updateByBo(bo)); + } + + /** + * 删除检修记录 + * + * @param recordIds 主键串 + */ + @Log(title = "检修记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{recordIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] recordIds) { + return toAjax(iEqpInspectionRecordService.deleteWithValidByIds(Arrays.asList(recordIds), true)); + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpSparePartController.java b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpSparePartController.java new file mode 100644 index 00000000..22d03150 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpSparePartController.java @@ -0,0 +1,99 @@ +package com.klp.mes.eqp.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.mes.eqp.domain.vo.EqpSparePartVo; +import com.klp.mes.eqp.domain.bo.EqpSparePartBo; +import com.klp.mes.eqp.service.IEqpSparePartService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 备品备件 + * + * @author Joshi + * @date 2025-10-17 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/eqp/sparePart") +public class EqpSparePartController extends BaseController { + + private final IEqpSparePartService iEqpSparePartService; + + /** + * 查询备品备件列表 + */ + @GetMapping("/list") + public TableDataInfo list(EqpSparePartBo bo, PageQuery pageQuery) { + return iEqpSparePartService.queryPageList(bo, pageQuery); + } + + /** + * 导出备品备件列表 + */ + @Log(title = "备品备件", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EqpSparePartBo bo, HttpServletResponse response) { + List list = iEqpSparePartService.queryList(bo); + ExcelUtil.exportExcel(list, "备品备件", EqpSparePartVo.class, response); + } + + /** + * 获取备品备件详细信息 + * + * @param partId 主键 + */ + @GetMapping("/{partId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long partId) { + return R.ok(iEqpSparePartService.queryById(partId)); + } + + /** + * 新增备品备件 + */ + @Log(title = "备品备件", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EqpSparePartBo bo) { + return toAjax(iEqpSparePartService.insertByBo(bo)); + } + + /** + * 修改备品备件 + */ + @Log(title = "备品备件", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EqpSparePartBo bo) { + return toAjax(iEqpSparePartService.updateByBo(bo)); + } + + /** + * 删除备品备件 + * + * @param partIds 主键串 + */ + @Log(title = "备品备件", businessType = BusinessType.DELETE) + @DeleteMapping("/{partIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] partIds) { + return toAjax(iEqpSparePartService.deleteWithValidByIds(Arrays.asList(partIds), true)); + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpSparePartsChangeController.java b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpSparePartsChangeController.java new file mode 100644 index 00000000..2afa9837 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpSparePartsChangeController.java @@ -0,0 +1,99 @@ +package com.klp.mes.eqp.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.mes.eqp.domain.vo.EqpSparePartsChangeVo; +import com.klp.mes.eqp.domain.bo.EqpSparePartsChangeBo; +import com.klp.mes.eqp.service.IEqpSparePartsChangeService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 备品备件变动记录 + * + * @author Joshi + * @date 2025-10-17 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/eqp/sparePartsChange") +public class EqpSparePartsChangeController extends BaseController { + + private final IEqpSparePartsChangeService iEqpSparePartsChangeService; + + /** + * 查询备品备件变动记录列表 + */ + @GetMapping("/list") + public TableDataInfo list(EqpSparePartsChangeBo bo, PageQuery pageQuery) { + return iEqpSparePartsChangeService.queryPageList(bo, pageQuery); + } + + /** + * 导出备品备件变动记录列表 + */ + @Log(title = "备品备件变动记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EqpSparePartsChangeBo bo, HttpServletResponse response) { + List list = iEqpSparePartsChangeService.queryList(bo); + ExcelUtil.exportExcel(list, "备品备件变动记录", EqpSparePartsChangeVo.class, response); + } + + /** + * 获取备品备件变动记录详细信息 + * + * @param changeId 主键 + */ + @GetMapping("/{changeId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long changeId) { + return R.ok(iEqpSparePartsChangeService.queryById(changeId)); + } + + /** + * 新增备品备件变动记录 + */ + @Log(title = "备品备件变动记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EqpSparePartsChangeBo bo) { + return toAjax(iEqpSparePartsChangeService.insertByBo(bo)); + } + + /** + * 修改备品备件变动记录 + */ + @Log(title = "备品备件变动记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EqpSparePartsChangeBo bo) { + return toAjax(iEqpSparePartsChangeService.updateByBo(bo)); + } + + /** + * 删除备品备件变动记录 + * + * @param changeIds 主键串 + */ + @Log(title = "备品备件变动记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{changeIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] changeIds) { + return toAjax(iEqpSparePartsChangeService.deleteWithValidByIds(Arrays.asList(changeIds), true)); + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpTypeParamController.java b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpTypeParamController.java new file mode 100644 index 00000000..153a2077 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpTypeParamController.java @@ -0,0 +1,99 @@ +package com.klp.mes.eqp.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.mes.eqp.domain.vo.EqpTypeParamVo; +import com.klp.mes.eqp.domain.bo.EqpTypeParamBo; +import com.klp.mes.eqp.service.IEqpTypeParamService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 设备类型参数（某类设备的通用参数标准） + * + * @author Joshi + * @date 2025-10-17 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/eqp/typeParam") +public class EqpTypeParamController extends BaseController { + + private final IEqpTypeParamService iEqpTypeParamService; + + /** + * 查询设备类型参数（某类设备的通用参数标准）列表 + */ + @GetMapping("/list") + public TableDataInfo list(EqpTypeParamBo bo, PageQuery pageQuery) { + return iEqpTypeParamService.queryPageList(bo, pageQuery); + } + + /** + * 导出设备类型参数（某类设备的通用参数标准）列表 + */ + @Log(title = "设备类型参数（某类设备的通用参数标准）", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EqpTypeParamBo bo, HttpServletResponse response) { + List list = iEqpTypeParamService.queryList(bo); + ExcelUtil.exportExcel(list, "设备类型参数（某类设备的通用参数标准）", EqpTypeParamVo.class, response); + } + + /** + * 获取设备类型参数（某类设备的通用参数标准）详细信息 + * + * @param typeParamId 主键 + */ + @GetMapping("/{typeParamId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long typeParamId) { + return R.ok(iEqpTypeParamService.queryById(typeParamId)); + } + + /** + * 新增设备类型参数（某类设备的通用参数标准） + */ + @Log(title = "设备类型参数（某类设备的通用参数标准）", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EqpTypeParamBo bo) { + return toAjax(iEqpTypeParamService.insertByBo(bo)); + } + + /** + * 修改设备类型参数（某类设备的通用参数标准） + */ + @Log(title = "设备类型参数（某类设备的通用参数标准）", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EqpTypeParamBo bo) { + return toAjax(iEqpTypeParamService.updateByBo(bo)); + } + + /** + * 删除设备类型参数（某类设备的通用参数标准） + * + * @param typeParamIds 主键串 + */ + @Log(title = "设备类型参数（某类设备的通用参数标准）", businessType = BusinessType.DELETE) + @DeleteMapping("/{typeParamIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] typeParamIds) { + return toAjax(iEqpTypeParamService.deleteWithValidByIds(Arrays.asList(typeParamIds), true)); + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentManagement.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentManagement.java new file mode 100644 index 00000000..e9115fd1 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentManagement.java @@ -0,0 +1,91 @@ +package com.klp.mes.eqp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 设备管理（合并在役和退役设备）对象 eqp_equipment_management + * + * @author Joshi + * @date 2025-10-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("eqp_equipment_management") +public class EqpEquipmentManagement extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 设备ID + */ + @TableId(value = "equipment_id") + private Long equipmentId; + /** + * 设备名称 + */ + private String equipmentName; + /** + * 设备型号 + */ + private String model; + /** + * 设备类型ID + */ + private Long typeId; + /** + * 设备编码 + */ + private String equipmentCode; + /** + * 设备位置（在役时有效） + */ + private String location; + /** + * 设备数量 + */ + private Long quantity; + /** + * 负责人 + */ + private String manager; + /** + * 图片路径 + */ + private String ossId; + /** + * 设备状态（in_service=在役，retired=退役） + */ + private String status; + /** + * 停用原因（退役时必填） + */ + private String stopReason; + /** + * 设备去向（退役时必填） + */ + private String equipmentDestination; + /** + * 启用时间 + */ + private Date enableTime; + /** + * 退役时间（状态变更为退役时记录） + */ + private Date retireTime; + /** + * 删除标志（0=存在 2=删除） + */ + @TableLogic + private String delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentParam.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentParam.java new file mode 100644 index 00000000..27975b47 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentParam.java @@ -0,0 +1,61 @@ +package com.klp.mes.eqp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 设备参数对象 eqp_equipment_param + * + * @author Joshi + * @date 2025-10-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("eqp_equipment_param") +public class EqpEquipmentParam extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 参数ID + */ + @TableId(value = "param_id") + private Long paramId; + /** + * 参数名称 + */ + private String paramName; + /** + * 关联设备ID + */ + private Long equipmentId; + /** + * 参数类型（无需检修/离散值/连续值/范围） + */ + private String paramType; + /** + * 参数标准范围 + */ + private String paramStandard; + /** + * 参数单位 + */ + private String paramUnit; + /** + * 参数来源（设备/自定义/厂内标准等） + */ + private String paramSource; + /** + * 删除标志（0=存在 2=删除） + */ + @TableLogic + private String delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentType.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentType.java new file mode 100644 index 00000000..f5368c58 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentType.java @@ -0,0 +1,45 @@ +package com.klp.mes.eqp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 设备类型对象 eqp_equipment_type + * + * @author Joshi + * @date 2025-10-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("eqp_equipment_type") +public class EqpEquipmentType extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 设备类型ID + */ + @TableId(value = "type_id") + private Long typeId; + /** + * 分类名称 + */ + private String typeName; + /** + * 分类描述 + */ + private String typeDesc; + /** + * 删除标志（0=存在 2=删除） + */ + @TableLogic + private String delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpInspectedEquipment.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpInspectedEquipment.java new file mode 100644 index 00000000..c932800d --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpInspectedEquipment.java @@ -0,0 +1,59 @@ +package com.klp.mes.eqp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 待检设备对象 eqp_inspected_equipment + * + * @author Joshi + * @date 2025-10-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("eqp_inspected_equipment") +public class EqpInspectedEquipment extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 待检ID + */ + @TableId(value = "inspect_id") + private Long inspectId; + /** + * 关联设备ID + */ + private Long equipmentId; + /** + * 计划检修时间 + */ + private Date inspectTime; + /** + * 检修厂商 + */ + private String inspectVendor; + /** + * 剩余检修天数 + */ + private Long remainTime; + /** + * 状态（正常/临近/超期） + */ + private String status; + /** + * 删除标志（0=存在 2=删除） + */ + @TableLogic + private String delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpInspectionRecord.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpInspectionRecord.java new file mode 100644 index 00000000..ce054eeb --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpInspectionRecord.java @@ -0,0 +1,59 @@ +package com.klp.mes.eqp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 检修记录对象 eqp_inspection_record + * + * @author Joshi + * @date 2025-10-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("eqp_inspection_record") +public class EqpInspectionRecord extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 记录ID + */ + @TableId(value = "record_id") + private Long recordId; + /** + * 关联设备ID + */ + private Long equipmentId; + /** + * 实际检修时间 + */ + private Date inspectTime; + /** + * 检修厂商 + */ + private String inspectVendor; + /** + * 检修内容 + */ + private String inspectContent; + /** + * 检修结果（合格/不合格/待观察） + */ + private String result; + /** + * 删除标志（0=存在 2=删除） + */ + @TableLogic + private String delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpSparePart.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpSparePart.java new file mode 100644 index 00000000..fa1ad56f --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpSparePart.java @@ -0,0 +1,61 @@ +package com.klp.mes.eqp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 备品备件对象 eqp_spare_part + * + * @author Joshi + * @date 2025-10-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("eqp_spare_part") +public class EqpSparePart extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 备件ID + */ + @TableId(value = "part_id") + private Long partId; + /** + * 备件名称 + */ + private String partName; + /** + * 物料品类 + */ + private String materialCategory; + /** + * 备件型号 + */ + private String model; + /** + * 计量单位 + */ + private String unit; + /** + * 关联设备ID（可为空，通用备件） + */ + private Long equipmentId; + /** + * 当前库存数量 + */ + private Long quantity; + /** + * 删除标志（0=存在 2=删除） + */ + @TableLogic + private String delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpSparePartsChange.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpSparePartsChange.java new file mode 100644 index 00000000..50bfc170 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpSparePartsChange.java @@ -0,0 +1,59 @@ +package com.klp.mes.eqp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 备品备件变动记录对象 eqp_spare_parts_change + * + * @author Joshi + * @date 2025-10-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("eqp_spare_parts_change") +public class EqpSparePartsChange extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 变动记录ID + */ + @TableId(value = "change_id") + private Long changeId; + /** + * 关联备件ID + */ + private Long partId; + /** + * 变动类型（增加/减少） + */ + private String changeType; + /** + * 变动数量 + */ + private Long changeQuantity; + /** + * 变动原因 + */ + private String reason; + /** + * 变动时间 + */ + private Date changeTime; + /** + * 删除标志（0=存在 2=删除） + */ + @TableLogic + private String delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpTypeParam.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpTypeParam.java new file mode 100644 index 00000000..9a422a6a --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpTypeParam.java @@ -0,0 +1,65 @@ +package com.klp.mes.eqp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 设备类型参数（某类设备的通用参数标准）对象 eqp_type_param + * + * @author Joshi + * @date 2025-10-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("eqp_type_param") +public class EqpTypeParam extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 类型参数ID + */ + @TableId(value = "type_param_id") + private Long typeParamId; + /** + * 关联设备类型ID + */ + private Long typeId; + /** + * 参数名称 + */ + private String paramName; + /** + * 参数类型（无需检修/离散值/连续值/范围） + */ + private String paramType; + /** + * 参数标准范围（该类型设备的通用标准） + */ + private String paramStandard; + /** + * 参数单位 + */ + private String paramUnit; + /** + * 参数来源（行业标准/厂内标准/自定义等） + */ + private String paramSource; + /** + * 是否为该类型设备的必选参数（0=否，1=是） + */ + private Integer isMandatory; + /** + * 删除标志（0=存在 2=删除） + */ + @TableLogic + private String delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentManagementBo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentManagementBo.java new file mode 100644 index 00000000..50e22412 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentManagementBo.java @@ -0,0 +1,98 @@ +package com.klp.mes.eqp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 设备管理（合并在役和退役设备）业务对象 eqp_equipment_management + * + * @author Joshi + * @date 2025-10-17 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class EqpEquipmentManagementBo extends BaseEntity { + + /** + * 设备ID + */ + private Long equipmentId; + + /** + * 设备名称 + */ + private String equipmentName; + + /** + * 设备型号 + */ + private String model; + + /** + * 设备类型ID + */ + private Long typeId; + + /** + * 设备编码 + */ + private String equipmentCode; + + /** + * 设备位置（在役时有效） + */ + private String location; + + /** + * 设备数量 + */ + private Long quantity; + + /** + * 负责人 + */ + private String manager; + + /** + * 图片路径 + */ + private String ossId; + + /** + * 设备状态（in_service=在役，retired=退役） + */ + private String status; + + /** + * 停用原因（退役时必填） + */ + private String stopReason; + + /** + * 设备去向（退役时必填） + */ + private String equipmentDestination; + + /** + * 启用时间 + */ + private Date enableTime; + + /** + * 退役时间（状态变更为退役时记录） + */ + private Date retireTime; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentParamBo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentParamBo.java new file mode 100644 index 00000000..af20b177 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentParamBo.java @@ -0,0 +1,61 @@ +package com.klp.mes.eqp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + + +/** + * 设备参数业务对象 eqp_equipment_param + * + * @author Joshi + * @date 2025-10-17 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class EqpEquipmentParamBo extends BaseEntity { + + /** + * 参数ID + */ + private Long paramId; + + /** + * 参数名称 + */ + private String paramName; + + /** + * 关联设备ID + */ + private Long equipmentId; + + /** + * 参数类型（无需检修/离散值/连续值/范围） + */ + private String paramType; + + /** + * 参数标准范围 + */ + private String paramStandard; + + /** + * 参数单位 + */ + private String paramUnit; + + /** + * 参数来源（设备/自定义/厂内标准等） + */ + private String paramSource; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentTypeBo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentTypeBo.java new file mode 100644 index 00000000..d92942e4 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentTypeBo.java @@ -0,0 +1,41 @@ +package com.klp.mes.eqp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + + +/** + * 设备类型业务对象 eqp_equipment_type + * + * @author Joshi + * @date 2025-10-17 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class EqpEquipmentTypeBo extends BaseEntity { + + /** + * 设备类型ID + */ + private Long typeId; + + /** + * 分类名称 + */ + private String typeName; + + /** + * 分类描述 + */ + private String typeDesc; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpInspectedEquipmentBo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpInspectedEquipmentBo.java new file mode 100644 index 00000000..5f7c0000 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpInspectedEquipmentBo.java @@ -0,0 +1,58 @@ +package com.klp.mes.eqp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 待检设备业务对象 eqp_inspected_equipment + * + * @author Joshi + * @date 2025-10-17 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class EqpInspectedEquipmentBo extends BaseEntity { + + /** + * 待检ID + */ + private Long inspectId; + + /** + * 关联设备ID + */ + private Long equipmentId; + + /** + * 计划检修时间 + */ + private Date inspectTime; + + /** + * 检修厂商 + */ + private String inspectVendor; + + /** + * 剩余检修天数 + */ + private Long remainTime; + + /** + * 状态（正常/临近/超期） + */ + private String status; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpInspectionRecordBo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpInspectionRecordBo.java new file mode 100644 index 00000000..de89ba13 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpInspectionRecordBo.java @@ -0,0 +1,58 @@ +package com.klp.mes.eqp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 检修记录业务对象 eqp_inspection_record + * + * @author Joshi + * @date 2025-10-17 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class EqpInspectionRecordBo extends BaseEntity { + + /** + * 记录ID + */ + private Long recordId; + + /** + * 关联设备ID + */ + private Long equipmentId; + + /** + * 实际检修时间 + */ + private Date inspectTime; + + /** + * 检修厂商 + */ + private String inspectVendor; + + /** + * 检修内容 + */ + private String inspectContent; + + /** + * 检修结果（合格/不合格/待观察） + */ + private String result; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpSparePartBo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpSparePartBo.java new file mode 100644 index 00000000..9fb11afb --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpSparePartBo.java @@ -0,0 +1,61 @@ +package com.klp.mes.eqp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + + +/** + * 备品备件业务对象 eqp_spare_part + * + * @author Joshi + * @date 2025-10-17 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class EqpSparePartBo extends BaseEntity { + + /** + * 备件ID + */ + private Long partId; + + /** + * 备件名称 + */ + private String partName; + + /** + * 物料品类 + */ + private String materialCategory; + + /** + * 备件型号 + */ + private String model; + + /** + * 计量单位 + */ + private String unit; + + /** + * 关联设备ID（可为空，通用备件） + */ + private Long equipmentId; + + /** + * 当前库存数量 + */ + private Long quantity; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpSparePartsChangeBo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpSparePartsChangeBo.java new file mode 100644 index 00000000..fd51e1a6 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpSparePartsChangeBo.java @@ -0,0 +1,58 @@ +package com.klp.mes.eqp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 备品备件变动记录业务对象 eqp_spare_parts_change + * + * @author Joshi + * @date 2025-10-17 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class EqpSparePartsChangeBo extends BaseEntity { + + /** + * 变动记录ID + */ + private Long changeId; + + /** + * 关联备件ID + */ + private Long partId; + + /** + * 变动类型（增加/减少） + */ + private String changeType; + + /** + * 变动数量 + */ + private Long changeQuantity; + + /** + * 变动原因 + */ + private String reason; + + /** + * 变动时间 + */ + private Date changeTime; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpTypeParamBo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpTypeParamBo.java new file mode 100644 index 00000000..1cb4e838 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpTypeParamBo.java @@ -0,0 +1,66 @@ +package com.klp.mes.eqp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + + +/** + * 设备类型参数（某类设备的通用参数标准）业务对象 eqp_type_param + * + * @author Joshi + * @date 2025-10-17 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class EqpTypeParamBo extends BaseEntity { + + /** + * 类型参数ID + */ + private Long typeParamId; + + /** + * 关联设备类型ID + */ + private Long typeId; + + /** + * 参数名称 + */ + private String paramName; + + /** + * 参数类型（无需检修/离散值/连续值/范围） + */ + private String paramType; + + /** + * 参数标准范围（该类型设备的通用标准） + */ + private String paramStandard; + + /** + * 参数单位 + */ + private String paramUnit; + + /** + * 参数来源（行业标准/厂内标准/自定义等） + */ + private String paramSource; + + /** + * 是否为该类型设备的必选参数（0=否，1=是） + */ + private Integer isMandatory; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentManagementVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentManagementVo.java new file mode 100644 index 00000000..9e7ef5cf --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentManagementVo.java @@ -0,0 +1,120 @@ +package com.klp.mes.eqp.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 设备管理（合并在役和退役设备）视图对象 eqp_equipment_management + * + * @author Joshi + * @date 2025-10-17 + */ +@Data +@ExcelIgnoreUnannotated +public class EqpEquipmentManagementVo { + + private static final long serialVersionUID = 1L; + + /** + * 设备ID + */ + @ExcelProperty(value = "设备ID") + private Long equipmentId; + + /** + * 设备名称 + */ + @ExcelProperty(value = "设备名称") + private String equipmentName; + + /** + * 设备型号 + */ + @ExcelProperty(value = "设备型号") + private String model; + + /** + * 设备类型ID + */ + @ExcelProperty(value = "设备类型ID") + private Long typeId; + + /** + * 设备编码 + */ + @ExcelProperty(value = "设备编码") + private String equipmentCode; + + /** + * 设备位置（在役时有效） + */ + @ExcelProperty(value = "设备位置", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "在=役时有效") + private String location; + + /** + * 设备数量 + */ + @ExcelProperty(value = "设备数量") + private Long quantity; + + /** + * 负责人 + */ + @ExcelProperty(value = "负责人") + private String manager; + + /** + * 图片路径 + */ + @ExcelProperty(value = "图片路径") + private String ossId; + + /** + * 设备状态（in_service=在役，retired=退役） + */ + @ExcelProperty(value = "设备状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "i=n_service=在役，retired=退役") + private String status; + + /** + * 停用原因（退役时必填） + */ + @ExcelProperty(value = "停用原因", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "退=役时必填") + private String stopReason; + + /** + * 设备去向（退役时必填） + */ + @ExcelProperty(value = "设备去向", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "退=役时必填") + private String equipmentDestination; + + /** + * 启用时间 + */ + @ExcelProperty(value = "启用时间") + private Date enableTime; + + /** + * 退役时间（状态变更为退役时记录） + */ + @ExcelProperty(value = "退役时间", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "状=态变更为退役时记录") + private Date retireTime; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentParamVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentParamVo.java new file mode 100644 index 00000000..ee532dea --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentParamVo.java @@ -0,0 +1,73 @@ +package com.klp.mes.eqp.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 设备参数视图对象 eqp_equipment_param + * + * @author Joshi + * @date 2025-10-17 + */ +@Data +@ExcelIgnoreUnannotated +public class EqpEquipmentParamVo { + + private static final long serialVersionUID = 1L; + + /** + * 参数ID + */ + @ExcelProperty(value = "参数ID") + private Long paramId; + + /** + * 参数名称 + */ + @ExcelProperty(value = "参数名称") + private String paramName; + + /** + * 关联设备ID + */ + @ExcelProperty(value = "关联设备ID") + private Long equipmentId; + + /** + * 参数类型（无需检修/离散值/连续值/范围） + */ + @ExcelProperty(value = "参数类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "无=需检修/离散值/连续值/范围") + private String paramType; + + /** + * 参数标准范围 + */ + @ExcelProperty(value = "参数标准范围") + private String paramStandard; + + /** + * 参数单位 + */ + @ExcelProperty(value = "参数单位") + private String paramUnit; + + /** + * 参数来源（设备/自定义/厂内标准等） + */ + @ExcelProperty(value = "参数来源", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "设=备/自定义/厂内标准等") + private String paramSource; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentTypeVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentTypeVo.java new file mode 100644 index 00000000..109d05f6 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentTypeVo.java @@ -0,0 +1,47 @@ +package com.klp.mes.eqp.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 设备类型视图对象 eqp_equipment_type + * + * @author Joshi + * @date 2025-10-17 + */ +@Data +@ExcelIgnoreUnannotated +public class EqpEquipmentTypeVo { + + private static final long serialVersionUID = 1L; + + /** + * 设备类型ID + */ + @ExcelProperty(value = "设备类型ID") + private Long typeId; + + /** + * 分类名称 + */ + @ExcelProperty(value = "分类名称") + private String typeName; + + /** + * 分类描述 + */ + @ExcelProperty(value = "分类描述") + private String typeDesc; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpInspectedEquipmentVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpInspectedEquipmentVo.java new file mode 100644 index 00000000..17dd192c --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpInspectedEquipmentVo.java @@ -0,0 +1,68 @@ +package com.klp.mes.eqp.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 待检设备视图对象 eqp_inspected_equipment + * + * @author Joshi + * @date 2025-10-17 + */ +@Data +@ExcelIgnoreUnannotated +public class EqpInspectedEquipmentVo { + + private static final long serialVersionUID = 1L; + + /** + * 待检ID + */ + @ExcelProperty(value = "待检ID") + private Long inspectId; + + /** + * 关联设备ID + */ + @ExcelProperty(value = "关联设备ID") + private Long equipmentId; + + /** + * 计划检修时间 + */ + @ExcelProperty(value = "计划检修时间") + private Date inspectTime; + + /** + * 检修厂商 + */ + @ExcelProperty(value = "检修厂商") + private String inspectVendor; + + /** + * 剩余检修天数 + */ + @ExcelProperty(value = "剩余检修天数") + private Long remainTime; + + /** + * 状态（正常/临近/超期） + */ + @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "正=常/临近/超期") + private String status; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpInspectionRecordVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpInspectionRecordVo.java new file mode 100644 index 00000000..47466b0b --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpInspectionRecordVo.java @@ -0,0 +1,68 @@ +package com.klp.mes.eqp.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 检修记录视图对象 eqp_inspection_record + * + * @author Joshi + * @date 2025-10-17 + */ +@Data +@ExcelIgnoreUnannotated +public class EqpInspectionRecordVo { + + private static final long serialVersionUID = 1L; + + /** + * 记录ID + */ + @ExcelProperty(value = "记录ID") + private Long recordId; + + /** + * 关联设备ID + */ + @ExcelProperty(value = "关联设备ID") + private Long equipmentId; + + /** + * 实际检修时间 + */ + @ExcelProperty(value = "实际检修时间") + private Date inspectTime; + + /** + * 检修厂商 + */ + @ExcelProperty(value = "检修厂商") + private String inspectVendor; + + /** + * 检修内容 + */ + @ExcelProperty(value = "检修内容") + private String inspectContent; + + /** + * 检修结果（合格/不合格/待观察） + */ + @ExcelProperty(value = "检修结果", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "合=格/不合格/待观察") + private String result; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpSparePartVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpSparePartVo.java new file mode 100644 index 00000000..3c830801 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpSparePartVo.java @@ -0,0 +1,72 @@ +package com.klp.mes.eqp.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 备品备件视图对象 eqp_spare_part + * + * @author Joshi + * @date 2025-10-17 + */ +@Data +@ExcelIgnoreUnannotated +public class EqpSparePartVo { + + private static final long serialVersionUID = 1L; + + /** + * 备件ID + */ + @ExcelProperty(value = "备件ID") + private Long partId; + + /** + * 备件名称 + */ + @ExcelProperty(value = "备件名称") + private String partName; + + /** + * 物料品类 + */ + @ExcelProperty(value = "物料品类") + private String materialCategory; + + /** + * 备件型号 + */ + @ExcelProperty(value = "备件型号") + private String model; + + /** + * 计量单位 + */ + @ExcelProperty(value = "计量单位") + private String unit; + + /** + * 关联设备ID（可为空，通用备件） + */ + @ExcelProperty(value = "关联设备ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "可=为空，通用备件") + private Long equipmentId; + + /** + * 当前库存数量 + */ + @ExcelProperty(value = "当前库存数量") + private Long quantity; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpSparePartsChangeVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpSparePartsChangeVo.java new file mode 100644 index 00000000..631df402 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpSparePartsChangeVo.java @@ -0,0 +1,68 @@ +package com.klp.mes.eqp.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 备品备件变动记录视图对象 eqp_spare_parts_change + * + * @author Joshi + * @date 2025-10-17 + */ +@Data +@ExcelIgnoreUnannotated +public class EqpSparePartsChangeVo { + + private static final long serialVersionUID = 1L; + + /** + * 变动记录ID + */ + @ExcelProperty(value = "变动记录ID") + private Long changeId; + + /** + * 关联备件ID + */ + @ExcelProperty(value = "关联备件ID") + private Long partId; + + /** + * 变动类型（增加/减少） + */ + @ExcelProperty(value = "变动类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "增=加/减少") + private String changeType; + + /** + * 变动数量 + */ + @ExcelProperty(value = "变动数量") + private Long changeQuantity; + + /** + * 变动原因 + */ + @ExcelProperty(value = "变动原因") + private String reason; + + /** + * 变动时间 + */ + @ExcelProperty(value = "变动时间") + private Date changeTime; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpTypeParamVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpTypeParamVo.java new file mode 100644 index 00000000..6f7bb59f --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpTypeParamVo.java @@ -0,0 +1,81 @@ +package com.klp.mes.eqp.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 设备类型参数（某类设备的通用参数标准）视图对象 eqp_type_param + * + * @author Joshi + * @date 2025-10-17 + */ +@Data +@ExcelIgnoreUnannotated +public class EqpTypeParamVo { + + private static final long serialVersionUID = 1L; + + /** + * 类型参数ID + */ + @ExcelProperty(value = "类型参数ID") + private Long typeParamId; + + /** + * 关联设备类型ID + */ + @ExcelProperty(value = "关联设备类型ID") + private Long typeId; + + /** + * 参数名称 + */ + @ExcelProperty(value = "参数名称") + private String paramName; + + /** + * 参数类型（无需检修/离散值/连续值/范围） + */ + @ExcelProperty(value = "参数类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "无=需检修/离散值/连续值/范围") + private String paramType; + + /** + * 参数标准范围（该类型设备的通用标准） + */ + @ExcelProperty(value = "参数标准范围", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "该=类型设备的通用标准") + private String paramStandard; + + /** + * 参数单位 + */ + @ExcelProperty(value = "参数单位") + private String paramUnit; + + /** + * 参数来源（行业标准/厂内标准/自定义等） + */ + @ExcelProperty(value = "参数来源", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "行=业标准/厂内标准/自定义等") + private String paramSource; + + /** + * 是否为该类型设备的必选参数（0=否，1=是） + */ + @ExcelProperty(value = "是否为该类型设备的必选参数", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0==否，1=是") + private Integer isMandatory; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpEquipmentManagementMapper.java b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpEquipmentManagementMapper.java new file mode 100644 index 00000000..d64af399 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpEquipmentManagementMapper.java @@ -0,0 +1,15 @@ +package com.klp.mes.eqp.mapper; + +import com.klp.mes.eqp.domain.EqpEquipmentManagement; +import com.klp.mes.eqp.domain.vo.EqpEquipmentManagementVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 设备管理（合并在役和退役设备）Mapper接口 + * + * @author Joshi + * @date 2025-10-17 + */ +public interface EqpEquipmentManagementMapper extends BaseMapperPlus { + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpEquipmentParamMapper.java b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpEquipmentParamMapper.java new file mode 100644 index 00000000..d4d3cde3 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpEquipmentParamMapper.java @@ -0,0 +1,15 @@ +package com.klp.mes.eqp.mapper; + +import com.klp.mes.eqp.domain.EqpEquipmentParam; +import com.klp.mes.eqp.domain.vo.EqpEquipmentParamVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 设备参数Mapper接口 + * + * @author Joshi + * @date 2025-10-17 + */ +public interface EqpEquipmentParamMapper extends BaseMapperPlus { + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpEquipmentTypeMapper.java b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpEquipmentTypeMapper.java new file mode 100644 index 00000000..c6b04c31 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpEquipmentTypeMapper.java @@ -0,0 +1,15 @@ +package com.klp.mes.eqp.mapper; + +import com.klp.mes.eqp.domain.EqpEquipmentType; +import com.klp.mes.eqp.domain.vo.EqpEquipmentTypeVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 设备类型Mapper接口 + * + * @author Joshi + * @date 2025-10-17 + */ +public interface EqpEquipmentTypeMapper extends BaseMapperPlus { + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpInspectedEquipmentMapper.java b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpInspectedEquipmentMapper.java new file mode 100644 index 00000000..99a75554 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpInspectedEquipmentMapper.java @@ -0,0 +1,15 @@ +package com.klp.mes.eqp.mapper; + +import com.klp.mes.eqp.domain.EqpInspectedEquipment; +import com.klp.mes.eqp.domain.vo.EqpInspectedEquipmentVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 待检设备Mapper接口 + * + * @author Joshi + * @date 2025-10-17 + */ +public interface EqpInspectedEquipmentMapper extends BaseMapperPlus { + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpInspectionRecordMapper.java b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpInspectionRecordMapper.java new file mode 100644 index 00000000..3c8edd46 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpInspectionRecordMapper.java @@ -0,0 +1,15 @@ +package com.klp.mes.eqp.mapper; + +import com.klp.mes.eqp.domain.EqpInspectionRecord; +import com.klp.mes.eqp.domain.vo.EqpInspectionRecordVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 检修记录Mapper接口 + * + * @author Joshi + * @date 2025-10-17 + */ +public interface EqpInspectionRecordMapper extends BaseMapperPlus { + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpSparePartMapper.java b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpSparePartMapper.java new file mode 100644 index 00000000..227b6c70 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpSparePartMapper.java @@ -0,0 +1,15 @@ +package com.klp.mes.eqp.mapper; + +import com.klp.mes.eqp.domain.EqpSparePart; +import com.klp.mes.eqp.domain.vo.EqpSparePartVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 备品备件Mapper接口 + * + * @author Joshi + * @date 2025-10-17 + */ +public interface EqpSparePartMapper extends BaseMapperPlus { + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpSparePartsChangeMapper.java b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpSparePartsChangeMapper.java new file mode 100644 index 00000000..0e04795f --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpSparePartsChangeMapper.java @@ -0,0 +1,15 @@ +package com.klp.mes.eqp.mapper; + +import com.klp.mes.eqp.domain.EqpSparePartsChange; +import com.klp.mes.eqp.domain.vo.EqpSparePartsChangeVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 备品备件变动记录Mapper接口 + * + * @author Joshi + * @date 2025-10-17 + */ +public interface EqpSparePartsChangeMapper extends BaseMapperPlus { + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpTypeParamMapper.java b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpTypeParamMapper.java new file mode 100644 index 00000000..9baffbc5 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpTypeParamMapper.java @@ -0,0 +1,15 @@ +package com.klp.mes.eqp.mapper; + +import com.klp.mes.eqp.domain.EqpTypeParam; +import com.klp.mes.eqp.domain.vo.EqpTypeParamVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 设备类型参数（某类设备的通用参数标准）Mapper接口 + * + * @author Joshi + * @date 2025-10-17 + */ +public interface EqpTypeParamMapper extends BaseMapperPlus { + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpEquipmentManagementService.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpEquipmentManagementService.java new file mode 100644 index 00000000..faeec99c --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpEquipmentManagementService.java @@ -0,0 +1,49 @@ +package com.klp.mes.eqp.service; + +import com.klp.mes.eqp.domain.EqpEquipmentManagement; +import com.klp.mes.eqp.domain.vo.EqpEquipmentManagementVo; +import com.klp.mes.eqp.domain.bo.EqpEquipmentManagementBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 设备管理（合并在役和退役设备）Service接口 + * + * @author Joshi + * @date 2025-10-17 + */ +public interface IEqpEquipmentManagementService { + + /** + * 查询设备管理（合并在役和退役设备） + */ + EqpEquipmentManagementVo queryById(Long equipmentId); + + /** + * 查询设备管理（合并在役和退役设备）列表 + */ + TableDataInfo queryPageList(EqpEquipmentManagementBo bo, PageQuery pageQuery); + + /** + * 查询设备管理（合并在役和退役设备）列表 + */ + List queryList(EqpEquipmentManagementBo bo); + + /** + * 新增设备管理（合并在役和退役设备） + */ + Boolean insertByBo(EqpEquipmentManagementBo bo); + + /** + * 修改设备管理（合并在役和退役设备） + */ + Boolean updateByBo(EqpEquipmentManagementBo bo); + + /** + * 校验并批量删除设备管理（合并在役和退役设备）信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpEquipmentParamService.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpEquipmentParamService.java new file mode 100644 index 00000000..deecf285 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpEquipmentParamService.java @@ -0,0 +1,49 @@ +package com.klp.mes.eqp.service; + +import com.klp.mes.eqp.domain.EqpEquipmentParam; +import com.klp.mes.eqp.domain.vo.EqpEquipmentParamVo; +import com.klp.mes.eqp.domain.bo.EqpEquipmentParamBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 设备参数Service接口 + * + * @author Joshi + * @date 2025-10-17 + */ +public interface IEqpEquipmentParamService { + + /** + * 查询设备参数 + */ + EqpEquipmentParamVo queryById(Long paramId); + + /** + * 查询设备参数列表 + */ + TableDataInfo queryPageList(EqpEquipmentParamBo bo, PageQuery pageQuery); + + /** + * 查询设备参数列表 + */ + List queryList(EqpEquipmentParamBo bo); + + /** + * 新增设备参数 + */ + Boolean insertByBo(EqpEquipmentParamBo bo); + + /** + * 修改设备参数 + */ + Boolean updateByBo(EqpEquipmentParamBo bo); + + /** + * 校验并批量删除设备参数信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpEquipmentTypeService.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpEquipmentTypeService.java new file mode 100644 index 00000000..0dea91cb --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpEquipmentTypeService.java @@ -0,0 +1,49 @@ +package com.klp.mes.eqp.service; + +import com.klp.mes.eqp.domain.EqpEquipmentType; +import com.klp.mes.eqp.domain.vo.EqpEquipmentTypeVo; +import com.klp.mes.eqp.domain.bo.EqpEquipmentTypeBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 设备类型Service接口 + * + * @author Joshi + * @date 2025-10-17 + */ +public interface IEqpEquipmentTypeService { + + /** + * 查询设备类型 + */ + EqpEquipmentTypeVo queryById(Long typeId); + + /** + * 查询设备类型列表 + */ + TableDataInfo queryPageList(EqpEquipmentTypeBo bo, PageQuery pageQuery); + + /** + * 查询设备类型列表 + */ + List queryList(EqpEquipmentTypeBo bo); + + /** + * 新增设备类型 + */ + Boolean insertByBo(EqpEquipmentTypeBo bo); + + /** + * 修改设备类型 + */ + Boolean updateByBo(EqpEquipmentTypeBo bo); + + /** + * 校验并批量删除设备类型信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpInspectedEquipmentService.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpInspectedEquipmentService.java new file mode 100644 index 00000000..7b7e6877 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpInspectedEquipmentService.java @@ -0,0 +1,49 @@ +package com.klp.mes.eqp.service; + +import com.klp.mes.eqp.domain.EqpInspectedEquipment; +import com.klp.mes.eqp.domain.vo.EqpInspectedEquipmentVo; +import com.klp.mes.eqp.domain.bo.EqpInspectedEquipmentBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 待检设备Service接口 + * + * @author Joshi + * @date 2025-10-17 + */ +public interface IEqpInspectedEquipmentService { + + /** + * 查询待检设备 + */ + EqpInspectedEquipmentVo queryById(Long inspectId); + + /** + * 查询待检设备列表 + */ + TableDataInfo queryPageList(EqpInspectedEquipmentBo bo, PageQuery pageQuery); + + /** + * 查询待检设备列表 + */ + List queryList(EqpInspectedEquipmentBo bo); + + /** + * 新增待检设备 + */ + Boolean insertByBo(EqpInspectedEquipmentBo bo); + + /** + * 修改待检设备 + */ + Boolean updateByBo(EqpInspectedEquipmentBo bo); + + /** + * 校验并批量删除待检设备信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpInspectionRecordService.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpInspectionRecordService.java new file mode 100644 index 00000000..45d7adf0 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpInspectionRecordService.java @@ -0,0 +1,49 @@ +package com.klp.mes.eqp.service; + +import com.klp.mes.eqp.domain.EqpInspectionRecord; +import com.klp.mes.eqp.domain.vo.EqpInspectionRecordVo; +import com.klp.mes.eqp.domain.bo.EqpInspectionRecordBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 检修记录Service接口 + * + * @author Joshi + * @date 2025-10-17 + */ +public interface IEqpInspectionRecordService { + + /** + * 查询检修记录 + */ + EqpInspectionRecordVo queryById(Long recordId); + + /** + * 查询检修记录列表 + */ + TableDataInfo queryPageList(EqpInspectionRecordBo bo, PageQuery pageQuery); + + /** + * 查询检修记录列表 + */ + List queryList(EqpInspectionRecordBo bo); + + /** + * 新增检修记录 + */ + Boolean insertByBo(EqpInspectionRecordBo bo); + + /** + * 修改检修记录 + */ + Boolean updateByBo(EqpInspectionRecordBo bo); + + /** + * 校验并批量删除检修记录信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpSparePartService.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpSparePartService.java new file mode 100644 index 00000000..dd296a04 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpSparePartService.java @@ -0,0 +1,49 @@ +package com.klp.mes.eqp.service; + +import com.klp.mes.eqp.domain.EqpSparePart; +import com.klp.mes.eqp.domain.vo.EqpSparePartVo; +import com.klp.mes.eqp.domain.bo.EqpSparePartBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 备品备件Service接口 + * + * @author Joshi + * @date 2025-10-17 + */ +public interface IEqpSparePartService { + + /** + * 查询备品备件 + */ + EqpSparePartVo queryById(Long partId); + + /** + * 查询备品备件列表 + */ + TableDataInfo queryPageList(EqpSparePartBo bo, PageQuery pageQuery); + + /** + * 查询备品备件列表 + */ + List queryList(EqpSparePartBo bo); + + /** + * 新增备品备件 + */ + Boolean insertByBo(EqpSparePartBo bo); + + /** + * 修改备品备件 + */ + Boolean updateByBo(EqpSparePartBo bo); + + /** + * 校验并批量删除备品备件信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpSparePartsChangeService.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpSparePartsChangeService.java new file mode 100644 index 00000000..c4ed8e7e --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpSparePartsChangeService.java @@ -0,0 +1,49 @@ +package com.klp.mes.eqp.service; + +import com.klp.mes.eqp.domain.EqpSparePartsChange; +import com.klp.mes.eqp.domain.vo.EqpSparePartsChangeVo; +import com.klp.mes.eqp.domain.bo.EqpSparePartsChangeBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 备品备件变动记录Service接口 + * + * @author Joshi + * @date 2025-10-17 + */ +public interface IEqpSparePartsChangeService { + + /** + * 查询备品备件变动记录 + */ + EqpSparePartsChangeVo queryById(Long changeId); + + /** + * 查询备品备件变动记录列表 + */ + TableDataInfo queryPageList(EqpSparePartsChangeBo bo, PageQuery pageQuery); + + /** + * 查询备品备件变动记录列表 + */ + List queryList(EqpSparePartsChangeBo bo); + + /** + * 新增备品备件变动记录 + */ + Boolean insertByBo(EqpSparePartsChangeBo bo); + + /** + * 修改备品备件变动记录 + */ + Boolean updateByBo(EqpSparePartsChangeBo bo); + + /** + * 校验并批量删除备品备件变动记录信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpTypeParamService.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpTypeParamService.java new file mode 100644 index 00000000..be923ca0 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpTypeParamService.java @@ -0,0 +1,49 @@ +package com.klp.mes.eqp.service; + +import com.klp.mes.eqp.domain.EqpTypeParam; +import com.klp.mes.eqp.domain.vo.EqpTypeParamVo; +import com.klp.mes.eqp.domain.bo.EqpTypeParamBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 设备类型参数（某类设备的通用参数标准）Service接口 + * + * @author Joshi + * @date 2025-10-17 + */ +public interface IEqpTypeParamService { + + /** + * 查询设备类型参数（某类设备的通用参数标准） + */ + EqpTypeParamVo queryById(Long typeParamId); + + /** + * 查询设备类型参数（某类设备的通用参数标准）列表 + */ + TableDataInfo queryPageList(EqpTypeParamBo bo, PageQuery pageQuery); + + /** + * 查询设备类型参数（某类设备的通用参数标准）列表 + */ + List queryList(EqpTypeParamBo bo); + + /** + * 新增设备类型参数（某类设备的通用参数标准） + */ + Boolean insertByBo(EqpTypeParamBo bo); + + /** + * 修改设备类型参数（某类设备的通用参数标准） + */ + Boolean updateByBo(EqpTypeParamBo bo); + + /** + * 校验并批量删除设备类型参数（某类设备的通用参数标准）信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentManagementServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentManagementServiceImpl.java new file mode 100644 index 00000000..0872d3b6 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentManagementServiceImpl.java @@ -0,0 +1,121 @@ +package com.klp.mes.eqp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.klp.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.mes.eqp.domain.bo.EqpEquipmentManagementBo; +import com.klp.mes.eqp.domain.vo.EqpEquipmentManagementVo; +import com.klp.mes.eqp.domain.EqpEquipmentManagement; +import com.klp.mes.eqp.mapper.EqpEquipmentManagementMapper; +import com.klp.mes.eqp.service.IEqpEquipmentManagementService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 设备管理（合并在役和退役设备）Service业务层处理 + * + * @author Joshi + * @date 2025-10-17 + */ +@RequiredArgsConstructor +@Service +public class EqpEquipmentManagementServiceImpl implements IEqpEquipmentManagementService { + + private final EqpEquipmentManagementMapper baseMapper; + + /** + * 查询设备管理（合并在役和退役设备） + */ + @Override + public EqpEquipmentManagementVo queryById(Long equipmentId){ + return baseMapper.selectVoById(equipmentId); + } + + /** + * 查询设备管理（合并在役和退役设备）列表 + */ + @Override + public TableDataInfo queryPageList(EqpEquipmentManagementBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询设备管理（合并在役和退役设备）列表 + */ + @Override + public List queryList(EqpEquipmentManagementBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EqpEquipmentManagementBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getEquipmentName()), EqpEquipmentManagement::getEquipmentName, bo.getEquipmentName()); + lqw.eq(StringUtils.isNotBlank(bo.getModel()), EqpEquipmentManagement::getModel, bo.getModel()); + lqw.eq(bo.getTypeId() != null, EqpEquipmentManagement::getTypeId, bo.getTypeId()); + lqw.eq(StringUtils.isNotBlank(bo.getEquipmentCode()), EqpEquipmentManagement::getEquipmentCode, bo.getEquipmentCode()); + lqw.eq(StringUtils.isNotBlank(bo.getLocation()), EqpEquipmentManagement::getLocation, bo.getLocation()); + lqw.eq(bo.getQuantity() != null, EqpEquipmentManagement::getQuantity, bo.getQuantity()); + lqw.eq(StringUtils.isNotBlank(bo.getManager()), EqpEquipmentManagement::getManager, bo.getManager()); + lqw.eq(StringUtils.isNotBlank(bo.getOssId()), EqpEquipmentManagement::getOssId, bo.getOssId()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), EqpEquipmentManagement::getStatus, bo.getStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getStopReason()), EqpEquipmentManagement::getStopReason, bo.getStopReason()); + lqw.eq(StringUtils.isNotBlank(bo.getEquipmentDestination()), EqpEquipmentManagement::getEquipmentDestination, bo.getEquipmentDestination()); + lqw.eq(bo.getEnableTime() != null, EqpEquipmentManagement::getEnableTime, bo.getEnableTime()); + lqw.eq(bo.getRetireTime() != null, EqpEquipmentManagement::getRetireTime, bo.getRetireTime()); + return lqw; + } + + /** + * 新增设备管理（合并在役和退役设备） + */ + @Override + public Boolean insertByBo(EqpEquipmentManagementBo bo) { + EqpEquipmentManagement add = BeanUtil.toBean(bo, EqpEquipmentManagement.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setEquipmentId(add.getEquipmentId()); + } + return flag; + } + + /** + * 修改设备管理（合并在役和退役设备） + */ + @Override + public Boolean updateByBo(EqpEquipmentManagementBo bo) { + EqpEquipmentManagement update = BeanUtil.toBean(bo, EqpEquipmentManagement.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EqpEquipmentManagement entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除设备管理（合并在役和退役设备） + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentParamServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentParamServiceImpl.java new file mode 100644 index 00000000..d15d344f --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentParamServiceImpl.java @@ -0,0 +1,114 @@ +package com.klp.mes.eqp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.klp.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.mes.eqp.domain.bo.EqpEquipmentParamBo; +import com.klp.mes.eqp.domain.vo.EqpEquipmentParamVo; +import com.klp.mes.eqp.domain.EqpEquipmentParam; +import com.klp.mes.eqp.mapper.EqpEquipmentParamMapper; +import com.klp.mes.eqp.service.IEqpEquipmentParamService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 设备参数Service业务层处理 + * + * @author Joshi + * @date 2025-10-17 + */ +@RequiredArgsConstructor +@Service +public class EqpEquipmentParamServiceImpl implements IEqpEquipmentParamService { + + private final EqpEquipmentParamMapper baseMapper; + + /** + * 查询设备参数 + */ + @Override + public EqpEquipmentParamVo queryById(Long paramId){ + return baseMapper.selectVoById(paramId); + } + + /** + * 查询设备参数列表 + */ + @Override + public TableDataInfo queryPageList(EqpEquipmentParamBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询设备参数列表 + */ + @Override + public List queryList(EqpEquipmentParamBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EqpEquipmentParamBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getParamName()), EqpEquipmentParam::getParamName, bo.getParamName()); + lqw.eq(bo.getEquipmentId() != null, EqpEquipmentParam::getEquipmentId, bo.getEquipmentId()); + lqw.eq(StringUtils.isNotBlank(bo.getParamType()), EqpEquipmentParam::getParamType, bo.getParamType()); + lqw.eq(StringUtils.isNotBlank(bo.getParamStandard()), EqpEquipmentParam::getParamStandard, bo.getParamStandard()); + lqw.eq(StringUtils.isNotBlank(bo.getParamUnit()), EqpEquipmentParam::getParamUnit, bo.getParamUnit()); + lqw.eq(StringUtils.isNotBlank(bo.getParamSource()), EqpEquipmentParam::getParamSource, bo.getParamSource()); + return lqw; + } + + /** + * 新增设备参数 + */ + @Override + public Boolean insertByBo(EqpEquipmentParamBo bo) { + EqpEquipmentParam add = BeanUtil.toBean(bo, EqpEquipmentParam.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setParamId(add.getParamId()); + } + return flag; + } + + /** + * 修改设备参数 + */ + @Override + public Boolean updateByBo(EqpEquipmentParamBo bo) { + EqpEquipmentParam update = BeanUtil.toBean(bo, EqpEquipmentParam.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EqpEquipmentParam entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除设备参数 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentTypeServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentTypeServiceImpl.java new file mode 100644 index 00000000..48c3a1f4 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentTypeServiceImpl.java @@ -0,0 +1,110 @@ +package com.klp.mes.eqp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.klp.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.mes.eqp.domain.bo.EqpEquipmentTypeBo; +import com.klp.mes.eqp.domain.vo.EqpEquipmentTypeVo; +import com.klp.mes.eqp.domain.EqpEquipmentType; +import com.klp.mes.eqp.mapper.EqpEquipmentTypeMapper; +import com.klp.mes.eqp.service.IEqpEquipmentTypeService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 设备类型Service业务层处理 + * + * @author Joshi + * @date 2025-10-17 + */ +@RequiredArgsConstructor +@Service +public class EqpEquipmentTypeServiceImpl implements IEqpEquipmentTypeService { + + private final EqpEquipmentTypeMapper baseMapper; + + /** + * 查询设备类型 + */ + @Override + public EqpEquipmentTypeVo queryById(Long typeId){ + return baseMapper.selectVoById(typeId); + } + + /** + * 查询设备类型列表 + */ + @Override + public TableDataInfo queryPageList(EqpEquipmentTypeBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询设备类型列表 + */ + @Override + public List queryList(EqpEquipmentTypeBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EqpEquipmentTypeBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getTypeName()), EqpEquipmentType::getTypeName, bo.getTypeName()); + lqw.eq(StringUtils.isNotBlank(bo.getTypeDesc()), EqpEquipmentType::getTypeDesc, bo.getTypeDesc()); + return lqw; + } + + /** + * 新增设备类型 + */ + @Override + public Boolean insertByBo(EqpEquipmentTypeBo bo) { + EqpEquipmentType add = BeanUtil.toBean(bo, EqpEquipmentType.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTypeId(add.getTypeId()); + } + return flag; + } + + /** + * 修改设备类型 + */ + @Override + public Boolean updateByBo(EqpEquipmentTypeBo bo) { + EqpEquipmentType update = BeanUtil.toBean(bo, EqpEquipmentType.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EqpEquipmentType entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除设备类型 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpInspectedEquipmentServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpInspectedEquipmentServiceImpl.java new file mode 100644 index 00000000..971d55e5 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpInspectedEquipmentServiceImpl.java @@ -0,0 +1,113 @@ +package com.klp.mes.eqp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.klp.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.mes.eqp.domain.bo.EqpInspectedEquipmentBo; +import com.klp.mes.eqp.domain.vo.EqpInspectedEquipmentVo; +import com.klp.mes.eqp.domain.EqpInspectedEquipment; +import com.klp.mes.eqp.mapper.EqpInspectedEquipmentMapper; +import com.klp.mes.eqp.service.IEqpInspectedEquipmentService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 待检设备Service业务层处理 + * + * @author Joshi + * @date 2025-10-17 + */ +@RequiredArgsConstructor +@Service +public class EqpInspectedEquipmentServiceImpl implements IEqpInspectedEquipmentService { + + private final EqpInspectedEquipmentMapper baseMapper; + + /** + * 查询待检设备 + */ + @Override + public EqpInspectedEquipmentVo queryById(Long inspectId){ + return baseMapper.selectVoById(inspectId); + } + + /** + * 查询待检设备列表 + */ + @Override + public TableDataInfo queryPageList(EqpInspectedEquipmentBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询待检设备列表 + */ + @Override + public List queryList(EqpInspectedEquipmentBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EqpInspectedEquipmentBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getEquipmentId() != null, EqpInspectedEquipment::getEquipmentId, bo.getEquipmentId()); + lqw.eq(bo.getInspectTime() != null, EqpInspectedEquipment::getInspectTime, bo.getInspectTime()); + lqw.eq(StringUtils.isNotBlank(bo.getInspectVendor()), EqpInspectedEquipment::getInspectVendor, bo.getInspectVendor()); + lqw.eq(bo.getRemainTime() != null, EqpInspectedEquipment::getRemainTime, bo.getRemainTime()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), EqpInspectedEquipment::getStatus, bo.getStatus()); + return lqw; + } + + /** + * 新增待检设备 + */ + @Override + public Boolean insertByBo(EqpInspectedEquipmentBo bo) { + EqpInspectedEquipment add = BeanUtil.toBean(bo, EqpInspectedEquipment.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setInspectId(add.getInspectId()); + } + return flag; + } + + /** + * 修改待检设备 + */ + @Override + public Boolean updateByBo(EqpInspectedEquipmentBo bo) { + EqpInspectedEquipment update = BeanUtil.toBean(bo, EqpInspectedEquipment.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EqpInspectedEquipment entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除待检设备 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpInspectionRecordServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpInspectionRecordServiceImpl.java new file mode 100644 index 00000000..828589c4 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpInspectionRecordServiceImpl.java @@ -0,0 +1,113 @@ +package com.klp.mes.eqp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.klp.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.mes.eqp.domain.bo.EqpInspectionRecordBo; +import com.klp.mes.eqp.domain.vo.EqpInspectionRecordVo; +import com.klp.mes.eqp.domain.EqpInspectionRecord; +import com.klp.mes.eqp.mapper.EqpInspectionRecordMapper; +import com.klp.mes.eqp.service.IEqpInspectionRecordService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 检修记录Service业务层处理 + * + * @author Joshi + * @date 2025-10-17 + */ +@RequiredArgsConstructor +@Service +public class EqpInspectionRecordServiceImpl implements IEqpInspectionRecordService { + + private final EqpInspectionRecordMapper baseMapper; + + /** + * 查询检修记录 + */ + @Override + public EqpInspectionRecordVo queryById(Long recordId){ + return baseMapper.selectVoById(recordId); + } + + /** + * 查询检修记录列表 + */ + @Override + public TableDataInfo queryPageList(EqpInspectionRecordBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询检修记录列表 + */ + @Override + public List queryList(EqpInspectionRecordBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EqpInspectionRecordBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getEquipmentId() != null, EqpInspectionRecord::getEquipmentId, bo.getEquipmentId()); + lqw.eq(bo.getInspectTime() != null, EqpInspectionRecord::getInspectTime, bo.getInspectTime()); + lqw.eq(StringUtils.isNotBlank(bo.getInspectVendor()), EqpInspectionRecord::getInspectVendor, bo.getInspectVendor()); + lqw.eq(StringUtils.isNotBlank(bo.getInspectContent()), EqpInspectionRecord::getInspectContent, bo.getInspectContent()); + lqw.eq(StringUtils.isNotBlank(bo.getResult()), EqpInspectionRecord::getResult, bo.getResult()); + return lqw; + } + + /** + * 新增检修记录 + */ + @Override + public Boolean insertByBo(EqpInspectionRecordBo bo) { + EqpInspectionRecord add = BeanUtil.toBean(bo, EqpInspectionRecord.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setRecordId(add.getRecordId()); + } + return flag; + } + + /** + * 修改检修记录 + */ + @Override + public Boolean updateByBo(EqpInspectionRecordBo bo) { + EqpInspectionRecord update = BeanUtil.toBean(bo, EqpInspectionRecord.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EqpInspectionRecord entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除检修记录 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpSparePartServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpSparePartServiceImpl.java new file mode 100644 index 00000000..c173dd2b --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpSparePartServiceImpl.java @@ -0,0 +1,114 @@ +package com.klp.mes.eqp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.klp.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.mes.eqp.domain.bo.EqpSparePartBo; +import com.klp.mes.eqp.domain.vo.EqpSparePartVo; +import com.klp.mes.eqp.domain.EqpSparePart; +import com.klp.mes.eqp.mapper.EqpSparePartMapper; +import com.klp.mes.eqp.service.IEqpSparePartService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 备品备件Service业务层处理 + * + * @author Joshi + * @date 2025-10-17 + */ +@RequiredArgsConstructor +@Service +public class EqpSparePartServiceImpl implements IEqpSparePartService { + + private final EqpSparePartMapper baseMapper; + + /** + * 查询备品备件 + */ + @Override + public EqpSparePartVo queryById(Long partId){ + return baseMapper.selectVoById(partId); + } + + /** + * 查询备品备件列表 + */ + @Override + public TableDataInfo queryPageList(EqpSparePartBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询备品备件列表 + */ + @Override + public List queryList(EqpSparePartBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EqpSparePartBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getPartName()), EqpSparePart::getPartName, bo.getPartName()); + lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategory()), EqpSparePart::getMaterialCategory, bo.getMaterialCategory()); + lqw.eq(StringUtils.isNotBlank(bo.getModel()), EqpSparePart::getModel, bo.getModel()); + lqw.eq(StringUtils.isNotBlank(bo.getUnit()), EqpSparePart::getUnit, bo.getUnit()); + lqw.eq(bo.getEquipmentId() != null, EqpSparePart::getEquipmentId, bo.getEquipmentId()); + lqw.eq(bo.getQuantity() != null, EqpSparePart::getQuantity, bo.getQuantity()); + return lqw; + } + + /** + * 新增备品备件 + */ + @Override + public Boolean insertByBo(EqpSparePartBo bo) { + EqpSparePart add = BeanUtil.toBean(bo, EqpSparePart.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setPartId(add.getPartId()); + } + return flag; + } + + /** + * 修改备品备件 + */ + @Override + public Boolean updateByBo(EqpSparePartBo bo) { + EqpSparePart update = BeanUtil.toBean(bo, EqpSparePart.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EqpSparePart entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除备品备件 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpSparePartsChangeServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpSparePartsChangeServiceImpl.java new file mode 100644 index 00000000..9e2d67f5 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpSparePartsChangeServiceImpl.java @@ -0,0 +1,113 @@ +package com.klp.mes.eqp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.klp.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.mes.eqp.domain.bo.EqpSparePartsChangeBo; +import com.klp.mes.eqp.domain.vo.EqpSparePartsChangeVo; +import com.klp.mes.eqp.domain.EqpSparePartsChange; +import com.klp.mes.eqp.mapper.EqpSparePartsChangeMapper; +import com.klp.mes.eqp.service.IEqpSparePartsChangeService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 备品备件变动记录Service业务层处理 + * + * @author Joshi + * @date 2025-10-17 + */ +@RequiredArgsConstructor +@Service +public class EqpSparePartsChangeServiceImpl implements IEqpSparePartsChangeService { + + private final EqpSparePartsChangeMapper baseMapper; + + /** + * 查询备品备件变动记录 + */ + @Override + public EqpSparePartsChangeVo queryById(Long changeId){ + return baseMapper.selectVoById(changeId); + } + + /** + * 查询备品备件变动记录列表 + */ + @Override + public TableDataInfo queryPageList(EqpSparePartsChangeBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询备品备件变动记录列表 + */ + @Override + public List queryList(EqpSparePartsChangeBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EqpSparePartsChangeBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getPartId() != null, EqpSparePartsChange::getPartId, bo.getPartId()); + lqw.eq(StringUtils.isNotBlank(bo.getChangeType()), EqpSparePartsChange::getChangeType, bo.getChangeType()); + lqw.eq(bo.getChangeQuantity() != null, EqpSparePartsChange::getChangeQuantity, bo.getChangeQuantity()); + lqw.eq(StringUtils.isNotBlank(bo.getReason()), EqpSparePartsChange::getReason, bo.getReason()); + lqw.eq(bo.getChangeTime() != null, EqpSparePartsChange::getChangeTime, bo.getChangeTime()); + return lqw; + } + + /** + * 新增备品备件变动记录 + */ + @Override + public Boolean insertByBo(EqpSparePartsChangeBo bo) { + EqpSparePartsChange add = BeanUtil.toBean(bo, EqpSparePartsChange.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setChangeId(add.getChangeId()); + } + return flag; + } + + /** + * 修改备品备件变动记录 + */ + @Override + public Boolean updateByBo(EqpSparePartsChangeBo bo) { + EqpSparePartsChange update = BeanUtil.toBean(bo, EqpSparePartsChange.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EqpSparePartsChange entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除备品备件变动记录 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpTypeParamServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpTypeParamServiceImpl.java new file mode 100644 index 00000000..62be07f2 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpTypeParamServiceImpl.java @@ -0,0 +1,115 @@ +package com.klp.mes.eqp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.klp.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.mes.eqp.domain.bo.EqpTypeParamBo; +import com.klp.mes.eqp.domain.vo.EqpTypeParamVo; +import com.klp.mes.eqp.domain.EqpTypeParam; +import com.klp.mes.eqp.mapper.EqpTypeParamMapper; +import com.klp.mes.eqp.service.IEqpTypeParamService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 设备类型参数（某类设备的通用参数标准）Service业务层处理 + * + * @author Joshi + * @date 2025-10-17 + */ +@RequiredArgsConstructor +@Service +public class EqpTypeParamServiceImpl implements IEqpTypeParamService { + + private final EqpTypeParamMapper baseMapper; + + /** + * 查询设备类型参数（某类设备的通用参数标准） + */ + @Override + public EqpTypeParamVo queryById(Long typeParamId){ + return baseMapper.selectVoById(typeParamId); + } + + /** + * 查询设备类型参数（某类设备的通用参数标准）列表 + */ + @Override + public TableDataInfo queryPageList(EqpTypeParamBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询设备类型参数（某类设备的通用参数标准）列表 + */ + @Override + public List queryList(EqpTypeParamBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EqpTypeParamBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getTypeId() != null, EqpTypeParam::getTypeId, bo.getTypeId()); + lqw.like(StringUtils.isNotBlank(bo.getParamName()), EqpTypeParam::getParamName, bo.getParamName()); + lqw.eq(StringUtils.isNotBlank(bo.getParamType()), EqpTypeParam::getParamType, bo.getParamType()); + lqw.eq(StringUtils.isNotBlank(bo.getParamStandard()), EqpTypeParam::getParamStandard, bo.getParamStandard()); + lqw.eq(StringUtils.isNotBlank(bo.getParamUnit()), EqpTypeParam::getParamUnit, bo.getParamUnit()); + lqw.eq(StringUtils.isNotBlank(bo.getParamSource()), EqpTypeParam::getParamSource, bo.getParamSource()); + lqw.eq(bo.getIsMandatory() != null, EqpTypeParam::getIsMandatory, bo.getIsMandatory()); + return lqw; + } + + /** + * 新增设备类型参数（某类设备的通用参数标准） + */ + @Override + public Boolean insertByBo(EqpTypeParamBo bo) { + EqpTypeParam add = BeanUtil.toBean(bo, EqpTypeParam.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTypeParamId(add.getTypeParamId()); + } + return flag; + } + + /** + * 修改设备类型参数（某类设备的通用参数标准） + */ + @Override + public Boolean updateByBo(EqpTypeParamBo bo) { + EqpTypeParam update = BeanUtil.toBean(bo, EqpTypeParam.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EqpTypeParam entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除设备类型参数（某类设备的通用参数标准） + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentManagementMapper.xml b/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentManagementMapper.xml new file mode 100644 index 00000000..264203ea --- /dev/null +++ b/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentManagementMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentParamMapper.xml b/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentParamMapper.xml new file mode 100644 index 00000000..c554f737 --- /dev/null +++ b/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentParamMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentTypeMapper.xml b/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentTypeMapper.xml new file mode 100644 index 00000000..36e1e3be --- /dev/null +++ b/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentTypeMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + diff --git a/klp-mes/src/main/resources/mapper/eqp/EqpInspectedEquipmentMapper.xml b/klp-mes/src/main/resources/mapper/eqp/EqpInspectedEquipmentMapper.xml new file mode 100644 index 00000000..521b5956 --- /dev/null +++ b/klp-mes/src/main/resources/mapper/eqp/EqpInspectedEquipmentMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-mes/src/main/resources/mapper/eqp/EqpInspectionRecordMapper.xml b/klp-mes/src/main/resources/mapper/eqp/EqpInspectionRecordMapper.xml new file mode 100644 index 00000000..fa795757 --- /dev/null +++ b/klp-mes/src/main/resources/mapper/eqp/EqpInspectionRecordMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-mes/src/main/resources/mapper/eqp/EqpSparePartMapper.xml b/klp-mes/src/main/resources/mapper/eqp/EqpSparePartMapper.xml new file mode 100644 index 00000000..b74b0d04 --- /dev/null +++ b/klp-mes/src/main/resources/mapper/eqp/EqpSparePartMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-mes/src/main/resources/mapper/eqp/EqpSparePartsChangeMapper.xml b/klp-mes/src/main/resources/mapper/eqp/EqpSparePartsChangeMapper.xml new file mode 100644 index 00000000..5886ad38 --- /dev/null +++ b/klp-mes/src/main/resources/mapper/eqp/EqpSparePartsChangeMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-mes/src/main/resources/mapper/eqp/EqpTypeParamMapper.xml b/klp-mes/src/main/resources/mapper/eqp/EqpTypeParamMapper.xml new file mode 100644 index 00000000..8a8b32f2 --- /dev/null +++ b/klp-mes/src/main/resources/mapper/eqp/EqpTypeParamMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + +