`fix`

ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/TblArchivesController.java

@@ -0,0 +1,105 @@
+package org.dromara.filemanager.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.filemanager.domain.vo.TblArchivesVo;
+import org.dromara.filemanager.domain.bo.TblArchivesBo;
+import org.dromara.filemanager.service.ITblArchivesService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 电子档案
+ *
+ * @author Lion Li
+ * @date 2024-05-20
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/filemanager/archives")
+public class TblArchivesController extends BaseController {
+
+    private final ITblArchivesService tblArchivesService;
+
+    /**
+     * 查询电子档案列表
+     */
+    @SaCheckPermission("system:archives:list")
+    @GetMapping("/list")
+    public TableDataInfo<TblArchivesVo> list(TblArchivesBo bo, PageQuery pageQuery) {
+        return tblArchivesService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出电子档案列表
+     */
+    @SaCheckPermission("system:archives:export")
+    @Log(title = "电子档案", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TblArchivesBo bo, HttpServletResponse response) {
+        List<TblArchivesVo> list = tblArchivesService.queryList(bo);
+        ExcelUtil.exportExcel(list, "电子档案", TblArchivesVo.class, response);
+    }
+
+    /**
+     * 获取电子档案详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:archives:query")
+    @GetMapping("/{id}")
+    public R<TblArchivesVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(tblArchivesService.queryById(id));
+    }
+
+    /**
+     * 新增电子档案
+     */
+    @SaCheckPermission("system:archives:add")
+    @Log(title = "电子档案", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TblArchivesBo bo) {
+        return toAjax(tblArchivesService.insertByBo(bo));
+    }
+
+    /**
+     * 修改电子档案
+     */
+    @SaCheckPermission("system:archives:edit")
+    @Log(title = "电子档案", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TblArchivesBo bo) {
+        return toAjax(tblArchivesService.updateByBo(bo));
+    }
+
+    /**
+     * 删除电子档案
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:archives:remove")
+    @Log(title = "电子档案", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(tblArchivesService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/TblArchives.java

@@ -0,0 +1,93 @@
+package org.dromara.filemanager.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_archives
+ *
+ * @author Lion Li
+ * @date 2024-05-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("tbl_archives")
+public class TblArchives extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 区域
+     */
+    private String area;
+
+    /**
+     * 丘权号
+     */
+    private String qiuquan;
+
+    /**
+     * 建设单位（或申请单位）
+     */
+    private String buildUnit;
+
+    /**
+     * 地址（公安门牌）
+     */
+    private String addr;
+
+    /**
+     * 小区名称
+     */
+    private String community;
+
+    /**
+     * 成果（建档）日期
+     */
+    private Date achievementDate;
+
+    /**
+     * 保管期限
+     */
+    private Date savePeriod;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 电子档编号
+     */
+    private String ecode;
+
+    /**
+     * 存档位置
+     */
+    private String saveAddr;
+
+    /**
+     * 扩展1
+     */
+    private String ext1;
+
+    /**
+     * 扩展2
+     */
+    private String ext2;
+
+
+}

ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/bo/TblArchivesBo.java

@@ -0,0 +1,104 @@
+package org.dromara.filemanager.domain.bo;
+
+import org.dromara.filemanager.domain.TblArchives;
+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_archives
+ *
+ * @author Lion Li
+ * @date 2024-05-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = TblArchives.class, reverseConvertGenerate = false)
+public class TblArchivesBo extends BaseEntity {
+
+    /**
+     * 编号
+     */
+    @NotNull(message = "编号不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 区域
+     */
+    @NotBlank(message = "区域不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String area;
+
+    /**
+     * 丘权号
+     */
+    @NotBlank(message = "丘权号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String qiuquan;
+
+    /**
+     * 建设单位（或申请单位）
+     */
+    @NotBlank(message = "建设单位（或申请单位）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String buildUnit;
+
+    /**
+     * 地址（公安门牌）
+     */
+    @NotBlank(message = "地址（公安门牌）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String addr;
+
+    /**
+     * 小区名称
+     */
+    @NotBlank(message = "小区名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String community;
+
+    /**
+     * 成果（建档）日期
+     */
+    @NotNull(message = "成果（建档）日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date achievementDate;
+
+    /**
+     * 保管期限
+     */
+    @NotNull(message = "保管期限不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date savePeriod;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+    /**
+     * 电子档编号
+     */
+    @NotBlank(message = "电子档编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String ecode;
+
+    /**
+     * 存档位置
+     */
+    @NotBlank(message = "存档位置不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String saveAddr;
+
+    /**
+     * 扩展1
+     */
+    @NotBlank(message = "扩展1不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String ext1;
+
+    /**
+     * 扩展2
+     */
+    @NotBlank(message = "扩展2不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String ext2;
+
+
+}

ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/vo/TblArchivesVo.java

@@ -0,0 +1,115 @@
+package org.dromara.filemanager.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.filemanager.domain.TblArchives;
+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_archives
+ *
+ * @author Lion Li
+ * @date 2024-05-20
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = TblArchives.class)
+public class TblArchivesVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @ExcelProperty(value = "编号")
+    private Long id;
+
+    /**
+     * 区域
+     */
+    @ExcelProperty(value = "区域")
+    private String area;
+
+    /**
+     * 丘权号
+     */
+    @ExcelProperty(value = "丘权号")
+    private String qiuquan;
+
+    /**
+     * 建设单位（或申请单位）
+     */
+    @ExcelProperty(value = "建设单位", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "或=申请单位")
+    private String buildUnit;
+
+    /**
+     * 地址（公安门牌）
+     */
+    @ExcelProperty(value = "地址", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "公=安门牌")
+    private String addr;
+
+    /**
+     * 小区名称
+     */
+    @ExcelProperty(value = "小区名称")
+    private String community;
+
+    /**
+     * 成果（建档）日期
+     */
+    @ExcelProperty(value = "成果", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "建=档")
+    private Date achievementDate;
+
+    /**
+     * 保管期限
+     */
+    @ExcelProperty(value = "保管期限")
+    private Date savePeriod;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 电子档编号
+     */
+    @ExcelProperty(value = "电子档编号")
+    private String ecode;
+
+    /**
+     * 存档位置
+     */
+    @ExcelProperty(value = "存档位置")
+    private String saveAddr;
+
+    /**
+     * 扩展1
+     */
+    @ExcelProperty(value = "扩展1")
+    private String ext1;
+
+    /**
+     * 扩展2
+     */
+    @ExcelProperty(value = "扩展2")
+    private String ext2;
+
+
+}

ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/mapper/TblArchivesMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.filemanager.mapper;
+
+import org.dromara.filemanager.domain.TblArchives;
+import org.dromara.filemanager.domain.vo.TblArchivesVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 电子档案Mapper接口
+ *
+ * @author Lion Li
+ * @date 2024-05-20
+ */
+public interface TblArchivesMapper extends BaseMapperPlus<TblArchives, TblArchivesVo> {
+
+}

ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/service/ITblArchivesService.java

@@ -0,0 +1,49 @@
+package org.dromara.filemanager.service;
+
+import org.dromara.filemanager.domain.TblArchives;
+import org.dromara.filemanager.domain.vo.TblArchivesVo;
+import org.dromara.filemanager.domain.bo.TblArchivesBo;
+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 2024-05-20
+ */
+public interface ITblArchivesService {
+
+    /**
+     * 查询电子档案
+     */
+    TblArchivesVo queryById(Long id);
+
+    /**
+     * 查询电子档案列表
+     */
+    TableDataInfo<TblArchivesVo> queryPageList(TblArchivesBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询电子档案列表
+     */
+    List<TblArchivesVo> queryList(TblArchivesBo bo);
+
+    /**
+     * 新增电子档案
+     */
+    Boolean insertByBo(TblArchivesBo bo);
+
+    /**
+     * 修改电子档案
+     */
+    Boolean updateByBo(TblArchivesBo bo);
+
+    /**
+     * 校验并批量删除电子档案信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/service/impl/TblArchivesServiceImpl.java

@@ -0,0 +1,119 @@
+package org.dromara.filemanager.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.filemanager.domain.bo.TblArchivesBo;
+import org.dromara.filemanager.domain.vo.TblArchivesVo;
+import org.dromara.filemanager.domain.TblArchives;
+import org.dromara.filemanager.mapper.TblArchivesMapper;
+import org.dromara.filemanager.service.ITblArchivesService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 电子档案Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2024-05-20
+ */
+@RequiredArgsConstructor
+@Service
+public class TblArchivesServiceImpl implements ITblArchivesService {
+
+    private final TblArchivesMapper baseMapper;
+
+    /**
+     * 查询电子档案
+     */
+    @Override
+    public TblArchivesVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询电子档案列表
+     */
+    @Override
+    public TableDataInfo<TblArchivesVo> queryPageList(TblArchivesBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<TblArchives> lqw = buildQueryWrapper(bo);
+        Page<TblArchivesVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询电子档案列表
+     */
+    @Override
+    public List<TblArchivesVo> queryList(TblArchivesBo bo) {
+        LambdaQueryWrapper<TblArchives> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<TblArchives> buildQueryWrapper(TblArchivesBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<TblArchives> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getArea()), TblArchives::getArea, bo.getArea());
+        lqw.eq(StringUtils.isNotBlank(bo.getQiuquan()), TblArchives::getQiuquan, bo.getQiuquan());
+        lqw.eq(StringUtils.isNotBlank(bo.getBuildUnit()), TblArchives::getBuildUnit, bo.getBuildUnit());
+        lqw.eq(StringUtils.isNotBlank(bo.getAddr()), TblArchives::getAddr, bo.getAddr());
+        lqw.eq(StringUtils.isNotBlank(bo.getCommunity()), TblArchives::getCommunity, bo.getCommunity());
+        lqw.eq(bo.getAchievementDate() != null, TblArchives::getAchievementDate, bo.getAchievementDate());
+        lqw.eq(bo.getSavePeriod() != null, TblArchives::getSavePeriod, bo.getSavePeriod());
+        lqw.eq(StringUtils.isNotBlank(bo.getEcode()), TblArchives::getEcode, bo.getEcode());
+        lqw.eq(StringUtils.isNotBlank(bo.getSaveAddr()), TblArchives::getSaveAddr, bo.getSaveAddr());
+        lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblArchives::getExt1, bo.getExt1());
+        lqw.eq(StringUtils.isNotBlank(bo.getExt2()), TblArchives::getExt2, bo.getExt2());
+        return lqw;
+    }
+
+    /**
+     * 新增电子档案
+     */
+    @Override
+    public Boolean insertByBo(TblArchivesBo bo) {
+        TblArchives add = MapstructUtils.convert(bo, TblArchives.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改电子档案
+     */
+    @Override
+    public Boolean updateByBo(TblArchivesBo bo) {
+        TblArchives update = MapstructUtils.convert(bo, TblArchives.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(TblArchives entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除电子档案
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-filemanager/src/main/resources/mapper/filemanager/TblArchivesMapper.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.filemanager.mapper.TblArchivesMapper">
+
+</mapper>

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

@@ -47,4 +47,6 @@ public class SysOss extends TenantEntity {
      */
     private String service;
 
+    private Long size;
+
 }

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

@@ -46,4 +46,6 @@ public class SysOssBo extends BaseEntity {
      */
     private String service;
 
+    private Long size;
+
 }

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

@@ -68,5 +68,7 @@ public class SysOssVo implements Serializable {
      */
     private String service;
 
+    private Long size;
+
 
 }

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

@@ -142,8 +142,9 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
         } catch (IOException e) {
             throw new ServiceException(e.getMessage());
         }
+
         // 保存文件信息
-        return buildResultEntity(originalfileName, suffix, storage.getConfigKey(), uploadResult);
+        return buildResultEntity(originalfileName, suffix,file.getSize(), storage.getConfigKey(), uploadResult);
     }
 
     @Override
@@ -152,18 +153,20 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
         String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
         OssClient storage = OssFactory.instance();
         UploadResult uploadResult = storage.uploadSuffix(file, suffix);
+
         // 保存文件信息
-        return buildResultEntity(originalfileName, suffix, storage.getConfigKey(), uploadResult);
+        return buildResultEntity(originalfileName, suffix,file.length(), storage.getConfigKey(), uploadResult);
     }
 
     @NotNull
-    private SysOssVo buildResultEntity(String originalfileName, String suffix, String configKey, UploadResult uploadResult) {
+    private SysOssVo buildResultEntity(String originalfileName, String suffix,Long size, String configKey, UploadResult uploadResult) {
         SysOss oss = new SysOss();
         oss.setUrl(uploadResult.getUrl());
         oss.setFileSuffix(suffix);
         oss.setFileName(uploadResult.getFilename());
         oss.setOriginalName(originalfileName);
         oss.setService(configKey);
+        oss.setSize(size);
         baseMapper.insert(oss);
         SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
         return this.matchingUrl(sysOssVo);