From e2f92f6747b767ae6221757d2172bd547544b6e3 Mon Sep 17 00:00:00 2001 From: gongquanlin <1025081659@qq.com> Date: Wed, 29 Mar 2023 08:18:04 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=92=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E4=BD=8D=E7=BD=AE=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CommodityController.java | 10 ++++++++-- .../model/dto/QueryModifyLogResultDTO.java | 18 ++++++++++++++++++ .../service/CommodityCodeModifyLogService.java | 3 ++- .../CommodityCodeModifyLogServiceImpl.java | 11 +++++++++-- 4 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/dto/QueryModifyLogResultDTO.java diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java index 7f2fcd06..997de1e9 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java @@ -4,8 +4,10 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeModifyLog; import com.dxhy.order.baseservice.module.commodity.model.dto.QueryModifyLogDTO; +import com.dxhy.order.baseservice.module.commodity.model.dto.QueryModifyLogResultDTO; import com.dxhy.order.baseservice.module.commodity.service.CommodityCodeModifyLogService; import com.dxhy.order.constant.*; import com.dxhy.order.model.CommodityCodeCheckQuery; @@ -672,8 +674,12 @@ public class CommodityController { @PostMapping("/modifyLog") public R modifyLog(@RequestBody QueryModifyLogDTO dto) { try { - PageUtils pageUtil = commodityCodeModifyLogService.queryPage(dto); - return R.ok().put("page", pageUtil); + QueryModifyLogResultDTO resp = commodityCodeModifyLogService.queryPage(dto); + PageUtils pageUtil = resp.getPageUtils(); + JSONObject respJson = JSONObject.parseObject(JSONObject.toJSONString(pageUtil)); + respJson.put("modifyUserName",resp.getModifyUserName()); + respJson.put("modifyTime",resp.getModifyDate()); + return R.ok().put("page", respJson); } catch (NumberFormatException e) { log.error("{},分页参数类型转换异常：{}", LOGGER_MSG, e.getMessage()); return R.error("商品信息列表查询异常"); diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/dto/QueryModifyLogResultDTO.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/dto/QueryModifyLogResultDTO.java new file mode 100644 index 00000000..214b68ef --- /dev/null +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/dto/QueryModifyLogResultDTO.java @@ -0,0 +1,18 @@ +package com.dxhy.order.baseservice.module.commodity.model.dto; + +import com.dxhy.order.model.PageUtils; +import lombok.Data; + +import java.util.Date; + +/** + * @Description + * @Author 巩权林 + * @Date 2023/3/27 09:05 + **/ +@Data +public class QueryModifyLogResultDTO { + private PageUtils pageUtils; + private String modifyUserName; + private Date modifyDate; +} diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/CommodityCodeModifyLogService.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/CommodityCodeModifyLogService.java index f17c89fc..e57a66d6 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/CommodityCodeModifyLogService.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/CommodityCodeModifyLogService.java @@ -4,6 +4,7 @@ import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeModifyLog; import com.dxhy.order.baseservice.module.commodity.model.GroupCommodity; import com.dxhy.order.baseservice.module.commodity.model.dto.QueryModifyLogDTO; +import com.dxhy.order.baseservice.module.commodity.model.dto.QueryModifyLogResultDTO; import com.dxhy.order.model.PageUtils; import java.util.List; @@ -18,7 +19,7 @@ public interface CommodityCodeModifyLogService { public int saveCommodityCodeDifferenceBetween2(CommodityCodeEntity originOne, CommodityCodeEntity newOne, Long modifyUserId); - public PageUtils queryPage(QueryModifyLogDTO dto); + public QueryModifyLogResultDTO queryPage(QueryModifyLogDTO dto); public diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityCodeModifyLogServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityCodeModifyLogServiceImpl.java index 142f8bdd..b4d84b38 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityCodeModifyLogServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityCodeModifyLogServiceImpl.java @@ -11,6 +11,7 @@ import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeModifyLog; import com.dxhy.order.baseservice.module.commodity.model.GroupCommodity; import com.dxhy.order.baseservice.module.commodity.model.dto.QueryModifyLogDTO; +import com.dxhy.order.baseservice.module.commodity.model.dto.QueryModifyLogResultDTO; import com.dxhy.order.baseservice.module.commodity.model.dto.UserInfoDTO; import com.dxhy.order.baseservice.module.commodity.service.CommodityCodeModifyLogService; import com.dxhy.order.constant.ConfigureConstant; @@ -98,7 +99,7 @@ public class CommodityCodeModifyLogServiceImpl implements CommodityCodeModifyLog @Override @SneakyThrows - public PageUtils queryPage(QueryModifyLogDTO dto) { + public QueryModifyLogResultDTO queryPage(QueryModifyLogDTO dto) { int pageSize = dto.getPageSize(); int currPage = dto.getCurrPage(); PageHelper.startPage(currPage, pageSize); @@ -148,8 +149,14 @@ public class CommodityCodeModifyLogServiceImpl implements CommodityCodeModifyLog }); } + Date modifyDate = commodityCodeModifyLogs.size() > 0 ? commodityCodeModifyLogs.get(commodityCodeModifyLogs.size() - 1).getModifyTime() : null; + String modifyUserName = commodityCodeModifyLogs.size() > 0 ? commodityCodeModifyLogs.get(commodityCodeModifyLogs.size() - 1).getModifyUserName() : null; PageInfo pageInfo = new PageInfo<>(commodityCodeModifyLogs); - return new PageUtils(pageInfo.getList(), (int) pageInfo.getTotal(), pageInfo.getPageSize(), pageInfo.getPageNum()); + QueryModifyLogResultDTO resultDTO = new QueryModifyLogResultDTO(); + resultDTO.setPageUtils(new PageUtils(pageInfo.getList(), (int) pageInfo.getTotal(), pageInfo.getPageSize(), pageInfo.getPageNum())); + resultDTO.setModifyDate(modifyDate); + resultDTO.setModifyUserName(modifyUserName); + return resultDTO; } /**