From a981c07d34edd0975b9d556d97c1f851ce79974c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 04 十二月 2024 13:40:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SystemConfigController.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 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 53ff538..8a05bbc 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
@@ -6,6 +6,7 @@
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.StartPageSetDto;
import com.ruoyi.other.service.SystemConfigService;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
@@ -40,7 +41,7 @@
systemConfigService.save(systemConfig);
return R.ok();
}
- @PostMapping("/index/detail")
+ @GetMapping("/index/detail")
@ApiOperation(value = "宣传图片-公司简介", tags = {"后台-广告管理-首页配置","小程序-首页"})
public R<IndexConfigSetDto> detail(){
SystemConfig one = systemConfigService.lambdaQuery().eq(SystemConfig::getType, 2).one();
@@ -65,5 +66,31 @@
return R.ok(one);
}
+ @PostMapping("/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();
+ }
+
+
}
--
Gitblit v1.7.1