From 924242a73d62d247f7055ffd0dd86a2700757f5b Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 12 六月 2023 18:06:51 +0800
Subject: [PATCH] 基础配置 管理台联调bug

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java |   74 ++++++++++++++++++++++++++++++++-----
 1 files changed, 64 insertions(+), 10 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 68ef3ed..0386707 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
@@ -8,7 +8,6 @@
 import com.ruoyi.system.domain.dto.*;
 import com.ruoyi.system.domain.vo.*;
 import com.ruoyi.system.service.config.*;
-import com.ruoyi.system.service.sys.ISysOperLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -59,12 +58,23 @@
     private SysClassificationService sysClassificationService;
 
     @Resource
-    private ISysOperLogService operLogService;
-
-    @Resource
     private SysTagService sysTagService;
 
+    @Resource
+    private ArticleService articleService;
 
+    @Resource
+    private RegionService regionService;
+
+
+    @RequestMapping(value = "/getCustomConfig", method = RequestMethod.POST)
+    @ApiOperation(value = "获取单个配置")
+    public R<MgtCustomConfigVo> getCustomConfig(@RequestBody MgtCustomConfigDto mgtCustomConfigDto) {
+        Long userId = SecurityUtils.getUserId();
+        mgtCustomConfigDto.setUserId(userId);
+        MgtCustomConfigVo mgtCustomConfigVo = customConfigService.getCustomConfig(mgtCustomConfigDto);
+        return R.ok(mgtCustomConfigVo);
+    }
 
     @RequestMapping(value = "/editCooperation", method = RequestMethod.POST)
     @ApiOperation(value = "修改申请合作")
@@ -210,11 +220,11 @@
         return R.ok();
     }
 
-    @RequestMapping(value = "/getCustomConfig", method = RequestMethod.POST)
-    @ApiOperation(value = "获取自定义设置")
-    public R<MgtCustomConfigVo> getCustomConfig() {
-        MgtCustomConfigVo mgtCustomConfigVo = customConfigService.getCustomConfig();
-        return R.ok(mgtCustomConfigVo);
+    @RequestMapping(value = "/getAllCustomConfig", method = RequestMethod.POST)
+    @ApiOperation(value = "获取全部自定义设置")
+    public R<MgtAllCustomConfigVo> getAllCustomConfig() {
+        MgtAllCustomConfigVo mgtAllCustomConfigVo = customConfigService.getAllCustomConfig();
+        return R.ok(mgtAllCustomConfigVo);
     }
 
     @RequestMapping(value = "/editOtherConfig", method = RequestMethod.POST)
@@ -228,6 +238,13 @@
     @ApiOperation(value = "修改合作商配置")
     public R editShopConfig(@RequestBody MgtShopConfigEditDto mgtShopConfigEditDto) {
         customConfigService.editShopConfig(mgtShopConfigEditDto);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/editMemberConfig", method = RequestMethod.POST)
+    @ApiOperation(value = "修改合作商配置")
+    public R editMemberConfig(@RequestBody MgtMemberConfigEditDto mgtMemberConfigEditDto) {
+        customConfigService.editMemberConfig(mgtMemberConfigEditDto);
         return R.ok();
     }
 
@@ -300,7 +317,7 @@
     }
 
     @RequestMapping(value = "/editTag", method = RequestMethod.POST)
-    @ApiOperation(value = "修改分类")
+    @ApiOperation(value = "修改标签")
     public R editTag(@RequestBody MgtTagEditDto mgtTagEditDto) {
         mgtTagEditDto.setUserId(SecurityUtils.getUserId());
         sysTagService.editTag(mgtTagEditDto);
@@ -314,4 +331,41 @@
         sysTagService.deleteTag(Long.valueOf(mgtBaseGetDto.getId()));
         return R.ok();
     }
+
+    @RequestMapping(value = "/pageArticle", method = RequestMethod.POST)
+    @ApiOperation(value = "分页获取文章列表")
+    public R<Page<MgtArticlePageVo>> pageArticle(@RequestBody MgtArticlePageDto mgtArticlePageDto) {
+        Long userId = SecurityUtils.getUserId();
+        mgtArticlePageDto.setUserId(userId);
+        Page<MgtArticlePageVo> page = new Page<>();
+        page.setSize(mgtArticlePageDto.getPageSize());
+        page.setCurrent(mgtArticlePageDto.getPageNum());
+        List<MgtArticlePageVo> mgtArticlePageVoList = articleService.pageArticle(page, mgtArticlePageDto);
+        return R.ok(page.setRecords(mgtArticlePageVoList));
+    }
+
+    @RequestMapping(value = "/editArticle", method = RequestMethod.POST)
+    @ApiOperation(value = "修改文章")
+    public R editArticle(@RequestBody MgtArticleEditDto mgtArticleEditDto) {
+        mgtArticleEditDto.setUserId(SecurityUtils.getUserId());
+        articleService.editMgtArticle(mgtArticleEditDto);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/deleteArticle", method = RequestMethod.POST)
+    @ApiOperation(value = "删除文章")
+    public R deleteArticle(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
+        mgtBaseGetDto.setUserId(SecurityUtils.getUserId());
+        articleService.deleteArticle(mgtBaseGetDto);
+        return R.ok();
+    }
+
+
+    @RequestMapping(value = "/listRegion", method = RequestMethod.POST)
+    @ApiOperation(value = "获取省市区列表")
+    public R<List<RegionVo>> listRegion(){
+        List<RegionVo> regionVoList = regionService.listRegionVo();
+        return R.ok(regionVoList);
+    }
+
 }

--
Gitblit v1.7.1