From 45684deea50d27ac78f2a8315bdea50d022e01cb Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 25 七月 2023 19:06:39 +0800
Subject: [PATCH] bug

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java |   63 ++++++++++++++++++++++++++++++-
 1 files changed, 60 insertions(+), 3 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 93f2050..c815f3a 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,6 +8,7 @@
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
+import com.ruoyi.system.api.domain.dto.MgtClassNumDto;
 import com.ruoyi.system.api.domain.dto.MgtPageDto;
 import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
 import com.ruoyi.system.domain.dto.*;
@@ -94,6 +95,14 @@
         return R.ok(activenessList);
     }
 
+    @RequestMapping(value = "/getCooperation", method = RequestMethod.POST)
+    @ApiOperation(value = "获取申请合作")
+    public R<MgtCooperationGetVo> getCooperation() {
+        Long userId = SecurityUtils.getUserId();
+        MgtCooperationGetVo cooperationGetVo = cooperationService.getCooperation();
+        return R.ok(cooperationGetVo);
+    }
+
     @RequestMapping(value = "/editCooperation", method = RequestMethod.POST)
     @Log(title = "申请合作管理", businessType = BusinessType.UPDATE,operContent = "修改申请合作")
     @ApiOperation(value = "修改申请合作")
@@ -111,6 +120,16 @@
         Long userId = SecurityUtils.getUserId();
         mgtServiceMobileEditDto.setUserId(userId);
         customConfigService.editServiceMobile(mgtServiceMobileEditDto);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/editServiceCode", method = RequestMethod.POST)
+    @Log(title = "客服二维码管理", businessType = BusinessType.UPDATE,operContent = "修改客服二维码")
+    @ApiOperation(value = "修改客服二维码")
+    public R editServiceCode(@RequestBody MgtServiceCodeEditDto mgtServiceCodeEditDto) {
+        Long userId = SecurityUtils.getUserId();
+        mgtServiceCodeEditDto.setUserId(userId);
+        customConfigService.editServiceCode(mgtServiceCodeEditDto);
         return R.ok();
     }
 
@@ -335,6 +354,13 @@
         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)
     @ApiOperation(value = "分页获取操作日志")
     public R<Page<MgtOperLogPageVo>> pageOperLog(@RequestBody MgtOperLogPageDto mgtOperLogPageDto) {
@@ -421,12 +447,38 @@
         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 = "修改文章")
     public R editArticle(@RequestBody MgtArticleEditDto mgtArticleEditDto) {
         mgtArticleEditDto.setUserId(SecurityUtils.getUserId());
-        articleService.editMgtArticle(mgtArticleEditDto);
+        Long oldClassId = articleService.editMgtArticle(mgtArticleEditDto);
+        // 创建MgtClassNumDto对象
+        MgtClassNumDto mgtClassNumDto = new MgtClassNumDto();
+        if(mgtArticleEditDto.getArticleId()!=null){
+            // 如果类别ID不为空并且文章的类别ID不为空并且类别ID不同，则设置子类别ID和新增类别ID
+            if (mgtArticleEditDto.getClassId() != null && oldClassId != null
+                    && !mgtArticleEditDto.getClassId().equals(oldClassId)) {
+                mgtClassNumDto.setSubClassId(oldClassId);
+                mgtClassNumDto.setAddClassId(mgtArticleEditDto.getClassId());
+            }
+            // 如果类别ID不为空并且文章的类别ID为空，则设置新增类别ID
+            else if (mgtArticleEditDto.getClassId() != null && oldClassId == null) {
+                mgtClassNumDto.setAddClassId(mgtArticleEditDto.getClassId());
+            }
+        }else{
+            mgtClassNumDto.setAddClassId(mgtArticleEditDto.getClassId());
+        }
+        // 更新类别数量
+        sysClassificationService.changeClassNum(mgtClassNumDto);
         return R.ok();
     }
 
@@ -435,7 +487,12 @@
     @ApiOperation(value = "删除文章")
     public R deleteArticle(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
         mgtBaseGetDto.setUserId(SecurityUtils.getUserId());
-        articleService.deleteArticle(mgtBaseGetDto);
+        Long oldClassId = articleService.deleteArticle(mgtBaseGetDto);
+        if(oldClassId!=null){
+            MgtClassNumDto mgtClassNumDto = new MgtClassNumDto();
+            mgtClassNumDto.setSubClassId(oldClassId);
+            sysClassificationService.changeClassNum(mgtClassNumDto);
+        }
         return R.ok();
     }
 
@@ -450,7 +507,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);
     }
 

--
Gitblit v1.7.1