From f9bd4bfa21c1b0e750393cfe29ad95e38cc8d950 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 17 十一月 2022 15:17:33 +0800
Subject: [PATCH] bug
---
ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java | 12 ++++++++----
1 files changed, 8 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 e52aff9..f85e5ab 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
@@ -5,10 +5,9 @@
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
-import com.ycl.common.util.UtilNumber;
+import com.ycl.controller.video.common.util.UtilNumber;
import com.ycl.dto.store.UmsStoreInfoParam;
import com.ycl.entity.store.StoreInfo;
-import com.ycl.entity.video.VideoPoint;
import com.ycl.service.store.StoreInfoService;
import com.ycl.service.video.impl.IVideoPointService;
import com.ycl.vo.store.StoreInfoVO;
@@ -49,6 +48,7 @@
@ApiOperation("鏍规嵁闂ㄥ簵鍚嶇О鍒嗛〉鑾峰彇闂ㄥ簵鍒楄〃鍒楄〃")
@RequestMapping(value = "/list", method = RequestMethod.GET)
@ResponseBody
+ @LogSave(operationType = "闂ㄥ簵绠＄悊", contain = "鏌ヨ闂ㄥ簵")
public CommonResult<CommonPage<StoreInfoVO>> list(@RequestParam(value = "keyword", required = false) String keyword,
@RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize,
@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) {
@@ -59,12 +59,13 @@
@ApiOperation("鏍规嵁id鑾峰彇闂ㄥ簵淇℃伅")
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ResponseBody
- public CommonResult<StoreInfo> getItem(@PathVariable Long id) {
+ @LogSave(operationType = "闂ㄥ簵绠＄悊", contain = "鏌ヨ闂ㄥ簵")
+ public CommonResult<StoreInfoVO> getItem(@PathVariable Long id) {
StoreInfo storeInfo = storeInfoService.getById(id);
StoreInfoVO vo = new StoreInfoVO();
BeanUtils.copyProperties(storeInfo, vo);
vo.setVideoPoint(videoPointService.getById(storeInfo.getVideoId()));
- return CommonResult.success(storeInfo);
+ return CommonResult.success(vo);
}
@ApiOperation(value = "娣诲姞闂ㄥ簵淇℃伅")
@@ -96,6 +97,7 @@
@ApiOperation(value = "鏍规嵁id鍒犻櫎闂ㄥ簵淇℃伅")
@RequestMapping(value = "/delete/{id}", method = RequestMethod.GET)
@ResponseBody
+ @LogSave(operationType = "闂ㄥ簵绠＄悊", contain = "鍒犻櫎闂ㄥ簵")
public CommonResult delete(@PathVariable Long id) {
boolean success = storeInfoService.removeById(id);
if (success) {
@@ -108,6 +110,7 @@
@ApiOperation(value = "淇敼闂ㄥ簵淇℃伅")
@RequestMapping(value = "/update", method = RequestMethod.PUT)
@ResponseBody
+ @LogSave(operationType = "闂ㄥ簵绠＄悊", contain = "淇敼闂ㄥ簵")
public CommonResult update(@RequestBody StoreInfo storeInfo) {
boolean success = storeInfoService.updateById(storeInfo);
if (success) {
@@ -120,6 +123,7 @@
@ApiOperation(value = "鏍规嵁excel妯℃澘鎵归噺瀵煎叆闂ㄥ簵淇℃伅")
@RequestMapping(value = "/add/excel", method = RequestMethod.POST)
@ResponseBody
+ @LogSave(operationType = "闂ㄥ簵绠＄悊", contain = "瀵煎叆闂ㄥ簵")
public CommonResult addByExcel(MultipartFile file) {
boolean success = storeInfoService.addByExcel(file);
if (success) {
--
Gitblit v1.8.0