From 2432594a4d11b47a503795349defa31872f85789 Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期三, 04 十二月 2024 12:33:39 +0800 Subject: [PATCH] 操作日志 --- src/main/java/com/mzl/flower/web/flower/FlowerMarkupPsController.java | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/mzl/flower/web/flower/FlowerMarkupPsController.java b/src/main/java/com/mzl/flower/web/flower/FlowerMarkupPsController.java index a9a441c..48cf2cf 100644 --- a/src/main/java/com/mzl/flower/web/flower/FlowerMarkupPsController.java +++ b/src/main/java/com/mzl/flower/web/flower/FlowerMarkupPsController.java @@ -4,8 +4,10 @@ import com.mzl.flower.base.BaseController; import com.mzl.flower.base.R; import com.mzl.flower.base.ReturnDataDTO; +import com.mzl.flower.base.annotation.OperationLog; import com.mzl.flower.dto.request.flower.*; import com.mzl.flower.dto.response.flower.*; +import com.mzl.flower.entity.log.OperationRecord; import com.mzl.flower.service.flower.FlowerMarkupPsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -16,6 +18,9 @@ import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; @RestController @RequestMapping("/api/flower/markup/ps") @@ -50,16 +55,20 @@ } @PostMapping("/spcg/list/save/batch") + @OperationLog(value = "批量新增商品分类加价", type = "markup_s_p") @ApiOperation(value = "批量新增商品分类加价") - public ResponseEntity<ReturnDataDTO> saveMarkupSpCgBatch(@RequestBody FlowerMarkupPsSpCgBatchSaveDTO dto) { - psService.saveMarkupSpCgBatch(dto); - return returnData(R.SUCCESS.getCode(), null); + public ResponseEntity<ReturnDataDTO> saveMarkupSpCgBatch(@RequestBody FlowerMarkupPsSpCgBatchSaveDTO dto, HttpServletRequest request) throws IOException { + psService.saveMarkupSpCgBatch(dto,request); + String content = "批量新增商品分类加价:商品分类Id:【" + dto.getCategoryId() + "】,A级:【"+dto.getLevelA()+"】,B级:【" + dto.getLevelB() + "】,C级:【" + dto.getLevelC() + "】" + + ",D级:【"+dto.getLevelD()+"】,E级:【" + dto.getLevelE() + "】,O级:【" + dto.getLevelO() + "】"; + OperationRecord operationRecord = getOperationRecord(content); + return returnData(R.SUCCESS.getCode(), null,operationRecord); } @PostMapping("/spcg/list/save") @ApiOperation(value = "新增商品分类加价") - public ResponseEntity<ReturnDataDTO> saveMarkupSpCg(@RequestBody FlowerMarkupPsSpCgSaveDTO dto) { - psService.saveMarkupSpCg(dto); + public ResponseEntity<ReturnDataDTO> saveMarkupSpCg(@RequestBody FlowerMarkupPsSpCgSaveDTO dto,HttpServletRequest request) throws IOException { + psService.saveMarkupSpCg(dto,request); return returnData(R.SUCCESS.getCode(), null); } @@ -81,6 +90,7 @@ } @GetMapping("/spcg/list/delete") + @OperationLog(value = "删除商品分类加价", type = "markup_s_p") @ApiOperation(value = "删除商品分类加价") @ApiImplicitParams({ @ApiImplicitParam(name = "partnerId", value = "合伙人id", required = true, dataType = "Long", paramType = "query"), @@ -88,13 +98,15 @@ }) public ResponseEntity<ReturnDataDTO<?>> deleteMarkupSpCg(Long partnerId, Long categoryId){ psService.deleteMarkupSpCg(partnerId, categoryId); - return returnData(R.SUCCESS.getCode(), null); + String content = "删除商品分类加价:合伙人id:【" + partnerId + "】,商品分类id:【"+categoryId+"】"; + OperationRecord operationRecord = getOperationRecord(content); + return returnData(R.SUCCESS.getCode(), null,operationRecord); } @PostMapping("/sp/list/save") @ApiOperation(value = "新增商品加价") - public ResponseEntity<ReturnDataDTO> saveMarkupSp(@RequestBody FlowerMarkupPsSpSaveDTO dto) { - psService.saveMarkupSp(dto); + public ResponseEntity<ReturnDataDTO> saveMarkupSp(@RequestBody FlowerMarkupPsSpSaveDTO dto,HttpServletRequest request) throws IOException { + psService.saveMarkupSp(dto,request); return returnData(R.SUCCESS.getCode(), null); } -- Gitblit v1.9.3