From 948b700ff39a9d11dc5e7870d605737857c2ceb8 Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期四, 14 三月 2024 09:39:53 +0800 Subject: [PATCH] 修改 --- modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java index 6d60d9e..a8ad858 100644 --- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java +++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java @@ -12,9 +12,11 @@ import com.zt.common.validator.group.AddGroup; import com.zt.common.validator.group.DefaultGroup; import com.zt.common.validator.group.UpdateGroup; +import com.zt.life.modules.mainPart.basicInfo.model.ProductImg; import com.zt.life.modules.mainPart.basicInfo.model.TyProductModel; import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel; import com.zt.life.modules.mainPart.basicInfo.service.XhProductModelService; +import com.zt.life.modules.sysPictureBase.model.SysPictureBase; import com.zt.life.modules.sysPictureBase.service.SysPictureBaseService; import com.zt.modules.oss.service.SysOssService; import io.swagger.annotations.Api; @@ -52,16 +54,14 @@ @GetMapping("page") @ApiOperation("鍒嗛〉") @ApiImplicitParams({ - @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT), - @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT), @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING), @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING), @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = Constant.QT.STRING, format = "NAME^LK"), @ApiImplicitParam(name = "nodeType", value = "鑺傜偣绫诲瀷", dataType = Constant.QT.STRING, format = "node_type^EQ"), @ApiImplicitParam(name = "pid", value = "涓婄骇ID", dataType = Constant.QT.STRING) }) - public PageResult<XhProductModel> page(@ApiIgnore @QueryParam QueryFilter queryFilter){ - return PageResult.ok(xhProductModelService.page(queryFilter)); + public Result<List<XhProductModel>> page(@ApiIgnore @QueryParam QueryFilter queryFilter){ + return Result.ok(xhProductModelService.page(queryFilter)); } @GetMapping("tree") @@ -71,6 +71,14 @@ return Result.ok(list); } + @GetMapping("getProduct") + public Result<List<ProductImg>> getProduct(Long productId) { + + List<ProductImg> list = xhProductModelService.getProduct(productId); + + return Result.ok(list); + } + @GetMapping("{id}") @ApiOperation("淇℃伅") public Result<XhProductModel> get(@PathVariable("id") Long id){ -- Gitblit v1.9.1