From 1facfdc9361d888d72c959bac4d8fb05dcad02d7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 07 Jul 2022 18:27:06 +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/AdminColumnController.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java
index 2e35522..fec1746 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java
@@ -4,14 +4,18 @@
import com.xcong.farmer.cms.modules.system.dto.*;
import com.xcong.farmer.cms.modules.system.service.IColumnService;
import com.xcong.farmer.cms.modules.system.vo.AdminColumnVo;
+import com.xcong.farmer.cms.modules.system.vo.AdminSeeColumnInfoVo;
+import com.xcong.farmer.cms.modules.system.vo.WebColumnVo;
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.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
@RestController
@@ -27,7 +31,6 @@
@ApiResponses({@ApiResponse(code = 200, message = "ok", response = AdminColumnVo.class)})
@PostMapping(value = "/columnInPage")
public Result getColumnInPage(@RequestBody @Valid AdminColumnDto adminColumnDto) {
-// log.info("--->{}", SecurityContextHolder.getContext().getAuthentication());
return iColumnService.getColumnInPage(adminColumnDto);
}
@@ -44,13 +47,10 @@
return iColumnService.addColumn(adminAddColumnDto);
}
- @ApiOperation(value = "删除栏目", notes = "删除栏目")
- @GetMapping(value = "/deleteColumn/{id}")
- public Result deleteColumn(@PathVariable(value = "id") Long id) {
- return iColumnService.deleteColumn(id);
- }
-
@ApiOperation(value = "查看栏目", notes = "查看栏目")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = AdminSeeColumnInfoVo.class)
+ })
@GetMapping(value = "/seeColumnInfo/{id}")
public Result seeColumnInfo(@PathVariable(value = "id") Long id) {
return iColumnService.seeColumnInfo(id);
@@ -68,4 +68,17 @@
return iColumnService.delObjs(adminDeleteDto);
}
+ @ApiOperation(value = "发布栏目", notes = "发布栏目")
+ @PostMapping(value = "/release")
+ public Result release(@RequestBody ReleaseColumnDto releaseColumnDto) {
+ return Result.ok("发布成功");
+ }
+
+ @ApiOperation(value = "网页栏目列表", notes = "网页栏目列表")
+ @ApiResponses({@ApiResponse(code = 200, message = "ok", response = WebColumnVo.class)})
+ @GetMapping(value = "/webColumnInList")
+ public Result webColumnInList(HttpServletRequest request) {
+ return iColumnService.getWebColumnInList(request);
+ }
+
}
--
Gitblit v1.9.1