From 8373c9ce1b1ab26f919d3513d2166ea28d9a21fb Mon Sep 17 00:00:00 2001 From: dongzeliang <2746733890@qq.com> Date: Wed, 15 Jan 2025 11:46:54 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/web/controller/BaseController.java | 2 +- .../muyu/system/controller/SysConfigController.java | 12 ++++++------ .../com/muyu/system/domain/rep/SysConfigAddReq.java | 1 - .../com/muyu/system/service/SysConfigService.java | 5 +++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java index 340571e..17267b7 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java @@ -61,7 +61,7 @@ public class BaseController { /** * 返回成功消息 */ - public Result success (Object data) { + public Result success (T data) { return Result.success(data); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java index 8859283..24c5852 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java @@ -55,7 +55,7 @@ public class SysConfigController extends BaseController { @PostMapping("/export") public void export (HttpServletResponse response, SysConfigListReq sysConfigListReq) { PageQueryModel pageQueryModel = configService.pageQuery(SysConfigPageQueryModel.reqBuild(sysConfigListReq)); - ExcelUtil util = new ExcelUtil(SysConfig.class); + ExcelUtil util = new ExcelUtil<>(SysConfig.class); util.exportExcel(response, pageQueryModel.getDataList(), "参数数据"); } @@ -63,7 +63,7 @@ public class SysConfigController extends BaseController { * 根据参数编号获取详细信息 */ @GetMapping(value = "/{configId}") - public Result getInfo (@PathVariable("configId") Long configId) { + public Result getInfo (@PathVariable("configId") Long configId) { return success(configService.getById(configId)); } @@ -81,7 +81,7 @@ public class SysConfigController extends BaseController { @RequiresPermissions("system:config:add") @Log(title = "参数管理", businessType = BusinessType.INSERT) @PostMapping - public Result add (@Validated @RequestBody SysConfigAddReq sysConfigAddReq) { + public Result add (@Validated @RequestBody SysConfigAddReq sysConfigAddReq) { if (!configService.checkConfigKeyUnique(sysConfigAddReq.getConfigKey())) { return error(StringUtils.format("新增参数「{}」失败，参数键名已存在",sysConfigAddReq.getConfigName())); } @@ -94,7 +94,7 @@ public class SysConfigController extends BaseController { @RequiresPermissions("system:config:edit") @Log(title = "参数管理", businessType = BusinessType.UPDATE) @PutMapping("/{sysConfigId}") - public Result edit (@PathVariable("sysConfigId")Long sysConfigId, @Validated @RequestBody SysConfigUpdReq sysConfigUpdReq) { + public Result edit (@PathVariable("sysConfigId")Long sysConfigId, @Validated @RequestBody SysConfigUpdReq sysConfigUpdReq) { if (!configService.checkConfigKeyUnique(sysConfigUpdReq.getConfigKey())) { return error("修改参数'" + sysConfigUpdReq.getConfigName() + "'失败，参数键名已存在"); } @@ -109,7 +109,7 @@ public class SysConfigController extends BaseController { @RequiresPermissions("system:config:remove") @Log(title = "参数管理", businessType = BusinessType.DELETE) @DeleteMapping("/{configIds}") - public Result remove (@PathVariable("configIds") Long[] configIds) { + public Result remove (@PathVariable("configIds") Long[] configIds) { configService.removeBatchByIds(Arrays.asList(configIds)); return success(); } @@ -120,7 +120,7 @@ public class SysConfigController extends BaseController { @RequiresPermissions("system:config:remove") @Log(title = "参数管理", businessType = BusinessType.CLEAN) @DeleteMapping("/refreshCache") - public Result refreshCache () { + public Result refreshCache () { configService.resetConfigCache(); return success(); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigAddReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigAddReq.java index d089d20..482aae0 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigAddReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigAddReq.java @@ -1,6 +1,5 @@ package com.muyu.system.domain.rep; -import com.muyu.common.core.annotation.Excel; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java index 901134b..ca4ff4f 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java @@ -16,6 +16,11 @@ import java.util.List; public interface SysConfigService extends IService { + /** + * 分页查询 + * @param pageQueryModel 查询模型 + * @return 查询结果 + */ PageQueryModel pageQuery (SysConfigPageQueryModel pageQueryModel); /**