From b0b52cbabf7a4bc8e00fc328d14ac05336d0221e Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 15 七月 2023 20:07:44 +0800
Subject: [PATCH] 员工端

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java |   41 +++++++++++++++++++++++++++++++++--------
 1 files changed, 33 insertions(+), 8 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 808e0fa..4b312f5 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
@@ -15,6 +15,7 @@
 import com.ruoyi.system.service.config.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -32,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 {
@@ -79,11 +80,18 @@
 
     @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<MgtActivenessListVo>> getActivenessList() {
+        List<MgtActivenessListVo> activenessList = activenessService.getActivenessList();
+        return R.ok(activenessList);
     }
 
     @RequestMapping(value = "/editCooperation", method = RequestMethod.POST)
@@ -249,7 +257,7 @@
     @RequestMapping(value = "/editOtherConfig", method = RequestMethod.POST)
     @Log(title = "其它设置管理", businessType = BusinessType.UPDATE,operContent = "修改其它设置")
     @ApiOperation(value = "修改其它设置")
-    public R editOtherConfig(@RequestBody MgtOtherConfigEditDto mgtOtherConfigEditDto) {
+    public R editOtherConfig(@Validated @RequestBody MgtOtherConfigEditDto mgtOtherConfigEditDto) {
         customConfigService.editOtherConfig(mgtOtherConfigEditDto);
         return R.ok();
     }
@@ -257,7 +265,7 @@
     @RequestMapping(value = "/editShopConfig", method = RequestMethod.POST)
     @Log(title = "其它设置管理", businessType = BusinessType.UPDATE,operContent = "修改合作商配置")
     @ApiOperation(value = "修改合作商配置")
-    public R editShopConfig(@RequestBody MgtShopConfigEditDto mgtShopConfigEditDto) {
+    public R editShopConfig(@Validated @RequestBody MgtShopConfigEditDto mgtShopConfigEditDto) {
         customConfigService.editShopConfig(mgtShopConfigEditDto);
         return R.ok();
     }
@@ -265,7 +273,7 @@
     @RequestMapping(value = "/editMemberConfig", method = RequestMethod.POST)
     @Log(title = "其它设置管理", businessType = BusinessType.UPDATE,operContent = "修改会员配置")
     @ApiOperation(value = "修改会员配置")
-    public R editMemberConfig(@RequestBody MgtMemberConfigEditDto mgtMemberConfigEditDto) {
+    public R editMemberConfig(@Validated @RequestBody MgtMemberConfigEditDto mgtMemberConfigEditDto) {
         customConfigService.editMemberConfig(mgtMemberConfigEditDto);
         return R.ok();
     }
@@ -273,7 +281,7 @@
     @RequestMapping(value = "/editAdvert", method = RequestMethod.POST)
     @Log(title = "其它设置管理", businessType = BusinessType.UPDATE,operContent = "修改广告配置")
     @ApiOperation(value = "修改广告配置")
-    public R editAdvert(@RequestBody MgtAdvertEditDto mgtAdvertEditDto) {
+    public R editAdvert(@Validated @RequestBody MgtAdvertEditDto mgtAdvertEditDto) {
         mgtAdvertEditDto.setUserId(SecurityUtils.getUserId());
         advertService.editMgtAdvert(mgtAdvertEditDto);
         return R.ok();
@@ -325,6 +333,13 @@
         mgtBaseGetDto.setUserId(SecurityUtils.getUserId());
         sysClassificationService.deleteClassification(Long.valueOf(mgtBaseGetDto.getId()));
         return R.ok();
+    }
+
+    @RequestMapping(value = "/listOperTitle", method = RequestMethod.POST)
+    @ApiOperation(value = "获取操作类型列表")
+    public R<List<String>> pageOperLog() {
+        List<String> operTitleList = customConfigService.listOperTitle();
+        return R.ok(operTitleList);
     }
 
     @RequestMapping(value = "/pageOperLog", method = RequestMethod.POST)
@@ -413,6 +428,14 @@
         return R.ok(page.setRecords(mgtArticlePageVoList));
     }
 
+    @RequestMapping(value = "/getArticle", method = RequestMethod.POST)
+    @ApiOperation(value = "获取文章")
+    public R<MgtArticleGetVo> getArticle(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
+        mgtBaseGetDto.setUserId(SecurityUtils.getUserId());
+        MgtArticleGetVo mgtArticleGetVo = articleService.getArticle(Long.valueOf(mgtBaseGetDto.getId()));
+        return R.ok(mgtArticleGetVo);
+    }
+
     @RequestMapping(value = "/editArticle", method = RequestMethod.POST)
     @Log(title = "文章管理", businessType = BusinessType.UPDATE,operContent = "修改文章")
     @ApiOperation(value = "修改文章")
@@ -442,7 +465,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);
     }
 
@@ -473,4 +496,6 @@
         MgtBulletinBoardVo bulletinBoard = customConfigService.getBulletinBoard();
         return R.ok(bulletinBoard);
     }
+
+
 }

--
Gitblit v1.7.1