档案管理、白名单管理、加密类型管理

2025-09-10 15:18:25 +08:00 · 2025-09-10 15:18:25 +08:00 · a7b7582ada
parent fd52595c95
commit a7b7582ada
7 changed files with 47 additions and 24 deletions
--- a/bonus-admin/src/main/java/com/bonus/web/controller/archive/FilesClassifyMarkController.java
+++ b/bonus-admin/src/main/java/com/bonus/web/controller/archive/FilesClassifyMarkController.java
@ -41,7 +41,7 @@ public class FilesClassifyMarkController {
    }

    @ApiOperation(value = "文件分类标记新增")
-    @PostMapping
+    @PostMapping("addArchivalCatalogue")
    @SysLog(title = "文件分类标记新增", module = "档案管理->档案目录管理", businessType = OperaType.QUERY, details = "文件分类标记新增", logType = 1)
    @RequiresPermissions("files:Classify:add")
    public R addArchivalCatalogueTree(@RequestBody FilesClassifyMarkDto dto) {
@ -58,7 +58,7 @@ public class FilesClassifyMarkController {
        }
    }
    @ApiOperation(value = "文件分类标记修改")
-    @PutMapping
+    @PostMapping("editArchivalCatalogue")
    @SysLog(title = "文件分类标记修改", module = "档案管理->档案目录管理", businessType = OperaType.QUERY, details = "文件分类标记修改", logType = 1)
    @RequiresPermissions("files:Classify:edit")
    public R editArchivalCatalogueTree(@RequestBody FilesClassifyMarkDto dto) {
@ -75,7 +75,7 @@ public class FilesClassifyMarkController {
        }
    }
    @ApiOperation(value = "文件分类标记删除")
-    @DeleteMapping
+    @PostMapping("delArchivalCatalogue")
    @SysLog(title = "文件分类标记删除", module = "档案管理->档案目录管理", businessType = OperaType.QUERY, details = "文件分类标记删除", logType = 1)
    @RequiresPermissions("files:Classify:del")
    public R delArchivalCatalogueTree(@RequestBody FilesClassifyMarkDto dto) {
--- 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
@ -9,6 +9,7 @@ import com.bonus.common.enums.OperaType;
 import com.bonus.system.domain.SysEncryType;
 import com.bonus.system.service.ISysEncryTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

 import java.util.List;
@ -37,26 +38,16 @@ public class SysEncryTypeController extends BaseController {
    @PostMapping("addEncryType")
    @SysLog(title = "新增档案加密类型", module = "数据档案移交->档案加密类型管理", businessType = OperaType.INSERT, details = "新增档案加密类型", logType = 1)
    @RequiresPermissions("encry:type:add")
-    public R add(@RequestBody SysEncryType sysEncryType) {
-        Integer addNum = encryTypeService.add(sysEncryType);
-        if (addNum > 0) {
-            return R.ok();
-        } else {
-            return R.fail("新增失败");
-        }
+    public R add(@RequestBody @Validated SysEncryType sysEncryType) {
+        return encryTypeService.add(sysEncryType);
    }


    @PostMapping("editEncryType")
    @SysLog(title = "修改档案加密类型", module = "数据档案移交->档案加密类型管理", businessType = OperaType.UPDATE, details = "修改档案加密类型", logType = 1)
    @RequiresPermissions("encry:type:edit")
-    public R edit(@RequestBody SysEncryType sysEncryType) {
-        Integer editNum = encryTypeService.edit(sysEncryType);
-        if (editNum > 0) {
-            return R.ok();
-        } else {
-            return R.fail("修改失败");
-        }
+    public R edit(@RequestBody @Validated SysEncryType sysEncryType) {
+        return encryTypeService.edit(sysEncryType);
    }

    @PostMapping("delEncryType")
--- a/bonus-system/src/main/java/com/bonus/system/domain/SysEncryType.java
+++ b/bonus-system/src/main/java/com/bonus/system/domain/SysEncryType.java
@ -1,6 +1,8 @@
 package com.bonus.system.domain;

 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+

 /**
 * @Author：liang.chao
@ -9,8 +11,11 @@ import lombok.Data;
@Data
 public class SysEncryType {
    private String id;
+    @Length(max = 20)
    private String encryptType;
+    @Length(max = 20)
    private String encryptName;
+    @Length(max = 32)
    private String encryptParams;
    private Integer status;
 }
--- a/bonus-system/src/main/java/com/bonus/system/mapper/ISysEncryTypeMapper.java
+++ b/bonus-system/src/main/java/com/bonus/system/mapper/ISysEncryTypeMapper.java
@ -18,4 +18,6 @@ public interface ISysEncryTypeMapper {
    Integer add(SysEncryType sysEncryType);

    Integer del(SysEncryType sysEncryType);
+
+    Integer selectSysEncryType(SysEncryType sysEncryType);
 }
--- a/bonus-system/src/main/java/com/bonus/system/service/ISysEncryTypeService.java
+++ b/bonus-system/src/main/java/com/bonus/system/service/ISysEncryTypeService.java
@ -1,5 +1,6 @@
 package com.bonus.system.service;

+import com.bonus.common.core.domain.R;
 import com.bonus.system.domain.SysEncryType;

 import java.util.List;
@ -11,9 +12,9 @@ import java.util.List;
 public interface ISysEncryTypeService {
    List<SysEncryType> selectSysEncryTypeList(SysEncryType sysEncryType);

-    Integer edit(SysEncryType sysEncryType);
+    R edit(SysEncryType sysEncryType);

-    Integer add(SysEncryType sysEncryType);
+    R add(SysEncryType sysEncryType);

    Integer del(SysEncryType sysEncryType);
 }
--- 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
@ -1,5 +1,7 @@
 package com.bonus.system.service.impl;

+import cn.hutool.core.collection.CollectionUtil;
+import com.bonus.common.core.domain.R;
 import com.bonus.system.domain.SysEncryType;
 import com.bonus.system.mapper.ISysEncryTypeMapper;
 import com.bonus.system.service.ISysEncryTypeService;
@ -17,19 +19,36 @@ public class SysEncryTypeServiceImpl implements ISysEncryTypeService {

    @Autowired
    private ISysEncryTypeMapper sysEncryTypeMapper;
+
    @Override
    public List<SysEncryType> selectSysEncryTypeList(SysEncryType sysEncryType) {
        return sysEncryTypeMapper.selectSysEncryTypeList(sysEncryType);
    }

    @Override
-    public Integer edit(SysEncryType sysEncryType) {
-        return sysEncryTypeMapper.edit(sysEncryType);
+    public R edit(SysEncryType sysEncryType) {
+        try {
+            Integer i = sysEncryTypeMapper.selectSysEncryType(sysEncryType);
+            if (i > 0) {
+                return R.fail("该加密名称已存在");
+            }
+            return R.ok(sysEncryTypeMapper.edit(sysEncryType));
+        }catch (Exception e){
+            return R.fail("修改失败");
+        }
    }

    @Override
-    public Integer add(SysEncryType sysEncryType) {
-        return sysEncryTypeMapper.add(sysEncryType);
+    public R add(SysEncryType sysEncryType) {
+        try {
+            Integer i = sysEncryTypeMapper.selectSysEncryType(sysEncryType);
+            if (i > 0) {
+                return R.fail("该加密名称已存在");
+            }
+            return R.ok(sysEncryTypeMapper.add(sysEncryType));
+        }catch (Exception e){
+            return R.fail("新增失败");
+        }
    }

    @Override
--- a/bonus-system/src/main/resources/mapper/system/SysEncryTypeMapper.xml
+++ b/bonus-system/src/main/resources/mapper/system/SysEncryTypeMapper.xml
@ -34,8 +34,8 @@
            <if test="status != null">
                status = #{status},
            </if>
-            WHERE id = #{id}
        </set>
+        WHERE id = #{id}
    </update>
    <delete id="del">
        delete from da_ky_sys_encrypt_set where id = #{id}
@ -53,4 +53,9 @@
            and encrypt_name like concat ('%',#{encryptName},'%')
        </if>
    </select>
+    <select id="selectSysEncryType" resultType="java.lang.Integer">
+        select count(*)
+        from da_ky_sys_encrypt_set
+        where encrypt_name = #{encryptName}
+    </select>
 </mapper>