From 7109e2fefaa46caffcd36b44828f48e0f8a790ba Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期二, 11 七月 2023 09:36:50 +0800 Subject: [PATCH] 管理台bug和用户端 --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java index f7c4ff3..0435d5d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java @@ -33,7 +33,7 @@ * @Date 2023/6/6 9:14 * @Version 1.0 */ -@Api(value = "平台端配置相关接口", tags = "平台端配置相关接口", description = "平台端配置相关接口") +@Api(value = "管理后台配置相关接口", tags = "管理后台配置相关接口", description = "管理后台配置相关接口") @RestController @RequestMapping("/mgt/config") public class MgtConfigController { @@ -80,17 +80,17 @@ @RequestMapping(value = "/getCustomConfig", method = RequestMethod.POST) @ApiOperation(value = "获取单个配置") - public R<MgtCustomConfigVo> getCustomConfig(@RequestBody MgtCustomConfigDto mgtCustomConfigDto) { + public R<List<String>> getCustomConfig(@RequestBody MgtCustomConfigDto mgtCustomConfigDto) { Long userId = SecurityUtils.getUserId(); mgtCustomConfigDto.setUserId(userId); - MgtCustomConfigVo mgtCustomConfigVo = customConfigService.getCustomConfig(mgtCustomConfigDto); + List<String> mgtCustomConfigVo = customConfigService.getCustomConfig(mgtCustomConfigDto); return R.ok(mgtCustomConfigVo); } @RequestMapping(value = "/getActivenessList", method = RequestMethod.POST) @ApiOperation(value = "获取活跃度") - public R<List<String>> getActivenessList() { - List<String> activenessList = activenessService.getActivenessList(); + public R<List<MgtActivenessListVo>> getActivenessList() { + List<MgtActivenessListVo> activenessList = activenessService.getActivenessList(); return R.ok(activenessList); } @@ -450,7 +450,7 @@ @RequestMapping(value = "/listCity", method = RequestMethod.POST) @ApiOperation(value = "获取省市列表") public R<List<RegionVo>> listCity(){ - List<RegionVo> regionVoList = regionService.listRegionVo(); + List<RegionVo> regionVoList = regionService.listCityVo(); return R.ok(regionVoList); } @@ -481,4 +481,6 @@ MgtBulletinBoardVo bulletinBoard = customConfigService.getBulletinBoard(); return R.ok(bulletinBoard); } + + } -- Gitblit v1.7.1