From af96af3a47e4e05764c426bddc03dbd5c9e58426 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 08 Jul 2022 17:24:36 +0800
Subject: [PATCH] fix:栏目发布

---
 src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java |   35 ++++++++++++++++++++++++++++-------
 1 files changed, 28 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..c90acb6 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
@@ -3,15 +3,22 @@
 import com.xcong.farmer.cms.common.response.Result;
 import com.xcong.farmer.cms.modules.system.dto.*;
 import com.xcong.farmer.cms.modules.system.service.IColumnService;
+import com.xcong.farmer.cms.modules.system.service.IReleaseService;
+import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
 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.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
 @RestController
@@ -23,11 +30,13 @@
     @Resource
     private IColumnService iColumnService;
 
+    @Autowired
+    private IReleaseService releaseService;
+
     @ApiOperation(value = "栏目分页列表", notes = "栏目分页列表")
     @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 +53,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 +74,19 @@
         return iColumnService.delObjs(adminDeleteDto);
     }
 
+    @ApiOperation(value = "发布栏目", notes = "发布栏目")
+    @PostMapping(value = "/release")
+    public Result release(@RequestBody @Valid ReleaseColumnDto releaseColumnDto) {
+        Long companyId = LoginUserUtil.getCompanyId();
+        releaseService.releaseColumn(releaseColumnDto.getId(), releaseColumnDto.getType(), companyId);
+        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