`fix`

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/controller/TblBagController.java

@@ -0,0 +1,83 @@
+package org.dromara.system.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.system.domain.vo.TblBagVo;
+import org.dromara.system.domain.bo.TblBagBo;
+import org.dromara.system.service.ITblBagService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】
+ *
+ * @author Lion Li
+ * @date 2025-09-06
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/bag")
+public class TblBagController extends BaseController {
+
+    private final ITblBagService tblBagService;
+
+
+    @GetMapping("/list")
+    public TableDataInfo<TblBagVo> list(TblBagBo bo, PageQuery pageQuery) {
+        return tblBagService.queryPageList(bo, pageQuery);
+    }
+
+
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TblBagBo bo, HttpServletResponse response) {
+        List<TblBagVo> list = tblBagService.queryList(bo);
+        ExcelUtil.exportExcel(list, "【请填写功能名称】", TblBagVo.class, response);
+    }
+
+
+    @GetMapping("/{id}")
+    public R<TblBagVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(tblBagService.queryById(id));
+    }
+
+
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TblBagBo bo) {
+        return toAjax(tblBagService.insertByBo(bo));
+    }
+
+
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TblBagBo bo) {
+        return toAjax(tblBagService.updateByBo(bo));
+    }
+
+
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(tblBagService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/TblBag.java

@@ -0,0 +1,63 @@
+package org.dromara.system.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 【请填写功能名称】对象 tbl_bag
+ *
+ * @author Lion Li
+ * @date 2025-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("tbl_bag")
+public class TblBag extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 快递柜编号
+     */
+    private Long deviceId;
+
+    /**
+     * 寄取  1：下行派件入库2：下行派件出库3：上行揽件入库4：上行派件出库
+     */
+    private Long scType;
+
+    /**
+     * 寄取时间
+     */
+    private Date scTime;
+
+    /**
+     * 快递公司
+     */
+    private String cpCode;
+
+    /**
+     * 运单号
+     */
+    private String waybillNo;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/bo/TblBagBo.java

@@ -0,0 +1,68 @@
+package org.dromara.system.domain.bo;
+
+import org.dromara.system.domain.TblBag;
+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;
+
+/**
+ * 【请填写功能名称】业务对象 tbl_bag
+ *
+ * @author Lion Li
+ * @date 2025-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = TblBag.class, reverseConvertGenerate = false)
+public class TblBagBo extends BaseEntity {
+
+    /**
+     * 编号
+     */
+//    @NotNull(message = "编号不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 快递柜编号
+     */
+//    @NotNull(message = "快递柜编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long deviceId;
+
+    /**
+     * 寄取  1：下行派件入库2：下行派件出库3：上行揽件入库4：上行派件出库
+     */
+//    @NotNull(message = "寄取  1：下行派件入库 2：下行派件出库3：上行揽件入库4：上行派件出库不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long scType;
+
+    /**
+     * 寄取时间
+     */
+//    @NotNull(message = "寄取时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date scTime;
+
+    /**
+     * 快递公司
+     */
+//    @NotBlank(message = "快递公司不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String cpCode;
+
+    /**
+     * 运单号
+     */
+//    @NotBlank(message = "运单号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String waybillNo;
+
+    /**
+     * 备注
+     */
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/vo/TblBagVo.java

@@ -0,0 +1,76 @@
+package org.dromara.system.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.system.domain.TblBag;
+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 java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 【请填写功能名称】视图对象 tbl_bag
+ *
+ * @author Lion Li
+ * @date 2025-09-06
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = TblBag.class)
+public class TblBagVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @ExcelProperty(value = "编号")
+    private Long id;
+
+    /**
+     * 快递柜编号
+     */
+    @ExcelProperty(value = "快递柜编号")
+    private Long deviceId;
+
+    /**
+     * 寄取  1：下行派件入库2：下行派件出库3：上行揽件入库4：上行派件出库
+     */
+    @ExcelProperty(value = "寄取  1：下行派件入库2：下行派件出库3：上行揽件入库4：上行派件出库")
+    private Long scType;
+
+    /**
+     * 寄取时间
+     */
+    @ExcelProperty(value = "寄取时间")
+    private Date scTime;
+
+    /**
+     * 快递公司
+     */
+    @ExcelProperty(value = "快递公司")
+    private String cpCode;
+
+    /**
+     * 运单号
+     */
+    @ExcelProperty(value = "运单号")
+    private String waybillNo;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/mapper/TblBagMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.system.mapper;
+
+import org.dromara.system.domain.TblBag;
+import org.dromara.system.domain.vo.TblBagVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-09-06
+ */
+public interface TblBagMapper extends BaseMapperPlus<TblBag, TblBagVo> {
+
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/service/ITblBagService.java

@@ -0,0 +1,49 @@
+package org.dromara.system.service;
+
+import org.dromara.system.domain.TblBag;
+import org.dromara.system.domain.vo.TblBagVo;
+import org.dromara.system.domain.bo.TblBagBo;
+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 Lion Li
+ * @date 2025-09-06
+ */
+public interface ITblBagService {
+
+    /**
+     * 查询【请填写功能名称】
+     */
+    TblBagVo queryById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    TableDataInfo<TblBagVo> queryPageList(TblBagBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    List<TblBagVo> queryList(TblBagBo bo);
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    Boolean insertByBo(TblBagBo bo);
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    Boolean updateByBo(TblBagBo bo);
+
+    /**
+     * 校验并批量删除【请填写功能名称】信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/service/impl/TblBagServiceImpl.java

@@ -0,0 +1,113 @@
+package org.dromara.system.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.system.domain.bo.TblBagBo;
+import org.dromara.system.domain.vo.TblBagVo;
+import org.dromara.system.domain.TblBag;
+import org.dromara.system.mapper.TblBagMapper;
+import org.dromara.system.service.ITblBagService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 【请填写功能名称】Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-09-06
+ */
+@RequiredArgsConstructor
+@Service
+public class TblBagServiceImpl implements ITblBagService {
+
+    private final TblBagMapper baseMapper;
+
+    /**
+     * 查询【请填写功能名称】
+     */
+    @Override
+    public TblBagVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @Override
+    public TableDataInfo<TblBagVo> queryPageList(TblBagBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<TblBag> lqw = buildQueryWrapper(bo);
+        Page<TblBagVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @Override
+    public List<TblBagVo> queryList(TblBagBo bo) {
+        LambdaQueryWrapper<TblBag> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<TblBag> buildQueryWrapper(TblBagBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<TblBag> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getDeviceId() != null, TblBag::getDeviceId, bo.getDeviceId());
+        lqw.eq(bo.getScType() != null, TblBag::getScType, bo.getScType());
+        lqw.eq(bo.getScTime() != null, TblBag::getScTime, bo.getScTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getCpCode()), TblBag::getCpCode, bo.getCpCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getWaybillNo()), TblBag::getWaybillNo, bo.getWaybillNo());
+        return lqw;
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @Override
+    public Boolean insertByBo(TblBagBo bo) {
+        TblBag add = MapstructUtils.convert(bo, TblBag.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @Override
+    public Boolean updateByBo(TblBagBo bo) {
+        TblBag update = MapstructUtils.convert(bo, TblBag.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(TblBag entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除【请填写功能名称】
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-khy/src/main/resources/mapper/system/TblBagMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.TblBagMapper">
+
+</mapper>