From e23b94bb04b0e5dbc4912add143cf1bf472c70f5 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 15 九月 2023 17:47:43 +0800 Subject: [PATCH] 基础字段 --- server/company/src/main/java/com/doumee/api/business/CategoryController.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/server/company/src/main/java/com/doumee/api/business/CategoryController.java b/server/company/src/main/java/com/doumee/api/business/CategoryController.java index d3544d1..c167c2c 100644 --- a/server/company/src/main/java/com/doumee/api/business/CategoryController.java +++ b/server/company/src/main/java/com/doumee/api/business/CategoryController.java @@ -3,13 +3,22 @@ import com.doumee.api.BaseController; import com.doumee.core.annotation.excel.ExcelExporter; import com.doumee.core.annotation.pr.PreventRepeat; +import com.doumee.core.constants.ResponseStatus; +import com.doumee.core.exception.BusinessException; import com.doumee.core.model.ApiResponse; +import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; +import com.doumee.core.utils.Constants; +import com.doumee.dao.business.model.BaseCateParam; +import com.doumee.dao.business.model.BaseCategory; import com.doumee.dao.business.model.Category; +import com.doumee.service.business.BaseCateParamService; +import com.doumee.service.business.BaseCategoryService; import com.doumee.service.business.CategoryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import lombok.extern.java.Log; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -17,6 +26,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * @author 姹熻箘韫� @@ -29,6 +39,12 @@ @Autowired private CategoryService categoryService; + + @Autowired + private BaseCategoryService baseCategoryService; + + @Autowired + private BaseCateParamService baseCateParamService; @PreventRepeat @ApiOperation("鏂板缓") @@ -88,6 +104,8 @@ @PostMapping("/page") @RequiresPermissions("business:category:query") public ApiResponse<PageData<Category>> findPage (@RequestBody PageWrap<Category> pageWrap) { + LoginUserInfo loginUserInfo = this.getLoginUser(); + pageWrap.getModel().setCompanyId(loginUserInfo.getCompanyId()); return ApiResponse.success(categoryService.findPage(pageWrap)); } @@ -132,4 +150,33 @@ return ApiResponse.success(categoryService.companyFindList(category)); } + @ApiOperation("骞冲彴鍒嗙被鍒楄〃") + @PostMapping("/baseCategoryList") + public ApiResponse<List<BaseCategory>> baseCategoryList () { + BaseCategory baseCategory = new BaseCategory(); + baseCategory.setIsdeleted(Constants.ZERO); + baseCategory.setStatus(Constants.ZERO); + baseCategoryService.findList(baseCategory); + List list = baseCategoryService.findList(baseCategory); + return ApiResponse.success(list); + } + + @ApiOperation("骞冲彴鍒嗙被璇︽儏") + @GetMapping("/baseCategoryDetail") + public ApiResponse<BaseCategory> baseCategoryDetail (Integer baseCategoryId) { + + BaseCategory baseCategory = baseCategoryService.findById(baseCategoryId); + if(Objects.isNull(baseCategory)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + BaseCateParam baseCateParam = new BaseCateParam(); + baseCateParam.setIsdeleted(Constants.ZERO); + baseCateParam.setStatus(Constants.ZERO); + baseCateParam.setCategoryId(baseCategoryId); + baseCategory.setBaseCateParamList( + baseCateParamService.findList(baseCateParam) + ); + return ApiResponse.success(baseCategory); + } + } -- Gitblit v1.9.3