From 6135a57d6c74ca1707ab064ddf6dc7c86f4a041e Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 12 Jul 2022 11:58:03 +0800 Subject: [PATCH] fix --- src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 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 236057e..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,17 +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 @@ -24,6 +29,9 @@ @Resource private IColumnService iColumnService; + + @Autowired + private IReleaseService releaseService; @ApiOperation(value = "栏目分页列表", notes = "栏目分页列表") @ApiResponses({@ApiResponse(code = 200, message = "ok", response = AdminColumnVo.class)}) @@ -68,8 +76,17 @@ @ApiOperation(value = "发布栏目", notes = "发布栏目") @PostMapping(value = "/release") - public Result release(@RequestBody ReleaseColumnDto releaseColumnDto) { + 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