From 6eafa7a583199dff1c42bb3cef8f1dc6b6d7f98a Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 13 十月 2023 10:06:59 +0800 Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev --- server/platform/src/main/java/com/doumee/api/business/BaseParamController.java | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/server/platform/src/main/java/com/doumee/api/business/BaseParamController.java b/server/platform/src/main/java/com/doumee/api/business/BaseParamController.java index 1afb6df..7cd7f8a 100644 --- a/server/platform/src/main/java/com/doumee/api/business/BaseParamController.java +++ b/server/platform/src/main/java/com/doumee/api/business/BaseParamController.java @@ -1,14 +1,18 @@ package com.doumee.api.business; import com.doumee.api.BaseController; +import com.doumee.core.annotation.LoginRequired; import com.doumee.core.annotation.excel.ExcelExporter; import com.doumee.core.annotation.pr.PreventRepeat; +import com.doumee.core.constants.Constants; import com.doumee.core.model.ApiResponse; import com.doumee.core.model.PageWrap; import com.doumee.core.model.PageData; import com.doumee.dao.business.model.BaseParam; import com.doumee.service.business.BaseParamService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -35,7 +39,7 @@ @ApiOperation("鏂板缓") @PostMapping("/create") @RequiresPermissions("business:baseparam:create") - public ApiResponse create(@RequestBody @Validated BaseParam baseParam) { + public ApiResponse create(@RequestBody BaseParam baseParam) { return ApiResponse.success(baseParamService.create(baseParam)); } @@ -88,4 +92,17 @@ public ApiResponse findById(@PathVariable String id) { return ApiResponse.success(baseParamService.findById(id)); } + + @ApiOperation("鍩虹閰嶇疆鏁版嵁") + @GetMapping("/baseParamList") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "绫诲瀷 0杞﹁締鎶ヤ慨鍘熷洜 1寮哄埗杩樿溅鍘熷洜 2鏃堕暱鍑忓厤鍘熷洜 3鍗曡溅绫诲瀷", required = true) + }) + public ApiResponse<List<BaseParam>> baseParamList (@RequestParam Integer type) { + BaseParam baseParam = new BaseParam(); + baseParam.setIsdeleted(Constants.ZERO); + baseParam.setStatus(Constants.ZERO); + baseParam.setType(type); + return ApiResponse.success(baseParamService.findList(baseParam)); + } } -- Gitblit v1.9.3