From e1008dbb1fa76874a28c06913b95c16d18acdfa7 Mon Sep 17 00:00:00 2001 From: wl <173@qq.com> Date: 星期五, 11 十一月 2022 17:54:52 +0800 Subject: [PATCH] 短信模块 消息列表 --- ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java index 4af016d..5470875 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java @@ -2,15 +2,18 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ycl.annotation.LogSave; import com.ycl.api.CommonPage; import com.ycl.api.CommonResult; -import com.ycl.common.util.UtilNumber; -import com.ycl.dto.UmsStoreInfoParam; +import com.ycl.controller.video.common.util.UtilNumber; +import com.ycl.dto.store.UmsStoreInfoParam; import com.ycl.entity.store.StoreInfo; import com.ycl.service.store.StoreInfoService; +import com.ycl.service.video.impl.IVideoPointService; import com.ycl.vo.store.StoreInfoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -34,6 +37,10 @@ UtilNumber utilNumber; @Autowired + private IVideoPointService videoPointService; + + + @Autowired public void setUmsStoreInfoService(StoreInfoService umsStoreInfoService) { this.storeInfoService = umsStoreInfoService; } @@ -51,14 +58,18 @@ @ApiOperation("鏍规嵁id鑾峰彇闂ㄥ簵淇℃伅") @RequestMapping(value = "/{id}", method = RequestMethod.GET) @ResponseBody - public CommonResult<StoreInfo> getItem(@PathVariable Long id) { + public CommonResult<StoreInfoVO> getItem(@PathVariable Long id) { StoreInfo storeInfo = storeInfoService.getById(id); - return CommonResult.success(storeInfo); + StoreInfoVO vo = new StoreInfoVO(); + BeanUtils.copyProperties(storeInfo, vo); + vo.setVideoPoint(videoPointService.getById(storeInfo.getVideoId())); + return CommonResult.success(vo); } @ApiOperation(value = "娣诲姞闂ㄥ簵淇℃伅") @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody + @LogSave(operationType = "闂ㄥ簵绠$悊", contain = "娣诲姞闂ㄥ簵") public CommonResult<StoreInfo> add(@Validated @RequestBody UmsStoreInfoParam umsStoreInfoParam) { StoreInfo storeInfo = StoreInfo.builder() .owner(umsStoreInfoParam.getOwner()) @@ -71,6 +82,7 @@ .storeScore(umsStoreInfoParam.getStorescore()) .type(umsStoreInfoParam.getType()) .description(umsStoreInfoParam.getDescription()) + .videoId(umsStoreInfoParam.getVideoId()) .build(); boolean success = storeInfoService.save(storeInfo); if (success) { -- Gitblit v1.8.0