From 008ffb622f7e8b941245a4cf19042c7baef39b24 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 21 九月 2026 10:21:32 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java | 71 +++++++++++++++++++++++++++++++----
1 files changed, 63 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 01fa855..a8c5d0d 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
@@ -1,5 +1,6 @@
package com.ruoyi.system.controller.management;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
@@ -7,11 +8,13 @@
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.MGtOneClinkSyncingShopPageDTO;
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.*;
+import com.ruoyi.system.domain.pojo.config.BottomNav;
import com.ruoyi.system.domain.vo.*;
import com.ruoyi.system.service.config.*;
import io.swagger.annotations.Api;
@@ -77,6 +80,12 @@
@Resource
private RecommendCooperationService recommendCooperationService;
+
+ @Resource
+ private BottomNavService bottomNavService;
+
+ @Resource
+ private OneClinkSyncingService oneClinkSyncingService;
@RequestMapping(value = "/getCustomConfig", method = RequestMethod.POST)
@@ -155,7 +164,7 @@
@RequestMapping(value = "/editBanner", method = RequestMethod.POST)
@Log(title = "banner管理", businessType = BusinessType.UPDATE,operContent = "修改banner")
- @ApiOperation(value = "修改banner")
+ @ApiOperation(value = "修改banner【2.0】")
public R editBanner(@RequestBody MgtBannerEditDto mgtBannerEditDto) {
Long userId = SecurityUtils.getUserId();
mgtBannerEditDto.setUserId(userId);
@@ -176,7 +185,7 @@
}
@RequestMapping(value = "/getBanner", method = RequestMethod.POST)
- @ApiOperation(value = "获取banner编辑信息")
+ @ApiOperation(value = "获取banner编辑信息【2.0】")
public R<MgtBannerGetVo> getBanner(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
mgtBaseGetDto.setUserId(userId);
@@ -208,7 +217,7 @@
@RequestMapping(value = "/editPop", method = RequestMethod.POST)
@Log(title = "弹窗管理", businessType = BusinessType.UPDATE,operContent = "修改弹窗广告")
- @ApiOperation(value = "修改弹窗广告")
+ @ApiOperation(value = "修改弹窗广告【2.0】")
public R editPop(@RequestBody MgtPopEditDto mgtPopEditDto) {
Long userId = SecurityUtils.getUserId();
mgtPopEditDto.setUserId(userId);
@@ -217,7 +226,7 @@
}
@RequestMapping(value = "/getPop", method = RequestMethod.POST)
- @ApiOperation(value = "获取弹窗编辑信息")
+ @ApiOperation(value = "获取弹窗编辑信息【2.0】")
public R<MgtPopGetVo> getPop(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
mgtBaseGetDto.setUserId(userId);
@@ -235,6 +244,18 @@
return R.ok();
}
+ @RequestMapping(value = "/getBottomNav", method = RequestMethod.GET)
+ @ApiOperation(value = "获取底部导航栏配置数据【2.0】")
+ public R<List<BottomNav>> getBottomNav() {
+ List<BottomNav> list = bottomNavService.getAllBottomNav();
+ return R.ok(list);
+ }
+ @RequestMapping(value = "/editBottomNav", method = RequestMethod.PUT)
+ @ApiOperation(value = "获取底部导航栏配置数据【2.0】")
+ public R<Void> editBottomNav(@RequestBody BottomNavDto bottomNavDto) {
+ return bottomNavService.editBottomNav(bottomNavDto);
+ }
+
@RequestMapping(value = "/pageQuickEntry", method = RequestMethod.POST)
@ApiOperation(value = "分页获取快速入口")
public R<Page<MgtQuickEntryPageVo>> pageQuickEntry(@RequestBody MgtPageDto mgtPageDto) {
@@ -249,7 +270,7 @@
@RequestMapping(value = "/editQuickEntry", method = RequestMethod.POST)
@Log(title = "快速入口管理", businessType = BusinessType.UPDATE,operContent = "修改快速入口")
- @ApiOperation(value = "修改快速入口")
+ @ApiOperation(value = "修改快速入口【2.0】")
public R editQuickEntry(@RequestBody MgtQuickEntryEditDto mgtQuickEntryEditDto) {
Long userId = SecurityUtils.getUserId();
mgtQuickEntryEditDto.setUserId(userId);
@@ -258,7 +279,7 @@
}
@RequestMapping(value = "/getQuickEntry", method = RequestMethod.POST)
- @ApiOperation(value = "获取快速入口编辑信息")
+ @ApiOperation(value = "获取快速入口编辑信息【2.0】")
public R<MgtQuickEntryGetVo> getQuickEntry(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
mgtBaseGetDto.setUserId(userId);
@@ -347,8 +368,8 @@
@RequestMapping(value = "/pageClassification", method = RequestMethod.POST)
@ApiOperation(value = "分页获取分类列表")
public R<Page<MgtClassificationPageVo>> pageClassification(@RequestBody MgtClassificationPageDto mgtClassificationPageDto) {
- Long userId = SecurityUtils.getUserId();
- mgtClassificationPageDto.setUserId(userId);
+// Long userId = SecurityUtils.getUserId();
+// mgtClassificationPageDto.setUserId(userId);
Page<MgtClassificationPageVo> page = new Page<>();
page.setSize(mgtClassificationPageDto.getPageSize());
page.setCurrent(mgtClassificationPageDto.getPageNum());
@@ -614,5 +635,39 @@
return R.ok(bulletinBoard);
}
+ @RequestMapping(value = "/pageOneClinkSyncing", method = RequestMethod.POST)
+ @ApiOperation(value = "分页获取一键同步【2.0】")
+ public R<IPage<MgtOneClinkSyncPageVO>> pageOneClinkSyncing(@RequestBody MgtOneClinkSyncingPageDTO mgtPageDto) {
+ return R.ok(oneClinkSyncingService.pageOneClinkSyncing(mgtPageDto));
+ }
+
+ @RequestMapping(value = "/editOneClinkSyncing", method = RequestMethod.POST)
+ @Log(title = "一键同步管理", businessType = BusinessType.UPDATE,operContent = "修改一键同步")
+ @ApiOperation(value = "修改一键同步【2.0】")
+ public R editOneClinkSyncing(@RequestBody MgtOneClinkSyncingEditDto dto) {
+ Long userId = SecurityUtils.getUserId();
+ dto.setUserId(userId);
+ return oneClinkSyncingService.editOneClinkSyncing(dto);
+ }
+
+ @RequestMapping(value = "/getOneClinkSyncing", method = RequestMethod.POST)
+ @ApiOperation(value = "获取一键同步信息(查看详情)【2.0】")
+ public R<MgtOneClinkSyncingVO> getOneClinkSyncing(@RequestBody MGtOneClinkSyncingShopPageDTO dto ) {
+ return oneClinkSyncingService.getOneClinkSyncing(dto);
+ }
+
+ @RequestMapping(value = "/deleteOneClinkSyncing", method = RequestMethod.GET)
+ @Log(title = "一键同步管理", businessType = BusinessType.DELETE,operContent = "删除一键同步")
+ @ApiOperation(value = "删除一键同步【2.0】")
+ public R deleteOneClinkSyncing(@RequestParam("syncingId") Integer syncingId ) {
+ return oneClinkSyncingService.deleteOneClinkSyncing(syncingId);
+ }
+
+ @RequestMapping(value = "/executeOneClinkSyncing", method = RequestMethod.GET)
+ @Log(title = "一键同步管理", businessType = BusinessType.UPDATE,operContent = "执行一键同步")
+ @ApiOperation(value = "执行一键同步【2.0】")
+ public R executeOneClinkSyncing(@RequestParam("syncingId") Integer syncingId ) {
+ return oneClinkSyncingService.executeOneClinkSyncing(syncingId);
+ }
}
--
Gitblit v1.7.1