From efe79e640c4598f52c2d1032fcead000edf8049e Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 28 六月 2023 10:29:53 +0800
Subject: [PATCH] 统计bug和验证优化
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 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 84f82cb..ef3fbf3 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
@@ -4,6 +4,8 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.log.annotation.Log;
+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.MgtPageDto;
@@ -13,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;
@@ -85,6 +88,7 @@
}
@RequestMapping(value = "/editCooperation", method = RequestMethod.POST)
+ @Log(title = "申请合作管理", businessType = BusinessType.UPDATE,operContent = "修改申请合作")
@ApiOperation(value = "修改申请合作")
public R editCooperation(@RequestBody MgtCooperationEditDto mgtCooperationEditDto) {
Long userId = SecurityUtils.getUserId();
@@ -94,6 +98,7 @@
}
@RequestMapping(value = "/editServiceMobile", method = RequestMethod.POST)
+ @Log(title = "客服电话管理", businessType = BusinessType.UPDATE,operContent = "修改客服电话")
@ApiOperation(value = "修改客服电话")
public R editServiceMobile(@RequestBody MgtServiceMobileEditDto mgtServiceMobileEditDto) {
Long userId = SecurityUtils.getUserId();
@@ -103,6 +108,7 @@
}
@RequestMapping(value = "/editAgreement", method = RequestMethod.POST)
+ @Log(title = "协议管理", businessType = BusinessType.UPDATE,operContent = "修改协议")
@ApiOperation(value = "修改协议")
public R editAgreement(@RequestBody MgtAgreementEditDto mgtAgreementEditDto) {
Long userId = SecurityUtils.getUserId();
@@ -112,6 +118,7 @@
}
@RequestMapping(value = "/editBanner", method = RequestMethod.POST)
+ @Log(title = "banner管理", businessType = BusinessType.UPDATE,operContent = "修改banner")
@ApiOperation(value = "修改banner")
public R editBanner(@RequestBody MgtBannerEditDto mgtBannerEditDto) {
Long userId = SecurityUtils.getUserId();
@@ -142,6 +149,7 @@
}
@RequestMapping(value = "/deleteBanner", method = RequestMethod.POST)
+ @Log(title = "banner管理", businessType = BusinessType.DELETE,operContent = "删除banner")
@ApiOperation(value = "删除banner")
public R deleteBanner(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
@@ -163,6 +171,7 @@
}
@RequestMapping(value = "/editPop", method = RequestMethod.POST)
+ @Log(title = "弹窗管理", businessType = BusinessType.UPDATE,operContent = "修改弹窗广告")
@ApiOperation(value = "修改弹窗广告")
public R editPop(@RequestBody MgtPopEditDto mgtPopEditDto) {
Long userId = SecurityUtils.getUserId();
@@ -181,6 +190,7 @@
}
@RequestMapping(value = "/deletePop", method = RequestMethod.POST)
+ @Log(title = "弹窗管理", businessType = BusinessType.DELETE,operContent = "删除弹窗广告")
@ApiOperation(value = "删除弹窗广告")
public R deletePop(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
@@ -202,6 +212,7 @@
}
@RequestMapping(value = "/editQuickEntry", method = RequestMethod.POST)
+ @Log(title = "快速入口管理", businessType = BusinessType.UPDATE,operContent = "修改快速入口")
@ApiOperation(value = "修改快速入口")
public R editQuickEntry(@RequestBody MgtQuickEntryEditDto mgtQuickEntryEditDto) {
Long userId = SecurityUtils.getUserId();
@@ -220,6 +231,7 @@
}
@RequestMapping(value = "/deleteQuickEntry", method = RequestMethod.POST)
+ @Log(title = "快速入口管理", businessType = BusinessType.DELETE,operContent = "删除快速入口")
@ApiOperation(value = "删除快速入口")
public R deleteQuickEntry(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
@@ -236,35 +248,40 @@
}
@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();
}
@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();
}
@RequestMapping(value = "/editMemberConfig", method = RequestMethod.POST)
- @ApiOperation(value = "修改合作商配置")
- public R editMemberConfig(@RequestBody MgtMemberConfigEditDto mgtMemberConfigEditDto) {
+ @Log(title = "其它设置管理", businessType = BusinessType.UPDATE,operContent = "修改会员配置")
+ @ApiOperation(value = "修改会员配置")
+ public R editMemberConfig(@Validated @RequestBody MgtMemberConfigEditDto mgtMemberConfigEditDto) {
customConfigService.editMemberConfig(mgtMemberConfigEditDto);
return R.ok();
}
@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();
}
@RequestMapping(value = "/editActiveness", method = RequestMethod.POST)
+ @Log(title = "其它设置管理", businessType = BusinessType.UPDATE,operContent = "修改活跃度")
@ApiOperation(value = "修改活跃度")
public R editActiveness(@RequestBody MgtActivenessEditDto mgtActivenessEditDto) {
mgtActivenessEditDto.setUserId(SecurityUtils.getUserId());
@@ -273,6 +290,7 @@
}
@RequestMapping(value = "/deleteActiveness", method = RequestMethod.POST)
+ @Log(title = "其它设置管理", businessType = BusinessType.DELETE,operContent = "删除活跃度")
@ApiOperation(value = "删除活跃度")
public R deleteMgtActiveness(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
mgtBaseGetDto.setUserId(SecurityUtils.getUserId());
@@ -293,6 +311,7 @@
}
@RequestMapping(value = "/editClassification", method = RequestMethod.POST)
+ @Log(title = "分类管理", businessType = BusinessType.UPDATE,operContent = "修改分类")
@ApiOperation(value = "修改分类")
public R editClassification(@RequestBody MgtClassificationEditDto mgtClassificationEditDto) {
mgtClassificationEditDto.setUserId(SecurityUtils.getUserId());
@@ -301,6 +320,7 @@
}
@RequestMapping(value = "/deleteClassification", method = RequestMethod.POST)
+ @Log(title = "分类管理", businessType = BusinessType.DELETE,operContent = "删除分类")
@ApiOperation(value = "删除分类")
public R deleteClassification(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
mgtBaseGetDto.setUserId(SecurityUtils.getUserId());
@@ -345,6 +365,7 @@
return R.ok(page.setRecords(mgtTagPageVoList));
}
+ @ApiOperation(value = "导入标签")
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file, Integer tagType) throws Exception
{
@@ -355,6 +376,7 @@
return success(message);
}
+ @ApiOperation(value = "下载标签模板")
@PostMapping("/importTemplate")
public void importTemplate(HttpServletResponse response) throws IOException
{
@@ -363,6 +385,7 @@
}
@RequestMapping(value = "/editTag", method = RequestMethod.POST)
+ @Log(title = "标签管理", businessType = BusinessType.UPDATE,operContent = "修改标签")
@ApiOperation(value = "修改标签")
public R editTag(@RequestBody MgtTagEditDto mgtTagEditDto) {
mgtTagEditDto.setUserId(SecurityUtils.getUserId());
@@ -371,6 +394,7 @@
}
@RequestMapping(value = "/deleteTag", method = RequestMethod.POST)
+ @Log(title = "标签管理", businessType = BusinessType.DELETE,operContent = "删除标签")
@ApiOperation(value = "删除标签")
public R deleteTag(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
mgtBaseGetDto.setUserId(SecurityUtils.getUserId());
@@ -391,6 +415,7 @@
}
@RequestMapping(value = "/editArticle", method = RequestMethod.POST)
+ @Log(title = "文章管理", businessType = BusinessType.UPDATE,operContent = "修改文章")
@ApiOperation(value = "修改文章")
public R editArticle(@RequestBody MgtArticleEditDto mgtArticleEditDto) {
mgtArticleEditDto.setUserId(SecurityUtils.getUserId());
@@ -399,6 +424,7 @@
}
@RequestMapping(value = "/deleteArticle", method = RequestMethod.POST)
+ @Log(title = "文章管理", businessType = BusinessType.DELETE,operContent = "删除文章")
@ApiOperation(value = "删除文章")
public R deleteArticle(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
mgtBaseGetDto.setUserId(SecurityUtils.getUserId());
@@ -434,7 +460,8 @@
}
@RequestMapping(value = "/allotRecommend", method = RequestMethod.POST)
- @ApiOperation(value = "删除文章")
+ @Log(title = "分配管理", businessType = BusinessType.UPDATE,operContent = "分配推荐")
+ @ApiOperation(value = "分配推荐")
public R allotRecommend(@RequestBody MgtAllotRecommendDto mgtAllotRecommendDto) {
mgtAllotRecommendDto.setUserId(SecurityUtils.getUserId());
recommendCooperationService.allotRecommend(mgtAllotRecommendDto);
--
Gitblit v1.7.1