From 448fc7f78f03f71a811792e6c2613003a46da838 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Wed, 5 Nov 2025 16:53:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../archive/FileIndexController.java | 86 +++++++++++++++++++ .../archive/TransferApplyController.java | 3 + .../system/SysEncryTypeController.java | 40 +++++++++ .../controller/tool/FileShareController.java | 2 +- .../com/bonus/web/domain/FileIndexDto.java | 27 ++++++ .../bonus/web/domain/TransferApplyDto.java | 1 + .../com/bonus/web/mapper/FileIndexMapper.java | 23 +++++ .../bonus/web/service/FileIndexService.java | 21 +++++ .../service/impl/FileIndexServiceImpl.java | 43 ++++++++++ .../main/resources/mapper/FileIndexMapper.xml | 44 ++++++++++ .../resources/mapper/TransferApplyMapper.xml | 3 + .../system/mapper/ISysEncryTypeMapper.java | 12 +++ .../system/service/ISysEncryTypeService.java | 10 +++ .../service/impl/SysEncryTypeServiceImpl.java | 38 ++++++++ .../mapper/system/SysEncryTypeMapper.xml | 61 +++++++++++++ .../resources/mapper/system/SysRoleMapper.xml | 2 +- 16 files changed, 414 insertions(+), 2 deletions(-) create mode 100644 bonus-admin/src/main/java/com/bonus/web/controller/archive/FileIndexController.java create mode 100644 bonus-admin/src/main/java/com/bonus/web/domain/FileIndexDto.java create mode 100644 bonus-admin/src/main/java/com/bonus/web/mapper/FileIndexMapper.java create mode 100644 bonus-admin/src/main/java/com/bonus/web/service/FileIndexService.java create mode 100644 bonus-admin/src/main/java/com/bonus/web/service/impl/FileIndexServiceImpl.java create mode 100644 bonus-admin/src/main/resources/mapper/FileIndexMapper.xml diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileIndexController.java b/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileIndexController.java new file mode 100644 index 0000000..a2f06b2 --- /dev/null +++ b/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileIndexController.java @@ -0,0 +1,86 @@ +package com.bonus.web.controller.archive; + +import com.bonus.common.annotation.RequiresPermissions; +import com.bonus.common.annotation.SysLog; +import com.bonus.common.core.controller.BaseController; +import com.bonus.common.core.domain.AjaxResult; +import com.bonus.common.core.page.TableDataInfo; +import com.bonus.common.enums.OperaType; +import com.bonus.web.domain.ArchivedSettingDto; +import com.bonus.web.domain.FileIndexDto; +import com.bonus.web.domain.FilesClassifyMarkDto; +import com.bonus.web.service.FileIndexService; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * @Author：liang.chao + * @Date：2025/10/30 - 16:20 + */ + +@RestController +@RequestMapping("/FileIndex") +@Slf4j +public class FileIndexController extends BaseController { + + @Resource + private FileIndexService fileIndexService; + @ApiOperation(value = "档案索引列表") + @GetMapping("query") + @SysLog(title = "档案索引列表", module = "数据/档案移交->档案索引", businessType = OperaType.QUERY, details = "档案索引", logType = 1) + @RequiresPermissions("file:index:query") + public TableDataInfo getFileIndex(FileIndexDto dto) { + try { + startPage(); + List list = fileIndexService.getList(dto); + return getDataTable(list); + } catch (Exception e) { + log.error(e.toString(), e); + return getDataTable(new ArrayList<>()); + } + } + + @ApiOperation(value = "新增档案索引") + @PostMapping("add") + @SysLog(title = "新增档案索引", module = "数据/档案移交->新增档案索引", businessType = OperaType.INSERT, details = "新增档案索引", logType = 1) + @RequiresPermissions("file:index:add") + public AjaxResult addFileIndex(@RequestBody @Validated FileIndexDto dto) { + try { + return fileIndexService.add(dto); + } catch (Exception e) { + log.error(e.toString(), e); + return AjaxResult.error("请求出错了"); + } + } + + @ApiOperation(value = "修改档案索引") + @PostMapping("update") + @SysLog(title = "修改档案索引", module = "数据/档案移交->修改档案索引", businessType = OperaType.UPDATE, details = "修改档案索引", logType = 1) + @RequiresPermissions("file:index:edit") + public AjaxResult updateFileIndex(@RequestBody @Validated FileIndexDto dto) { + try { + return fileIndexService.update(dto); + } catch (Exception e) { + log.error(e.toString(), e); + return AjaxResult.error("请求出错了"); + } + } + @ApiOperation(value = "删除档案索引") + @PostMapping("del") + @SysLog(title = "删除档案索引", module = "数据/档案移交->删除档案索引", businessType = OperaType.DELETE, details = "删除档案索引", logType = 1) + @RequiresPermissions("file:index:del") + public AjaxResult delFileIndex(@RequestBody FileIndexDto dto) { + try { + return fileIndexService.del(dto); + } catch (Exception e) { + log.error(e.toString(), e); + return AjaxResult.error("请求出错了"); + } + } +} diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/archive/TransferApplyController.java b/bonus-admin/src/main/java/com/bonus/web/controller/archive/TransferApplyController.java index 2714615..f81913e 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/archive/TransferApplyController.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/archive/TransferApplyController.java @@ -20,6 +20,8 @@ import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; +import static com.bonus.common.utils.SecurityUtils.getLoginUser; + /** * @Author：liang.chao * @Date：2025/9/15 - 11:24 @@ -39,6 +41,7 @@ public class TransferApplyController extends BaseController { public TableDataInfo getTransferApplyList(TransferApplyDto dto) { try { startPage(); + dto.setUserId(getLoginUser().getUserId().toString()); List list = transferApplyService.list(dto); return getDataTable(list); } catch (Exception e) { diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/system/SysEncryTypeController.java b/bonus-admin/src/main/java/com/bonus/web/controller/system/SysEncryTypeController.java index 2a06015..01ba832 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/system/SysEncryTypeController.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/system/SysEncryTypeController.java @@ -62,4 +62,44 @@ public class SysEncryTypeController extends BaseController { } } + + + + + // 新增文件加密类型 + @GetMapping("/listFile") + @SysLog(title = "档案文件加密类型列表", module = "数据档案移交->档案加密类型管理", businessType = OperaType.QUERY, details = "档案加密类型列表", logType = 1) + @RequiresPermissions("encry:type:list") + public TableDataInfo listFile(SysEncryType sysEncryType) { + startPage(); + List list = encryTypeService.selectSysEncryTypeListFile(sysEncryType); + return getDataTable(list); + } + @PostMapping("addEncryTypeFile") + @SysLog(title = "新增档案文件加密类型", module = "数据档案移交->档案加密类型管理", businessType = OperaType.INSERT, details = "新增档案加密类型", logType = 1) + @RequiresPermissions("encry:type:add") + public R addEncryTypeFile(@RequestBody @Validated SysEncryType sysEncryType) { + return encryTypeService.addFile(sysEncryType); + } + + + @PostMapping("editEncryTypeFile") + @SysLog(title = "修改档案文件加密类型", module = "数据档案移交->档案加密类型管理", businessType = OperaType.UPDATE, details = "修改档案加密类型", logType = 1) + @RequiresPermissions("encry:type:edit") + public R editEncryTypeFile(@RequestBody @Validated SysEncryType sysEncryType) { + return encryTypeService.editFile(sysEncryType); + } + + @PostMapping("delEncryTypeFile") + @SysLog(title = "删除档案文件加密类型", module = "数据档案移交->档案加密类型管理", businessType = OperaType.DELETE, details = "删除档案加密类型", logType = 1) + @RequiresPermissions("encry:type:del") + public R delEncryTypeFile(@RequestBody SysEncryType sysEncryType) { + Integer delNum = encryTypeService.delFile(sysEncryType); + if (delNum > 0) { + return R.ok(); + } else { + return R.fail("删除失败"); + } + } + } diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/tool/FileShareController.java b/bonus-admin/src/main/java/com/bonus/web/controller/tool/FileShareController.java index 41f68b1..98a5485 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/tool/FileShareController.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/tool/FileShareController.java @@ -38,7 +38,7 @@ public class FileShareController extends BaseController { * @param kyDataClassify * @return */ - @RequiresPermissions("file:share:listAll") + @RequiresPermissions("file:share:list") @GetMapping("/listAll") public TableDataInfo listAll(KyDataClassify kyDataClassify) { diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/FileIndexDto.java b/bonus-admin/src/main/java/com/bonus/web/domain/FileIndexDto.java new file mode 100644 index 0000000..27d9b8c --- /dev/null +++ b/bonus-admin/src/main/java/com/bonus/web/domain/FileIndexDto.java @@ -0,0 +1,27 @@ +package com.bonus.web.domain; + +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; + +/** + * @Author：liang.chao + * @Date：2025/10/30 - 16:24 + */ +@Data +public class FileIndexDto { + + private String id; + @NotBlank(message = "文件名称不能为空") + @Length(max = 32, message = "文件名称不能超过32个字符") + private String fileName; + @NotBlank(message = "文件内容不能为空") + @Length(max = 200, message = "文件内容不能超过200个字符") + private String fileContent; + @NotBlank(message = "文件目录不能为空") + @Length(max = 200, message = "文件目录不能超过200个字符") + private String filePath; + @NotBlank + private String saveDate; +} diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/TransferApplyDto.java b/bonus-admin/src/main/java/com/bonus/web/domain/TransferApplyDto.java index 94267dc..26aac71 100644 --- a/bonus-admin/src/main/java/com/bonus/web/domain/TransferApplyDto.java +++ b/bonus-admin/src/main/java/com/bonus/web/domain/TransferApplyDto.java @@ -126,6 +126,7 @@ public class TransferApplyDto { * 是否删除：0.删除 1.未删除 */ private String delFlag; + private String userId; private List transferFileDtos; } diff --git a/bonus-admin/src/main/java/com/bonus/web/mapper/FileIndexMapper.java b/bonus-admin/src/main/java/com/bonus/web/mapper/FileIndexMapper.java new file mode 100644 index 0000000..50552a5 --- /dev/null +++ b/bonus-admin/src/main/java/com/bonus/web/mapper/FileIndexMapper.java @@ -0,0 +1,23 @@ +package com.bonus.web.mapper; + +import com.bonus.common.core.domain.AjaxResult; +import com.bonus.web.domain.FileIndexDto; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @Author：liang.chao + * @Date：2025/10/30 - 16:30 + */ +@Mapper +public interface FileIndexMapper { + + List getList(FileIndexDto dto); + + Integer add(FileIndexDto dto); + + Integer update(FileIndexDto dto); + + Integer del(FileIndexDto dto); +} diff --git a/bonus-admin/src/main/java/com/bonus/web/service/FileIndexService.java b/bonus-admin/src/main/java/com/bonus/web/service/FileIndexService.java new file mode 100644 index 0000000..9df8092 --- /dev/null +++ b/bonus-admin/src/main/java/com/bonus/web/service/FileIndexService.java @@ -0,0 +1,21 @@ +package com.bonus.web.service; + +import com.bonus.common.core.domain.AjaxResult; +import com.bonus.web.domain.FileIndexDto; + +import java.util.List; + +/** + * @Author：liang.chao + * @Date：2025/10/30 - 16:21 + */ +public interface FileIndexService { + + List getList(FileIndexDto dto); + + AjaxResult add(FileIndexDto dto); + + AjaxResult update(FileIndexDto dto); + + AjaxResult del(FileIndexDto dto); +} diff --git a/bonus-admin/src/main/java/com/bonus/web/service/impl/FileIndexServiceImpl.java b/bonus-admin/src/main/java/com/bonus/web/service/impl/FileIndexServiceImpl.java new file mode 100644 index 0000000..9f967f1 --- /dev/null +++ b/bonus-admin/src/main/java/com/bonus/web/service/impl/FileIndexServiceImpl.java @@ -0,0 +1,43 @@ +package com.bonus.web.service.impl; + +import com.bonus.common.core.domain.AjaxResult; +import com.bonus.web.domain.FileIndexDto; +import com.bonus.web.mapper.FileIndexMapper; +import com.bonus.web.service.FileIndexService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author：liang.chao + * @Date：2025/10/30 - 16:21 + */ +@Service +public class FileIndexServiceImpl implements FileIndexService { + + @Resource + private FileIndexMapper mapper; + @Override + public List getList(FileIndexDto dto) { + return mapper.getList(dto); + } + + @Override + public AjaxResult add(FileIndexDto dto) { + Integer add = mapper.add(dto); + return add > 0 ? AjaxResult.success("添加成功") : AjaxResult.error("添加失败"); + } + + @Override + public AjaxResult update(FileIndexDto dto) { + Integer update = mapper.update(dto); + return update > 0 ? AjaxResult.success("修改成功") : AjaxResult.error("修改失败"); + } + + @Override + public AjaxResult del(FileIndexDto dto) { + Integer del = mapper.del(dto); + return del > 0 ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败"); + } +} diff --git a/bonus-admin/src/main/resources/mapper/FileIndexMapper.xml b/bonus-admin/src/main/resources/mapper/FileIndexMapper.xml new file mode 100644 index 0000000..af68dc1 --- /dev/null +++ b/bonus-admin/src/main/resources/mapper/FileIndexMapper.xml @@ -0,0 +1,44 @@ + + + + + INSERT INTO da_ky_file_index + + file_name, + file_content, + file_path, + save_date, + + VALUES + + #{fileName}, + #{fileContent}, + #{filePath}, + #{saveDate}, + + + + UPDATE da_ky_file_index + + file_name = #{fileName}, + file_content = #{fileContent}, + file_path = #{filePath}, + save_date = #{saveDate}, + + WHERE id = #{id} + + + DELETE FROM da_ky_file_index WHERE id = #{id} + + + + diff --git a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml index d6c07e9..e1c473f 100644 --- a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml +++ b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml @@ -365,6 +365,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join da_ky_project dkp on dkta.pro_id = dkp.id LEFT JOIN da_ky_sys_dept d ON dkta.dept_id = d.dept_id AND d.del_flag = '0' where dkta.del_flag = '1' + + and dkta.create_user_id = #{userId} + AND INSTR(dkta.pro_name, #{proName}) > 0 diff --git a/bonus-system/src/main/java/com/bonus/system/mapper/ISysEncryTypeMapper.java b/bonus-system/src/main/java/com/bonus/system/mapper/ISysEncryTypeMapper.java index 5e9af80..4fa7c78 100644 --- a/bonus-system/src/main/java/com/bonus/system/mapper/ISysEncryTypeMapper.java +++ b/bonus-system/src/main/java/com/bonus/system/mapper/ISysEncryTypeMapper.java @@ -20,4 +20,16 @@ public interface ISysEncryTypeMapper { Integer del(SysEncryType sysEncryType); Integer selectSysEncryType(SysEncryType sysEncryType); + + + + List selectSysEncryTypeListFile(SysEncryType sysEncryType); + + Integer editFile(SysEncryType sysEncryType); + + Integer addFile(SysEncryType sysEncryType); + + Integer delFile(SysEncryType sysEncryType); + + Integer selectSysEncryTypeFile(SysEncryType sysEncryType); } diff --git a/bonus-system/src/main/java/com/bonus/system/service/ISysEncryTypeService.java b/bonus-system/src/main/java/com/bonus/system/service/ISysEncryTypeService.java index 6e1b480..b8a516c 100644 --- a/bonus-system/src/main/java/com/bonus/system/service/ISysEncryTypeService.java +++ b/bonus-system/src/main/java/com/bonus/system/service/ISysEncryTypeService.java @@ -17,4 +17,14 @@ public interface ISysEncryTypeService { R add(SysEncryType sysEncryType); Integer del(SysEncryType sysEncryType); + + + + List selectSysEncryTypeListFile(SysEncryType sysEncryType); + + R addFile(SysEncryType sysEncryType); + + R editFile(SysEncryType sysEncryType); + + Integer delFile(SysEncryType sysEncryType); } diff --git a/bonus-system/src/main/java/com/bonus/system/service/impl/SysEncryTypeServiceImpl.java b/bonus-system/src/main/java/com/bonus/system/service/impl/SysEncryTypeServiceImpl.java index 94d6501..5a88acf 100644 --- a/bonus-system/src/main/java/com/bonus/system/service/impl/SysEncryTypeServiceImpl.java +++ b/bonus-system/src/main/java/com/bonus/system/service/impl/SysEncryTypeServiceImpl.java @@ -55,4 +55,42 @@ public class SysEncryTypeServiceImpl implements ISysEncryTypeService { public Integer del(SysEncryType sysEncryType) { return sysEncryTypeMapper.del(sysEncryType); } + + + + @Override + public List selectSysEncryTypeListFile(SysEncryType sysEncryType) { + return sysEncryTypeMapper.selectSysEncryTypeListFile(sysEncryType); + } + + @Override + public R editFile(SysEncryType sysEncryType) { + try { + Integer i = sysEncryTypeMapper.selectSysEncryTypeFile(sysEncryType); + if (i > 0) { + return R.fail("该加密名称已存在"); + } + return R.ok(sysEncryTypeMapper.editFile(sysEncryType)); + }catch (Exception e){ + return R.fail("修改失败"); + } + } + + @Override + public R addFile(SysEncryType sysEncryType) { + try { + Integer i = sysEncryTypeMapper.selectSysEncryTypeFile(sysEncryType); + if (i > 0) { + return R.fail("该加密名称已存在"); + } + return R.ok(sysEncryTypeMapper.addFile(sysEncryType)); + }catch (Exception e){ + return R.fail("新增失败"); + } + } + + @Override + public Integer delFile(SysEncryType sysEncryType) { + return sysEncryTypeMapper.delFile(sysEncryType); + } } diff --git a/bonus-system/src/main/resources/mapper/system/SysEncryTypeMapper.xml b/bonus-system/src/main/resources/mapper/system/SysEncryTypeMapper.xml index fcabb90..363cbb6 100644 --- a/bonus-system/src/main/resources/mapper/system/SysEncryTypeMapper.xml +++ b/bonus-system/src/main/resources/mapper/system/SysEncryTypeMapper.xml @@ -61,4 +61,65 @@ and id != #{id} + + + + + INSERT INTO da_ky_sys_encrypt_file_set + + encrypt_type, + encrypt_name, + encrypt_params, + status, + + VALUES + + #{encryptType}, + #{encryptName}, + #{encryptParams}, + #{status}, + + + + update da_ky_sys_encrypt_file_set + + + encrypt_type = #{encryptType}, + + + encrypt_name = #{encryptName}, + + + encrypt_params = #{encryptParams}, + + + status = #{status}, + + + WHERE id = #{id} + + + delete from da_ky_sys_encrypt_file_set where id = #{id} + + + + diff --git a/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml b/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml index d340af0..b8bbd52 100644 --- a/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND r.role_id = #{roleId} - AND INSTR(r.role_name, #{roleName}) > 0 + AND (INSTR(r.role_name, #{roleName}) > 0 or INSTR(r.role_key, #{roleName}) > 0) AND r.status = #{status}