From c2da7640c3fc2b3afb95ec0aceab9b00894fc32b Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Thu, 16 Apr 2026 14:55:43 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E9=80=80?= =?UTF-8?q?=E7=81=AB=E6=93=8D=E4=BD=9C=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 创建退火操作事件实体类 WmsAnnealOperateEvent - 定义退火操作事件服务接口 IWmsAnnealOperateEventService - 实现退火操作事件服务业务逻辑 WmsAnnealOperateEventServiceImpl - 添加退火操作事件控制器 WmsAnnealOperateEventController - 创建退火操作事件数据访问层 WmsAnnealOperateEventMapper - 实现退火操作事件业务对象 WmsAnnealOperateEventBo 和视图对象 WmsAnnealOperateEventVo - 集成 MyBatis Plus 分页查询和基础 CRUD 功能 - 添加 Excel 导出功能和操作日志记录 - 实现表单验证和重复提交防护机制 --- .../WmsAnnealOperateEventController.java | 99 ++++++++++++++++ .../com/klp/domain/WmsAnnealOperateEvent.java | 53 +++++++++ .../domain/bo/WmsAnnealOperateEventBo.java | 51 ++++++++ .../domain/vo/WmsAnnealOperateEventVo.java | 59 +++++++++ .../mapper/WmsAnnealOperateEventMapper.java | 15 +++ .../IWmsAnnealOperateEventService.java | 49 ++++++++ .../WmsAnnealOperateEventServiceImpl.java | 112 ++++++++++++++++++ .../klp/WmsAnnealOperateEventMapper.xml | 22 ++++ 8 files changed, 460 insertions(+) create mode 100644 klp-wms/src/main/java/com/klp/controller/WmsAnnealOperateEventController.java create mode 100644 klp-wms/src/main/java/com/klp/domain/WmsAnnealOperateEvent.java create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsAnnealOperateEventBo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsAnnealOperateEventVo.java create mode 100644 klp-wms/src/main/java/com/klp/mapper/WmsAnnealOperateEventMapper.java create mode 100644 klp-wms/src/main/java/com/klp/service/IWmsAnnealOperateEventService.java create mode 100644 klp-wms/src/main/java/com/klp/service/impl/WmsAnnealOperateEventServiceImpl.java create mode 100644 klp-wms/src/main/resources/mapper/klp/WmsAnnealOperateEventMapper.xml diff --git a/klp-wms/src/main/java/com/klp/controller/WmsAnnealOperateEventController.java b/klp-wms/src/main/java/com/klp/controller/WmsAnnealOperateEventController.java new file mode 100644 index 00000000..bbf6fedd --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsAnnealOperateEventController.java @@ -0,0 +1,99 @@ +package com.klp.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.domain.vo.WmsAnnealOperateEventVo; +import com.klp.domain.bo.WmsAnnealOperateEventBo; +import com.klp.service.IWmsAnnealOperateEventService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 退火操作事件 + * + * @author klp + * @date 2026-04-16 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/annealOperateEvent") +public class WmsAnnealOperateEventController extends BaseController { + + private final IWmsAnnealOperateEventService iWmsAnnealOperateEventService; + + /** + * 查询退火操作事件列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsAnnealOperateEventBo bo, PageQuery pageQuery) { + return iWmsAnnealOperateEventService.queryPageList(bo, pageQuery); + } + + /** + * 导出退火操作事件列表 + */ + @Log(title = "退火操作事件", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsAnnealOperateEventBo bo, HttpServletResponse response) { + List list = iWmsAnnealOperateEventService.queryList(bo); + ExcelUtil.exportExcel(list, "退火操作事件", WmsAnnealOperateEventVo.class, response); + } + + /** + * 获取退火操作事件详细信息 + * + * @param eventId 主键 + */ + @GetMapping("/{eventId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long eventId) { + return R.ok(iWmsAnnealOperateEventService.queryById(eventId)); + } + + /** + * 新增退火操作事件 + */ + @Log(title = "退火操作事件", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsAnnealOperateEventBo bo) { + return toAjax(iWmsAnnealOperateEventService.insertByBo(bo)); + } + + /** + * 修改退火操作事件 + */ + @Log(title = "退火操作事件", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsAnnealOperateEventBo bo) { + return toAjax(iWmsAnnealOperateEventService.updateByBo(bo)); + } + + /** + * 删除退火操作事件 + * + * @param eventIds 主键串 + */ + @Log(title = "退火操作事件", businessType = BusinessType.DELETE) + @DeleteMapping("/{eventIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] eventIds) { + return toAjax(iWmsAnnealOperateEventService.deleteWithValidByIds(Arrays.asList(eventIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsAnnealOperateEvent.java b/klp-wms/src/main/java/com/klp/domain/WmsAnnealOperateEvent.java new file mode 100644 index 00000000..2b643f42 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsAnnealOperateEvent.java @@ -0,0 +1,53 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 退火操作事件对象 wms_anneal_operate_event + * + * @author klp + * @date 2026-04-16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_anneal_operate_event") +public class WmsAnnealOperateEvent extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键ID + */ + @TableId(value = "event_id") + private Long eventId; + /** + * 退火炉ID + */ + private Long annealFurnaceId; + /** + * 操作类型 如:START/PAUSE/STOP/FEED/TAKE/RESET + */ + private String operateType; + /** + * 操作内容描述 + */ + private String operateContent; + /** + * 钢卷ID(可选) + */ + private Long coilId; + /** + * 删除标志（0=正常,1=已删除） + */ + @TableLogic + private Integer delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsAnnealOperateEventBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsAnnealOperateEventBo.java new file mode 100644 index 00000000..d74ab424 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsAnnealOperateEventBo.java @@ -0,0 +1,51 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + + +/** + * 退火操作事件业务对象 wms_anneal_operate_event + * + * @author klp + * @date 2026-04-16 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsAnnealOperateEventBo extends BaseEntity { + + /** + * 主键ID + */ + private Long eventId; + + /** + * 退火炉ID + */ + private Long annealFurnaceId; + + /** + * 操作类型 如:START/PAUSE/STOP/FEED/TAKE/RESET + */ + private String operateType; + + /** + * 操作内容描述 + */ + private String operateContent; + + /** + * 钢卷ID(可选) + */ + private Long coilId; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsAnnealOperateEventVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsAnnealOperateEventVo.java new file mode 100644 index 00000000..17e416d8 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsAnnealOperateEventVo.java @@ -0,0 +1,59 @@ +package com.klp.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; + + +/** + * 退火操作事件视图对象 wms_anneal_operate_event + * + * @author klp + * @date 2026-04-16 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsAnnealOperateEventVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long eventId; + + /** + * 退火炉ID + */ + @ExcelProperty(value = "退火炉ID") + private Long annealFurnaceId; + + /** + * 操作类型 如:START/PAUSE/STOP/FEED/TAKE/RESET + */ + @ExcelProperty(value = "操作类型 如:START/PAUSE/STOP/FEED/TAKE/RESET") + private String operateType; + + /** + * 操作内容描述 + */ + @ExcelProperty(value = "操作内容描述") + private String operateContent; + + /** + * 钢卷ID(可选) + */ + @ExcelProperty(value = "钢卷ID(可选)") + private Long coilId; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsAnnealOperateEventMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsAnnealOperateEventMapper.java new file mode 100644 index 00000000..007407fe --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsAnnealOperateEventMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsAnnealOperateEvent; +import com.klp.domain.vo.WmsAnnealOperateEventVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 退火操作事件Mapper接口 + * + * @author klp + * @date 2026-04-16 + */ +public interface WmsAnnealOperateEventMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsAnnealOperateEventService.java b/klp-wms/src/main/java/com/klp/service/IWmsAnnealOperateEventService.java new file mode 100644 index 00000000..9c914a35 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsAnnealOperateEventService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsAnnealOperateEvent; +import com.klp.domain.vo.WmsAnnealOperateEventVo; +import com.klp.domain.bo.WmsAnnealOperateEventBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 退火操作事件Service接口 + * + * @author klp + * @date 2026-04-16 + */ +public interface IWmsAnnealOperateEventService { + + /** + * 查询退火操作事件 + */ + WmsAnnealOperateEventVo queryById(Long eventId); + + /** + * 查询退火操作事件列表 + */ + TableDataInfo queryPageList(WmsAnnealOperateEventBo bo, PageQuery pageQuery); + + /** + * 查询退火操作事件列表 + */ + List queryList(WmsAnnealOperateEventBo bo); + + /** + * 新增退火操作事件 + */ + Boolean insertByBo(WmsAnnealOperateEventBo bo); + + /** + * 修改退火操作事件 + */ + Boolean updateByBo(WmsAnnealOperateEventBo bo); + + /** + * 校验并批量删除退火操作事件信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsAnnealOperateEventServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsAnnealOperateEventServiceImpl.java new file mode 100644 index 00000000..92aad9a9 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsAnnealOperateEventServiceImpl.java @@ -0,0 +1,112 @@ +package com.klp.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.domain.bo.WmsAnnealOperateEventBo; +import com.klp.domain.vo.WmsAnnealOperateEventVo; +import com.klp.domain.WmsAnnealOperateEvent; +import com.klp.mapper.WmsAnnealOperateEventMapper; +import com.klp.service.IWmsAnnealOperateEventService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 退火操作事件Service业务层处理 + * + * @author klp + * @date 2026-04-16 + */ +@RequiredArgsConstructor +@Service +public class WmsAnnealOperateEventServiceImpl implements IWmsAnnealOperateEventService { + + private final WmsAnnealOperateEventMapper baseMapper; + + /** + * 查询退火操作事件 + */ + @Override + public WmsAnnealOperateEventVo queryById(Long eventId){ + return baseMapper.selectVoById(eventId); + } + + /** + * 查询退火操作事件列表 + */ + @Override + public TableDataInfo queryPageList(WmsAnnealOperateEventBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询退火操作事件列表 + */ + @Override + public List queryList(WmsAnnealOperateEventBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsAnnealOperateEventBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getAnnealFurnaceId() != null, WmsAnnealOperateEvent::getAnnealFurnaceId, bo.getAnnealFurnaceId()); + lqw.eq(StringUtils.isNotBlank(bo.getOperateType()), WmsAnnealOperateEvent::getOperateType, bo.getOperateType()); + lqw.eq(StringUtils.isNotBlank(bo.getOperateContent()), WmsAnnealOperateEvent::getOperateContent, bo.getOperateContent()); + lqw.eq(bo.getCoilId() != null, WmsAnnealOperateEvent::getCoilId, bo.getCoilId()); + return lqw; + } + + /** + * 新增退火操作事件 + */ + @Override + public Boolean insertByBo(WmsAnnealOperateEventBo bo) { + WmsAnnealOperateEvent add = BeanUtil.toBean(bo, WmsAnnealOperateEvent.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setEventId(add.getEventId()); + } + return flag; + } + + /** + * 修改退火操作事件 + */ + @Override + public Boolean updateByBo(WmsAnnealOperateEventBo bo) { + WmsAnnealOperateEvent update = BeanUtil.toBean(bo, WmsAnnealOperateEvent.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsAnnealOperateEvent entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除退火操作事件 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsAnnealOperateEventMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsAnnealOperateEventMapper.xml new file mode 100644 index 00000000..1940ee3a --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsAnnealOperateEventMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + +