From 3a8d8b6de6daf6e7198a2b8d562dc2fbf49a4a2a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 12 Jul 2022 11:47:45 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminWebSetController.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminWebSetController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminWebSetController.java
index 22e733e..9016746 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminWebSetController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminWebSetController.java
@@ -1,10 +1,15 @@
package com.xcong.farmer.cms.modules.system.controller;
import com.xcong.farmer.cms.common.response.Result;
-import com.xcong.farmer.cms.modules.system.dto.AdminUpdateWebSetDto;
-import com.xcong.farmer.cms.modules.system.service.IWebSetService;
+import com.xcong.farmer.cms.modules.system.dto.SetWebSettingDto;
+import com.xcong.farmer.cms.modules.system.service.IReleaseService;
+import com.xcong.farmer.cms.modules.system.service.IWebSettingService;
+import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
+import com.xcong.farmer.cms.modules.system.vo.AdminSeeWebSetInfoVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -18,17 +23,31 @@
public class AdminWebSetController {
@Resource
- private IWebSetService iWebSetService;
+ private IWebSettingService iWebSetService;
+
+ @Resource
+ private IReleaseService releaseService;
@ApiOperation(value = "查看网页设置", notes = "查看网页设置")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = AdminSeeWebSetInfoVo.class)
+ })
@GetMapping(value = "/seeWebSetInfo")
public Result seeWebSetInfo() {
- return iWebSetService.seeWebSetInfo();
+ return iWebSetService.getWebSetting();
}
@ApiOperation(value = "更新网页设置", notes = "更新网页设置")
@PostMapping(value = "/updateWebSet")
- public Result updateWebSet(@RequestBody @Valid AdminUpdateWebSetDto adminUpdateWebSetDto) {
- return iWebSetService.updateWebSet(adminUpdateWebSetDto);
+ public Result updateWebSet(@RequestBody @Valid SetWebSettingDto setWebSettingDto) {
+ return iWebSetService.setWebSetting(setWebSettingDto);
+ }
+
+ @ApiOperation(value = "发布全站", notes = "发布全站")
+ @PostMapping(value = "/releaseAll")
+ public Result releaseAll() {
+ Long companyId = LoginUserUtil.getCompanyId();
+ releaseService.releaseAll(companyId);
+ return Result.ok("发布成功");
}
}
--
Gitblit v1.9.1