From 257d66798aa538f8737980f13d94c547bf0b51ea Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 15 一月 2025 15:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SystemConfigController.java | 90 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 84 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SystemConfigController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SystemConfigController.java
index 5ae1bc6..b050e55 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SystemConfigController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SystemConfigController.java
@@ -1,14 +1,19 @@
package com.ruoyi.other.controller;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.SystemConfig;
+import com.ruoyi.other.api.dto.IndexConfigSetDto;
+import com.ruoyi.other.api.dto.LogisticsSetDto;
+import com.ruoyi.other.api.dto.StartPageSetDto;
import com.ruoyi.other.service.SystemConfigService;
import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -23,11 +28,28 @@
public class SystemConfigController {
@Resource
private SystemConfigService systemConfigService;
- @GetMapping("/byType")
- @ApiOperation(value = "1=启动页管理，2=首页配置，3=订单包邮设置", tags = {"小程序-启动页面","小程序-首页","订单包邮配置"})
- public R<SystemConfig> byType(Integer type){
- SystemConfig one = systemConfigService.lambdaQuery().eq(SystemConfig::getType, type).last("limit 1").one();
- return R.ok(one);
+ @PostMapping("/index/add")
+ @ApiOperation(value = "广告管理-首页配置-添加", tags = {"管理后台"})
+ public R add(@RequestBody IndexConfigSetDto indexConfigSetDto){
+ //先删除type=2的数据
+ List<SystemConfig> list = systemConfigService.lambdaQuery().eq(SystemConfig::getType, 2).list();
+ systemConfigService.removeBatchByIds(list);
+ SystemConfig systemConfig = new SystemConfig();
+ systemConfig.setType(2);
+ systemConfig.setContent(JSON.toJSONString(indexConfigSetDto));
+ systemConfigService.save(systemConfig);
+ return R.ok();
+ }
+ @GetMapping("/index/detail")
+ @ApiOperation(value = "广告管理-首页配置-宣传图片-公司简介", tags = {"管理后台","小程序-首页"})
+ public R<IndexConfigSetDto> detail(){
+ SystemConfig one = systemConfigService.lambdaQuery().eq(SystemConfig::getType, 2).one();
+ if (one==null){
+ return R.ok();
+ }
+ IndexConfigSetDto indexConfigSetDto = JSONObject.parseObject(one.getContent(), IndexConfigSetDto.class);
+ return R.ok(indexConfigSetDto);
+
}
@@ -42,5 +64,61 @@
SystemConfig one = systemConfigService.lambdaQuery().eq(SystemConfig::getType, type).last("limit 1").one();
return R.ok(one);
}
+
+ @GetMapping("/index/start")
+ @ApiOperation(value = "宣传图片-公司简介", tags = {"小程序-启动页"})
+ public R<StartPageSetDto> indexstart(){
+ SystemConfig one = systemConfigService.lambdaQuery().eq(SystemConfig::getType, 1).one();
+ if (one==null){
+ return R.ok();
+ }
+ StartPageSetDto indexConfigSetDto = JSONObject.parseObject(one.getContent(), StartPageSetDto.class);
+ return R.ok(indexConfigSetDto);
+
+ }
+
+ @PostMapping("/startPage/add")
+ @ApiOperation(value = "广告管理-启动页管理-添加", tags = {"管理后台"})
+ public R startPageadd(@RequestBody StartPageSetDto startPageSetDto){
+ //先删除type=1的数据
+ List<SystemConfig> list = systemConfigService.lambdaQuery().eq(SystemConfig::getType, 1).list();
+ systemConfigService.removeBatchByIds(list);
+ SystemConfig systemConfig = new SystemConfig();
+ systemConfig.setType(1);
+ systemConfig.setContent(JSON.toJSONString(startPageSetDto));
+ systemConfigService.save(systemConfig);
+ return R.ok();
+ }
+
+ /**
+ * 订单包邮设置
+ */
+ @PostMapping("/logistics/add")
+ @ApiOperation(value = "添加", tags = {"管理后台-商品管理-订单包邮设置"})
+ public R add(@RequestBody LogisticsSetDto logisticsSetDto){
+ List<SystemConfig> list = systemConfigService.lambdaQuery().eq(SystemConfig::getType, 3).list();
+ systemConfigService.removeBatchByIds(list);
+ SystemConfig systemConfig = new SystemConfig();
+ systemConfig.setType(3);
+ systemConfig.setContent(JSON.toJSONString(logisticsSetDto));
+ systemConfigService.save(systemConfig);
+ return R.ok();
+ }
+
+ /**
+ * 获取订单包邮设置
+ */
+ @GetMapping("/logistics/detail")
+ @ApiOperation(value = "订单包邮设置", tags = {"管理后台-商品管理-订单包邮设置"})
+ public R<LogisticsSetDto> logisticsDetail(){
+ SystemConfig one = systemConfigService.lambdaQuery().eq(SystemConfig::getType, 3).one();
+ if (one==null){
+ return R.ok();
+ }
+ LogisticsSetDto logisticsSetDto = JSONObject.parseObject(one.getContent(), LogisticsSetDto.class);
+ return R.ok(logisticsSetDto);
+ }
+
+
}
--
Gitblit v1.7.1