From 3e2519fb7ce339552b0673962d4c62e99175ed8c Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Wed, 10 Sep 2025 14:33:28 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E7=A0=81=E7=94=9F=E6=88=90=E8=AE=B0=E5=BD=95=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增二维码生成记录相关的实体类、Mapper、Service、Controller等 - 实现二维码生成记录的增删查改功能- 添加二维码生成记录的导出功能 - 新增相关接口和页面访问权限 --- klp-admin/src/main/resources/application.yml | 1 + .../WmsGenerateRecordController.java | 99 +++++++++++++++ .../com/klp/domain/WmsGenerateRecord.java | 57 +++++++++ .../klp/domain/bo/WmsGenerateRecordBo.java | 56 +++++++++ .../klp/domain/vo/WmsGenerateRecordVo.java | 69 +++++++++++ .../klp/mapper/WmsGenerateRecordMapper.java | 15 +++ .../service/IWmsGenerateRecordService.java | 49 ++++++++ .../impl/WmsGenerateRecordServiceImpl.java | 113 ++++++++++++++++++ .../mapper/klp/WmsGenerateRecordMapper.xml | 23 ++++ 9 files changed, 482 insertions(+) create mode 100644 klp-wms/src/main/java/com/klp/controller/WmsGenerateRecordController.java create mode 100644 klp-wms/src/main/java/com/klp/domain/WmsGenerateRecord.java create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsGenerateRecordBo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsGenerateRecordVo.java create mode 100644 klp-wms/src/main/java/com/klp/mapper/WmsGenerateRecordMapper.java create mode 100644 klp-wms/src/main/java/com/klp/service/IWmsGenerateRecordService.java create mode 100644 klp-wms/src/main/java/com/klp/service/impl/WmsGenerateRecordServiceImpl.java create mode 100644 klp-wms/src/main/resources/mapper/klp/WmsGenerateRecordMapper.xml diff --git a/klp-admin/src/main/resources/application.yml b/klp-admin/src/main/resources/application.yml index dc02f29a..767f6efc 100644 --- a/klp-admin/src/main/resources/application.yml +++ b/klp-admin/src/main/resources/application.yml @@ -157,6 +157,7 @@ security: - /websocket/direct/** # 测试接口 - /test/** + - /klp/generateRecord # MyBatisPlus配置 diff --git a/klp-wms/src/main/java/com/klp/controller/WmsGenerateRecordController.java b/klp-wms/src/main/java/com/klp/controller/WmsGenerateRecordController.java new file mode 100644 index 00000000..07d94687 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsGenerateRecordController.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.WmsGenerateRecordVo; +import com.klp.domain.bo.WmsGenerateRecordBo; +import com.klp.service.IWmsGenerateRecordService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 二维码生成记录 + * + * @author klp + * @date 2025-09-10 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/klp/generateRecord") +public class WmsGenerateRecordController extends BaseController { + + private final IWmsGenerateRecordService iWmsGenerateRecordService; + + /** + * 查询二维码生成记录列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsGenerateRecordBo bo, PageQuery pageQuery) { + return iWmsGenerateRecordService.queryPageList(bo, pageQuery); + } + + /** + * 导出二维码生成记录列表 + */ + @Log(title = "二维码生成记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsGenerateRecordBo bo, HttpServletResponse response) { + List list = iWmsGenerateRecordService.queryList(bo); + ExcelUtil.exportExcel(list, "二维码生成记录", WmsGenerateRecordVo.class, response); + } + + /** + * 获取二维码生成记录详细信息 + * + * @param recordId 主键 + */ + @GetMapping("/{recordId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long recordId) { + return R.ok(iWmsGenerateRecordService.queryById(recordId)); + } + + /** + * 新增二维码生成记录 + */ + @Log(title = "二维码生成记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsGenerateRecordBo bo) { + return toAjax(iWmsGenerateRecordService.insertByBo(bo)); + } + + /** + * 修改二维码生成记录 + */ + @Log(title = "二维码生成记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsGenerateRecordBo bo) { + return toAjax(iWmsGenerateRecordService.updateByBo(bo)); + } + + /** + * 删除二维码生成记录 + * + * @param recordIds 主键串 + */ + @Log(title = "二维码生成记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{recordIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] recordIds) { + return toAjax(iWmsGenerateRecordService.deleteWithValidByIds(Arrays.asList(recordIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsGenerateRecord.java b/klp-wms/src/main/java/com/klp/domain/WmsGenerateRecord.java new file mode 100644 index 00000000..552dadae --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsGenerateRecord.java @@ -0,0 +1,57 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 二维码生成记录对象 wms_generate_record + * + * @author klp + * @date 2025-09-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_generate_record") +public class WmsGenerateRecord extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键 + */ + @TableId(value = "record_id") + private Long recordId; + /** + * 二维码类型（字典，默认为0） + */ + private Long qrcodeType; + /** + * 二维码内容（JSON格式） + */ + private String content; + /** + * 是否启用（0：启用，1：禁用） + */ + private Long isEnabled; + /** + * 编号 + */ + private String serialNumber; + /** + * 二维码尺寸（像素） + */ + private Long size; + /** + * 删除标志（0=正常，1=已删除） + */ + @TableLogic + private Integer delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsGenerateRecordBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsGenerateRecordBo.java new file mode 100644 index 00000000..aac5ad84 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsGenerateRecordBo.java @@ -0,0 +1,56 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + + +/** + * 二维码生成记录业务对象 wms_generate_record + * + * @author klp + * @date 2025-09-10 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsGenerateRecordBo extends BaseEntity { + + /** + * 主键 + */ + private Long recordId; + + /** + * 二维码类型（字典，默认为0） + */ + private Long qrcodeType; + + /** + * 二维码内容（JSON格式） + */ + private String content; + + /** + * 是否启用（0：启用，1：禁用） + */ + private Long isEnabled; + + /** + * 编号 + */ + private String serialNumber; + + /** + * 二维码尺寸（像素） + */ + private Long size; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsGenerateRecordVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsGenerateRecordVo.java new file mode 100644 index 00000000..dda54ab6 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsGenerateRecordVo.java @@ -0,0 +1,69 @@ +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_generate_record + * + * @author klp + * @date 2025-09-10 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsGenerateRecordVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long recordId; + + /** + * 二维码类型（字典，默认为0） + */ + @ExcelProperty(value = "二维码类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "字=典，默认为0") + private Long qrcodeType; + + /** + * 二维码内容（JSON格式） + */ + @ExcelProperty(value = "二维码内容", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "J=SON格式") + private String content; + + /** + * 是否启用（0：启用，1：禁用） + */ + @ExcelProperty(value = "是否启用", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=：启用，1：禁用") + private Long isEnabled; + + /** + * 编号 + */ + @ExcelProperty(value = "编号") + private String serialNumber; + + /** + * 二维码尺寸（像素） + */ + @ExcelProperty(value = "二维码尺寸", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "像=素") + private Long size; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsGenerateRecordMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsGenerateRecordMapper.java new file mode 100644 index 00000000..4d08d953 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsGenerateRecordMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsGenerateRecord; +import com.klp.domain.vo.WmsGenerateRecordVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 二维码生成记录Mapper接口 + * + * @author klp + * @date 2025-09-10 + */ +public interface WmsGenerateRecordMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsGenerateRecordService.java b/klp-wms/src/main/java/com/klp/service/IWmsGenerateRecordService.java new file mode 100644 index 00000000..7e3b7e80 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsGenerateRecordService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsGenerateRecord; +import com.klp.domain.vo.WmsGenerateRecordVo; +import com.klp.domain.bo.WmsGenerateRecordBo; +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 2025-09-10 + */ +public interface IWmsGenerateRecordService { + + /** + * 查询二维码生成记录 + */ + WmsGenerateRecordVo queryById(Long recordId); + + /** + * 查询二维码生成记录列表 + */ + TableDataInfo queryPageList(WmsGenerateRecordBo bo, PageQuery pageQuery); + + /** + * 查询二维码生成记录列表 + */ + List queryList(WmsGenerateRecordBo bo); + + /** + * 新增二维码生成记录 + */ + Boolean insertByBo(WmsGenerateRecordBo bo); + + /** + * 修改二维码生成记录 + */ + Boolean updateByBo(WmsGenerateRecordBo bo); + + /** + * 校验并批量删除二维码生成记录信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsGenerateRecordServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsGenerateRecordServiceImpl.java new file mode 100644 index 00000000..0ef1958f --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsGenerateRecordServiceImpl.java @@ -0,0 +1,113 @@ +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.WmsGenerateRecordBo; +import com.klp.domain.vo.WmsGenerateRecordVo; +import com.klp.domain.WmsGenerateRecord; +import com.klp.mapper.WmsGenerateRecordMapper; +import com.klp.service.IWmsGenerateRecordService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 二维码生成记录Service业务层处理 + * + * @author klp + * @date 2025-09-10 + */ +@RequiredArgsConstructor +@Service +public class WmsGenerateRecordServiceImpl implements IWmsGenerateRecordService { + + private final WmsGenerateRecordMapper baseMapper; + + /** + * 查询二维码生成记录 + */ + @Override + public WmsGenerateRecordVo queryById(Long recordId){ + return baseMapper.selectVoById(recordId); + } + + /** + * 查询二维码生成记录列表 + */ + @Override + public TableDataInfo queryPageList(WmsGenerateRecordBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询二维码生成记录列表 + */ + @Override + public List queryList(WmsGenerateRecordBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsGenerateRecordBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getQrcodeType() != null, WmsGenerateRecord::getQrcodeType, bo.getQrcodeType()); + lqw.eq(StringUtils.isNotBlank(bo.getContent()), WmsGenerateRecord::getContent, bo.getContent()); + lqw.eq(bo.getIsEnabled() != null, WmsGenerateRecord::getIsEnabled, bo.getIsEnabled()); + lqw.eq(StringUtils.isNotBlank(bo.getSerialNumber()), WmsGenerateRecord::getSerialNumber, bo.getSerialNumber()); + lqw.eq(bo.getSize() != null, WmsGenerateRecord::getSize, bo.getSize()); + return lqw; + } + + /** + * 新增二维码生成记录 + */ + @Override + public Boolean insertByBo(WmsGenerateRecordBo bo) { + WmsGenerateRecord add = BeanUtil.toBean(bo, WmsGenerateRecord.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setRecordId(add.getRecordId()); + } + return flag; + } + + /** + * 修改二维码生成记录 + */ + @Override + public Boolean updateByBo(WmsGenerateRecordBo bo) { + WmsGenerateRecord update = BeanUtil.toBean(bo, WmsGenerateRecord.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsGenerateRecord 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/WmsGenerateRecordMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsGenerateRecordMapper.xml new file mode 100644 index 00000000..2a500b1b --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsGenerateRecordMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + +