From b5c46276fd9df0dfcbc94a4e839f5a44a91f945c Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Wed, 2 Jul 2025 16:10:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E5=93=81=E5=A4=87=E4=BB=B6-=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SparePartsInfoController.java | 105 ++++++++++++++ .../dromara/demo/domain/SparePartsInfo.java | 77 ++++++++++ .../demo/domain/bo/SparePartsInfoBo.java | 77 ++++++++++ .../demo/domain/vo/SparePartsInfoVo.java | 85 +++++++++++ .../demo/mapper/SparePartsInfoMapper.java | 15 ++ .../demo/service/ISparePartsInfoService.java | 68 +++++++++ .../impl/SparePartsInfoServiceImpl.java | 135 ++++++++++++++++++ 7 files changed, 562 insertions(+) create mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SparePartsInfoController.java create mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/SparePartsInfo.java create mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/SparePartsInfoBo.java create mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/SparePartsInfoVo.java create mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/SparePartsInfoMapper.java create mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ISparePartsInfoService.java create mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/SparePartsInfoServiceImpl.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SparePartsInfoController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SparePartsInfoController.java new file mode 100644 index 0000000..8c1fbe2 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SparePartsInfoController.java @@ -0,0 +1,105 @@ +package org.dromara.demo.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.demo.domain.vo.SparePartsInfoVo; +import org.dromara.demo.domain.bo.SparePartsInfoBo; +import org.dromara.demo.service.ISparePartsInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 备品备件列 + * + * @author GJH + * @date 2025-07-02 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/air/partsInfo") +public class SparePartsInfoController extends BaseController { + + private final ISparePartsInfoService sparePartsInfoService; + + /** + * 查询备品备件列列表 + */ + //@SaCheckPermission("air:partsInfo:list") + @GetMapping("/list") + public TableDataInfo list(SparePartsInfoBo bo, PageQuery pageQuery) { + return sparePartsInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出备品备件列列表 + */ + //@SaCheckPermission("air:partsInfo:export") + @Log(title = "备品备件列", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(SparePartsInfoBo bo, HttpServletResponse response) { + List list = sparePartsInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "备品备件列", SparePartsInfoVo.class, response); + } + + /** + * 获取备品备件列详细信息 + * + * @param id 主键 + */ + //@SaCheckPermission("air:partsInfo:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable String id) { + return R.ok(sparePartsInfoService.queryById(id)); + } + + /** + * 新增备品备件列 + */ + //@SaCheckPermission("air:partsInfo:add") + @Log(title = "备品备件列", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody SparePartsInfoBo bo) { + return toAjax(sparePartsInfoService.insertByBo(bo)); + } + + /** + * 修改备品备件列 + */ + //@SaCheckPermission("air:partsInfo:edit") + @Log(title = "备品备件列", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody SparePartsInfoBo bo) { + return toAjax(sparePartsInfoService.updateByBo(bo)); + } + + /** + * 删除备品备件列 + * + * @param ids 主键串 + */ + //@SaCheckPermission("air:partsInfo:remove") + @Log(title = "备品备件列", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] ids) { + return toAjax(sparePartsInfoService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/SparePartsInfo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/SparePartsInfo.java new file mode 100644 index 0000000..e5f993f --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/SparePartsInfo.java @@ -0,0 +1,77 @@ +package org.dromara.demo.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serial; + +/** + * 备品备件列对象 spare_parts_info + * + * @author GJH + * @date 2025-07-02 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("spare_parts_info") +public class SparePartsInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private String id; + + /** + * 品名 + */ + private String name; + + /** + * 类型 + */ + private String type; + + /** + * 型号 + */ + private String model; + + /** + * 数量 + */ + private Long amount; + + /** + * 入库日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date indate; + + /** + * 运维公司 + */ + private String ioCompany; + + /** + * 监理公司 + */ + private String monitorCompany; + + /** + * 删除标志 + */ + @TableLogic + private Long delFlag; + + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/SparePartsInfoBo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/SparePartsInfoBo.java new file mode 100644 index 0000000..321bb55 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/SparePartsInfoBo.java @@ -0,0 +1,77 @@ +package org.dromara.demo.domain.bo; + +import org.dromara.demo.domain.SparePartsInfo; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +/** + * 备品备件列业务对象 spare_parts_info + * + * @author GJH + * @date 2025-07-02 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SparePartsInfo.class, reverseConvertGenerate = false) +public class SparePartsInfoBo extends BaseEntity { + + /** + * 主键ID + */ + //@NotBlank(message = "主键ID不能为空", groups = { EditGroup.class }) + private String id; + + /** + * 品名 + */ + //@NotBlank(message = "品名不能为空", groups = { AddGroup.class, EditGroup.class }) + private String name; + + /** + * 类型 + */ + //@NotBlank(message = "类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private String type; + + /** + * 型号 + */ + //@NotBlank(message = "型号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String model; + + /** + * 数量 + */ + //@NotNull(message = "数量不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long amount; + + /** + * 入库日期 + */ + //@NotNull(message = "入库日期不能为空", groups = { AddGroup.class, EditGroup.class }) + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date indate; + + /** + * 运维公司 + */ + //@NotBlank(message = "运维公司不能为空", groups = { AddGroup.class, EditGroup.class }) + private String ioCompany; + + /** + * 监理公司 + */ + //@NotBlank(message = "监理公司不能为空", groups = { AddGroup.class, EditGroup.class }) + private String monitorCompany; + + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/SparePartsInfoVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/SparePartsInfoVo.java new file mode 100644 index 0000000..a3f8b71 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/SparePartsInfoVo.java @@ -0,0 +1,85 @@ +package org.dromara.demo.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.demo.domain.SparePartsInfo; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 备品备件列视图对象 spare_parts_info + * + * @author GJH + * @date 2025-07-02 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SparePartsInfo.class) +public class SparePartsInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private String id; + + /** + * 品名 + */ + @ExcelProperty(value = "品名") + private String name; + + /** + * 类型 + */ + @ExcelProperty(value = "类型") + private String type; + + /** + * 型号 + */ + @ExcelProperty(value = "型号") + private String model; + + /** + * 数量 + */ + @ExcelProperty(value = "数量") + private Long amount; + + /** + * 入库日期 + */ + @ExcelProperty(value = "入库日期") + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date indate; + + /** + * 运维公司 + */ + @ExcelProperty(value = "运维公司") + private String ioCompany; + + /** + * 监理公司 + */ + @ExcelProperty(value = "监理公司") + private String monitorCompany; + + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/SparePartsInfoMapper.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/SparePartsInfoMapper.java new file mode 100644 index 0000000..3ed87d9 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/SparePartsInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.demo.mapper; + +import org.dromara.demo.domain.SparePartsInfo; +import org.dromara.demo.domain.vo.SparePartsInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 备品备件列Mapper接口 + * + * @author GJH + * @date 2025-07-02 + */ +public interface SparePartsInfoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ISparePartsInfoService.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ISparePartsInfoService.java new file mode 100644 index 0000000..55114c3 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ISparePartsInfoService.java @@ -0,0 +1,68 @@ +package org.dromara.demo.service; + +import org.dromara.demo.domain.vo.SparePartsInfoVo; +import org.dromara.demo.domain.bo.SparePartsInfoBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 备品备件列Service接口 + * + * @author GJH + * @date 2025-07-02 + */ +public interface ISparePartsInfoService { + + /** + * 查询备品备件列 + * + * @param id 主键 + * @return 备品备件列 + */ + SparePartsInfoVo queryById(String id); + + /** + * 分页查询备品备件列列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 备品备件列分页列表 + */ + TableDataInfo queryPageList(SparePartsInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的备品备件列列表 + * + * @param bo 查询条件 + * @return 备品备件列列表 + */ + List queryList(SparePartsInfoBo bo); + + /** + * 新增备品备件列 + * + * @param bo 备品备件列 + * @return 是否新增成功 + */ + Boolean insertByBo(SparePartsInfoBo bo); + + /** + * 修改备品备件列 + * + * @param bo 备品备件列 + * @return 是否修改成功 + */ + Boolean updateByBo(SparePartsInfoBo bo); + + /** + * 校验并批量删除备品备件列信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/SparePartsInfoServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/SparePartsInfoServiceImpl.java new file mode 100644 index 0000000..ce98db7 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/SparePartsInfoServiceImpl.java @@ -0,0 +1,135 @@ +package org.dromara.demo.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.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 lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.demo.domain.bo.SparePartsInfoBo; +import org.dromara.demo.domain.vo.SparePartsInfoVo; +import org.dromara.demo.domain.SparePartsInfo; +import org.dromara.demo.mapper.SparePartsInfoMapper; +import org.dromara.demo.service.ISparePartsInfoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 备品备件列Service业务层处理 + * + * @author GJH + * @date 2025-07-02 + */ +@RequiredArgsConstructor +@Service +public class SparePartsInfoServiceImpl implements ISparePartsInfoService { + + private final SparePartsInfoMapper baseMapper; + + /** + * 查询备品备件列 + * + * @param id 主键 + * @return 备品备件列 + */ + @Override + public SparePartsInfoVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询备品备件列列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 备品备件列分页列表 + */ + @Override + public TableDataInfo queryPageList(SparePartsInfoBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的备品备件列列表 + * + * @param bo 查询条件 + * @return 备品备件列列表 + */ + @Override + public List queryList(SparePartsInfoBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(SparePartsInfoBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getName()), SparePartsInfo::getName, bo.getName()); + lqw.eq(StringUtils.isNotBlank(bo.getType()), SparePartsInfo::getType, bo.getType()); + lqw.eq(StringUtils.isNotBlank(bo.getModel()), SparePartsInfo::getModel, bo.getModel()); + lqw.eq(bo.getAmount() != null, SparePartsInfo::getAmount, bo.getAmount()); + lqw.eq(bo.getIndate() != null, SparePartsInfo::getIndate, bo.getIndate()); + lqw.eq(StringUtils.isNotBlank(bo.getIoCompany()), SparePartsInfo::getIoCompany, bo.getIoCompany()); + lqw.eq(StringUtils.isNotBlank(bo.getMonitorCompany()), SparePartsInfo::getMonitorCompany, bo.getMonitorCompany()); + return lqw; + } + + /** + * 新增备品备件列 + * + * @param bo 备品备件列 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(SparePartsInfoBo bo) { + SparePartsInfo add = MapstructUtils.convert(bo, SparePartsInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改备品备件列 + * + * @param bo 备品备件列 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(SparePartsInfoBo bo) { + SparePartsInfo update = MapstructUtils.convert(bo, SparePartsInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(SparePartsInfo entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除备品备件列信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +}