diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaFileOperationRecordController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaFileOperationRecordController.java new file mode 100644 index 0000000..eb501e8 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaFileOperationRecordController.java @@ -0,0 +1,101 @@ +package com.ruoyi.oa.controller; + +import java.util.List; +import java.util.Arrays; +import java.util.concurrent.TimeUnit; + +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.ruoyi.common.annotation.RepeatSubmit; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import com.ruoyi.common.core.validate.QueryGroup; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.oa.domain.vo.OaFileOperationRecordVo; +import com.ruoyi.oa.domain.bo.OaFileOperationRecordBo; +import com.ruoyi.oa.service.IOaFileOperationRecordService; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * OA文件操作记录 + * + * @author Joshi + * @date 2025-12-03 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/oa/fileOperationRecord") +public class OaFileOperationRecordController extends BaseController { + + private final IOaFileOperationRecordService iOaFileOperationRecordService; + + /** + * 查询OA文件操作记录列表 + */ + @GetMapping("/list") + public TableDataInfo list(OaFileOperationRecordBo bo, PageQuery pageQuery) { + return iOaFileOperationRecordService.queryPageList(bo, pageQuery); + } + + /** + * 导出OA文件操作记录列表 + */ + @Log(title = "OA文件操作记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(OaFileOperationRecordBo bo, HttpServletResponse response) { + List list = iOaFileOperationRecordService.queryList(bo); + ExcelUtil.exportExcel(list, "OA文件操作记录", OaFileOperationRecordVo.class, response); + } + + /** + * 获取OA文件操作记录详细信息 + * + * @param recordId 主键 + */ + @GetMapping("/{recordId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long recordId) { + return R.ok(iOaFileOperationRecordService.queryById(recordId)); + } + + /** + * 新增OA文件操作记录 + */ + @Log(title = "OA文件操作记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody OaFileOperationRecordBo bo) { + return toAjax(iOaFileOperationRecordService.insertByBo(bo)); + } + + /** + * 修改OA文件操作记录 + */ + @Log(title = "OA文件操作记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody OaFileOperationRecordBo bo) { + return toAjax(iOaFileOperationRecordService.updateByBo(bo)); + } + + /** + * 删除OA文件操作记录 + * + * @param recordIds 主键串 + */ + @Log(title = "OA文件操作记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{recordIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] recordIds) { + return toAjax(iOaFileOperationRecordService.deleteWithValidByIds(Arrays.asList(recordIds), true)); + } +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaFileOperationRecord.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaFileOperationRecord.java new file mode 100644 index 0000000..d384d34 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaFileOperationRecord.java @@ -0,0 +1,56 @@ +package com.ruoyi.oa.domain; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; + +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * OA文件操作记录对象 oa_file_operation_record + * + * @author Joshi + * @date 2025-12-03 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("oa_file_operation_record") +public class OaFileOperationRecord extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键ID + */ + @TableId(value = "record_id") + private Long recordId; + /** + * 文件ID(关联文件表主键) + */ + private String fileId; + /** + * 文件名 + */ + private String fileName; + /** + * 操作人姓名 + */ + private String operatorName; + /** + * 操作类型:1-上传 2-删除 + */ + private Long type; + /** + * 备注 + */ + private String remark; + /** + * 是否删除(0-未删除 1-已删除) + */ + @TableLogic + private Long delFlag; + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaFileOperationRecordBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaFileOperationRecordBo.java new file mode 100644 index 0000000..e793ec4 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaFileOperationRecordBo.java @@ -0,0 +1,55 @@ +package com.ruoyi.oa.domain.bo; + +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.util.Date; + +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * OA文件操作记录业务对象 oa_file_operation_record + * + * @author Joshi + * @date 2025-12-03 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class OaFileOperationRecordBo extends BaseEntity { + + /** + * 主键ID + */ + private Long recordId; + + /** + * 文件ID(关联文件表主键) + */ + private String fileId; + + /** + * 文件名 + */ + private String fileName; + + /** + * 操作人姓名 + */ + private String operatorName; + + /** + * 操作类型:1-上传 2-删除 + */ + private Long type; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaFileOperationRecordVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaFileOperationRecordVo.java new file mode 100644 index 0000000..57b2815 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaFileOperationRecordVo.java @@ -0,0 +1,62 @@ +package com.ruoyi.oa.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.ruoyi.common.annotation.ExcelDictFormat; +import com.ruoyi.common.convert.ExcelDictConvert; +import lombok.Data; +import java.util.Date; + + + +/** + * OA文件操作记录视图对象 oa_file_operation_record + * + * @author Joshi + * @date 2025-12-03 + */ +@Data +@ExcelIgnoreUnannotated +public class OaFileOperationRecordVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long recordId; + + /** + * 文件ID(关联文件表主键) + */ + @ExcelProperty(value = "文件ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "关=联文件表主键") + private String fileId; + + /** + * 文件名 + */ + @ExcelProperty(value = "文件名") + private String fileName; + + /** + * 操作人姓名 + */ + @ExcelProperty(value = "操作人姓名") + private String operatorName; + + /** + * 操作类型:1-上传 2-删除 + */ + @ExcelProperty(value = "操作类型:1-上传 2-删除") + private Long type; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaFileOperationRecordMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaFileOperationRecordMapper.java new file mode 100644 index 0000000..acb4b85 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaFileOperationRecordMapper.java @@ -0,0 +1,15 @@ +package com.ruoyi.oa.mapper; + +import com.ruoyi.oa.domain.OaFileOperationRecord; +import com.ruoyi.oa.domain.vo.OaFileOperationRecordVo; +import com.ruoyi.common.core.mapper.BaseMapperPlus; + +/** + * OA文件操作记录Mapper接口 + * + * @author Joshi + * @date 2025-12-03 + */ +public interface OaFileOperationRecordMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaFileOperationRecordService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaFileOperationRecordService.java new file mode 100644 index 0000000..50d6871 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaFileOperationRecordService.java @@ -0,0 +1,49 @@ +package com.ruoyi.oa.service; + +import com.ruoyi.oa.domain.OaFileOperationRecord; +import com.ruoyi.oa.domain.vo.OaFileOperationRecordVo; +import com.ruoyi.oa.domain.bo.OaFileOperationRecordBo; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * OA文件操作记录Service接口 + * + * @author Joshi + * @date 2025-12-03 + */ +public interface IOaFileOperationRecordService { + + /** + * 查询OA文件操作记录 + */ + OaFileOperationRecordVo queryById(Long recordId); + + /** + * 查询OA文件操作记录列表 + */ + TableDataInfo queryPageList(OaFileOperationRecordBo bo, PageQuery pageQuery); + + /** + * 查询OA文件操作记录列表 + */ + List queryList(OaFileOperationRecordBo bo); + + /** + * 新增OA文件操作记录 + */ + Boolean insertByBo(OaFileOperationRecordBo bo); + + /** + * 修改OA文件操作记录 + */ + Boolean updateByBo(OaFileOperationRecordBo bo); + + /** + * 校验并批量删除OA文件操作记录信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaFileOperationRecordServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaFileOperationRecordServiceImpl.java new file mode 100644 index 0000000..0764cc3 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaFileOperationRecordServiceImpl.java @@ -0,0 +1,115 @@ +package com.ruoyi.oa.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.ruoyi.common.helper.LoginHelper; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.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 lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.ruoyi.oa.domain.bo.OaFileOperationRecordBo; +import com.ruoyi.oa.domain.vo.OaFileOperationRecordVo; +import com.ruoyi.oa.domain.OaFileOperationRecord; +import com.ruoyi.oa.mapper.OaFileOperationRecordMapper; +import com.ruoyi.oa.service.IOaFileOperationRecordService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * OA文件操作记录Service业务层处理 + * + * @author Joshi + * @date 2025-12-03 + */ +@RequiredArgsConstructor +@Service +public class OaFileOperationRecordServiceImpl implements IOaFileOperationRecordService { + + private final OaFileOperationRecordMapper baseMapper; + + /** + * 查询OA文件操作记录 + */ + @Override + public OaFileOperationRecordVo queryById(Long recordId){ + return baseMapper.selectVoById(recordId); + } + + /** + * 查询OA文件操作记录列表 + */ + @Override + public TableDataInfo queryPageList(OaFileOperationRecordBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询OA文件操作记录列表 + */ + @Override + public List queryList(OaFileOperationRecordBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(OaFileOperationRecordBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getFileId()), OaFileOperationRecord::getFileId, bo.getFileId()); + lqw.like(StringUtils.isNotBlank(bo.getFileName()), OaFileOperationRecord::getFileName, bo.getFileName()); + lqw.like(StringUtils.isNotBlank(bo.getOperatorName()), OaFileOperationRecord::getOperatorName, bo.getOperatorName()); + lqw.eq(bo.getType() != null, OaFileOperationRecord::getType, bo.getType()); + lqw.orderByDesc(OaFileOperationRecord::getCreateTime); + return lqw; + } + + /** + * 新增OA文件操作记录 + */ + @Override + public Boolean insertByBo(OaFileOperationRecordBo bo) { + OaFileOperationRecord add = BeanUtil.toBean(bo, OaFileOperationRecord.class); + validEntityBeforeSave(add); + add.setOperatorName(LoginHelper.getNickName()); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setRecordId(add.getRecordId()); + } + return flag; + } + + /** + * 修改OA文件操作记录 + */ + @Override + public Boolean updateByBo(OaFileOperationRecordBo bo) { + OaFileOperationRecord update = BeanUtil.toBean(bo, OaFileOperationRecord.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(OaFileOperationRecord entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除OA文件操作记录 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaFileOperationRecordMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaFileOperationRecordMapper.xml new file mode 100644 index 0000000..697648a --- /dev/null +++ b/ruoyi-oa/src/main/resources/mapper/oa/OaFileOperationRecordMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + +