分页

bonus-admin/src/main/java/com/bonus/web/controller/archive/FilesClassifyMarkController.java

@@ -2,7 +2,9 @@ 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.R;
+import com.bonus.common.core.page.TableDataInfo;
 import com.bonus.common.enums.OperaType;
 import com.bonus.web.domain.FilesClassifyMarkDto;
 import com.bonus.web.service.FilesClassifyMarkService;
@@ -11,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -21,7 +24,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/filesClassifyMark")
 @Slf4j
-public class FilesClassifyMarkController {
+public class FilesClassifyMarkController extends BaseController {
 
     @Autowired
     private FilesClassifyMarkService service;
@@ -29,21 +32,22 @@ public class FilesClassifyMarkController {
     @ApiOperation(value = "文件分类标记列表")
     @GetMapping("list")
     @SysLog(title = "文件分类标记列表", module = "档案分类管理->文件分类标记管理", businessType = OperaType.QUERY, details = "文件分类标记列表", logType = 1)
-    @RequiresPermissions("files:Classify:list")
+    @RequiresPermissions("files:classify:list")
-    public R<List<FilesClassifyMarkDto>> getArchivalCatalogueTree(FilesClassifyMarkDto dto) {
+    public TableDataInfo getArchivalCatalogueTree(FilesClassifyMarkDto dto) {
         try {
+            startPage();
             List<FilesClassifyMarkDto> list = service.list(dto);
-            return R.ok(list);
+            return getDataTable(list);
         } catch (Exception e) {
             log.error(e.toString(), e);
-            return R.fail("请求出错了");
+            return getDataTable(new ArrayList<>());
         }
     }
 
     @ApiOperation(value = "文件分类标记新增")
     @PostMapping("addArchivalCatalogue")
     @SysLog(title = "文件分类标记新增", module = "档案分类管理->文件分类标记管理", businessType = OperaType.QUERY, details = "文件分类标记新增", logType = 1)
-    @RequiresPermissions("files:Classify:add")
+    @RequiresPermissions("files:classify:add")
     public R addArchivalCatalogueTree(@RequestBody FilesClassifyMarkDto dto) {
         try {
             Integer i = service.add(dto);
@@ -60,7 +64,7 @@ public class FilesClassifyMarkController {
     @ApiOperation(value = "文件分类标记修改")
     @PostMapping("editArchivalCatalogue")
     @SysLog(title = "文件分类标记修改", module = "档案分类管理->文件分类标记管理", businessType = OperaType.QUERY, details = "文件分类标记修改", logType = 1)
-    @RequiresPermissions("files:Classify:edit")
+    @RequiresPermissions("files:classify:edit")
     public R editArchivalCatalogueTree(@RequestBody FilesClassifyMarkDto dto) {
         try {
             Integer i = service.edit(dto);
@@ -77,7 +81,7 @@ public class FilesClassifyMarkController {
     @ApiOperation(value = "文件分类标记删除")
     @PostMapping("delArchivalCatalogue")
     @SysLog(title = "文件分类标记删除", module = "档案分类管理->文件分类标记管理", businessType = OperaType.QUERY, details = "文件分类标记删除", logType = 1)
-    @RequiresPermissions("files:Classify:del")
+    @RequiresPermissions("files:classify:del")
     public R delArchivalCatalogueTree(@RequestBody FilesClassifyMarkDto dto) {
         try {
             Integer i = service.del(dto);

bonus-admin/src/main/java/com/bonus/web/controller/archive/FilesClassifyNameStandardController.java

@@ -59,7 +59,7 @@ public class FilesClassifyNameStandardController extends BaseController {
 
     @ApiOperation(value = "新增文件分类命名规范识别")
     @PostMapping("edit")
-    @SysLog(title = "新增文件分类命名规范识别", module = "档案分类管理->文件分类命名规范识别管理", businessType = OperaType.INSERT, details = "新增文件分类命名规范识别", logType = 1)
+    @SysLog(title = "新增文件分类命名规范识别", module = "档案分类管理->文件分类命名规范识别管理", businessType = OperaType.UPDATE, details = "新增文件分类命名规范识别", logType = 1)
     @RequiresPermissions("classify:standard:edit")
     public R updateClassifyNameStandard(@RequestBody FilesClassifyNameStandardDto dto) {
         try {
@@ -71,7 +71,7 @@ public class FilesClassifyNameStandardController extends BaseController {
     }
     @ApiOperation(value = "删除文件分类命名规范识别")
     @PostMapping("del")
-    @SysLog(title = "删除文件分类命名规范识别", module = "档案分类管理->文件分类命名规范识别管理", businessType = OperaType.INSERT, details = "删除文件分类命名规范识别", logType = 1)
+    @SysLog(title = "删除文件分类命名规范识别", module = "档案分类管理->文件分类命名规范识别管理", businessType = OperaType.DELETE, details = "删除文件分类命名规范识别", logType = 1)
     @RequiresPermissions("classify:standard:del")
     public R delClassifyNameStandard(@RequestBody FilesClassifyNameStandardDto dto) {
         try {

bonus-common/src/main/java/com/bonus/common/utils/DesensitizedUtil.java

@@ -39,6 +39,7 @@ public class DesensitizedUtil {
         return carLicense;
     }
 
+    // IPv4 地址中间用*代替(脱敏)
     public static String ipMiddle(String ip) {
         if (StringUtils.isBlank(ip)) {
             return StringUtils.EMPTY;