diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/archive/ArchivedSettingController.java b/bonus-admin/src/main/java/com/bonus/web/controller/archive/ArchivedSettingController.java index 74a4761..4dc34e7 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/archive/ArchivedSettingController.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/archive/ArchivedSettingController.java @@ -31,9 +31,9 @@ public class ArchivedSettingController extends BaseController { @Autowired private ArchivedSettingService service; @ApiOperation(value = "归档配置") - @GetMapping("detail") + @GetMapping("query") @SysLog(title = "归档配置", module = "数据/档案移交->归档配置", businessType = OperaType.QUERY, details = "归档配置", logType = 1) - @RequiresPermissions("archived:setting:detail") + @RequiresPermissions("archived:setting:query") public AjaxResult getArchivedSetting(ArchivedSettingDto dto) { try { List list = service.getArchivedSetting(dto); diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java b/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java index a802b5b..d1cca7b 100644 --- a/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java +++ b/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java @@ -140,6 +140,7 @@ public class DaKyProFilesContentsDto { * 是否删除 0.删除 1.未删除 */ private String delFlag; + private String keyWord; private List children = new ArrayList<>(); } diff --git a/bonus-admin/src/main/java/com/bonus/web/service/impl/ArchivedSettingServiceImpl.java b/bonus-admin/src/main/java/com/bonus/web/service/impl/ArchivedSettingServiceImpl.java index 4e335ea..818c66e 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/impl/ArchivedSettingServiceImpl.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/impl/ArchivedSettingServiceImpl.java @@ -25,10 +25,6 @@ public class ArchivedSettingServiceImpl implements ArchivedSettingService { @Autowired private ArchivedSettingMapper archivedSettingMapper; - private static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern("HH:mm:ss"); - private static final DateTimeFormatter DATETIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - - @Override public List getArchivedSetting(ArchivedSettingDto dto) { return archivedSettingMapper.getArchivedSetting(dto); diff --git a/bonus-quartz/src/main/java/com/bonus/quartz/task/ArchivedSettingTask.java b/bonus-quartz/src/main/java/com/bonus/quartz/task/ArchivedSettingTask.java new file mode 100644 index 0000000..541e628 --- /dev/null +++ b/bonus-quartz/src/main/java/com/bonus/quartz/task/ArchivedSettingTask.java @@ -0,0 +1,23 @@ +package com.bonus.quartz.task; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * @Author:liang.chao + * @Date:2025/9/16 - 15:18 + */ +@Component("archivedSetting") +@Slf4j +public class ArchivedSettingTask { + + // 定期归档配置 + public void regularly() throws Exception { + + } + // 不定期归档配置 + public void noRegularly() throws Exception { + + } +} diff --git a/bonus-quartz/src/main/java/com/bonus/quartz/task/RyTask.java b/bonus-quartz/src/main/java/com/bonus/quartz/task/RyTask.java index b6e11e8..94b80cf 100644 --- a/bonus-quartz/src/main/java/com/bonus/quartz/task/RyTask.java +++ b/bonus-quartz/src/main/java/com/bonus/quartz/task/RyTask.java @@ -5,24 +5,20 @@ import com.bonus.common.utils.StringUtils; /** * 定时任务调度测试 - * + * * @author bonus */ @Component("ryTask") -public class RyTask -{ - public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) - { +public class RyTask { + public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) { System.out.println(StringUtils.format("执行多参方法: 字符串类型{},布尔类型{},长整型{},浮点型{},整形{}", s, b, l, d, i)); } - public void ryParams(String params) - { + public void ryParams(String params) { System.out.println("执行有参方法:" + params); } - public void ryNoParams() - { + public void ryNoParams() { System.out.println("执行无参方法"); } }