From 923098800962ad25655ab63651bf1134c3a0484e Mon Sep 17 00:00:00 2001 From: caiyuchao Date: Thu, 6 Mar 2025 18:08:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=8A=E7=BD=91=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/wfc/user/controller/UCdrController.java | 5 +++-- .../java/org/wfc/user/mapper/UCdrMapper.java | 3 ++- .../java/org/wfc/user/service/IUCdrService.java | 3 ++- .../wfc/user/service/impl/UCdrServiceImpl.java | 6 ++++-- .../main/resources/mapper/user/UCdrMapper.xml | 16 ++++++++++++++-- 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UCdrController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UCdrController.java index c956bfa..70a58f8 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UCdrController.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UCdrController.java @@ -10,6 +10,7 @@ import org.wfc.common.core.domain.R; import org.wfc.common.core.web.controller.BaseController; import org.wfc.common.core.web.page.TableDataInfo; import org.wfc.user.domain.bo.UCdrClientBo; +import org.wfc.user.domain.bo.UUCdrHistoryUserBo; import org.wfc.user.domain.vo.UCdrClientVo; import org.wfc.user.domain.vo.UCdrHistoryUserVo; import org.wfc.user.domain.vo.UCdrUserVo; @@ -73,9 +74,9 @@ public class UCdrController extends BaseController { */ @Operation(summary = "CDR记录") @GetMapping("/pageHistory") - public TableDataInfo getHistoryByUser() { + public TableDataInfo getHistoryByUser(UUCdrHistoryUserBo item) { startPage(); - List result = cdrService.getHistoryByUser(); + List result = cdrService.getHistoryByUser(item); return getDataTable(result); } diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UCdrMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UCdrMapper.java index 244b4a5..4813322 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UCdrMapper.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UCdrMapper.java @@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Param; import org.wfc.user.domain.UCdr; import org.wfc.user.domain.UClient; import org.wfc.user.domain.bo.UCdrClientBo; +import org.wfc.user.domain.bo.UUCdrHistoryUserBo; import org.wfc.user.domain.vo.UCdrClientVo; import org.wfc.user.domain.vo.UCdrHistoryUserVo; import org.wfc.user.domain.vo.UCdrLatestHistoryVo; @@ -27,7 +28,7 @@ public interface UCdrMapper extends BaseMapper { List getByClient(@Param("client") UCdrClientBo client); - List getHistoryByUser(@Param("userId") Long userId); + List getHistoryByUser(@Param("item") UUCdrHistoryUserBo item); List getLatestHistory(@Param("userIds") List userIds, @Param("endTime") Date endTime); diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUCdrService.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUCdrService.java index dc49e1b..71c1ffd 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUCdrService.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUCdrService.java @@ -3,6 +3,7 @@ package org.wfc.user.service; import com.baomidou.mybatisplus.extension.service.IService; import org.wfc.user.domain.UCdr; import org.wfc.user.domain.bo.UCdrClientBo; +import org.wfc.user.domain.bo.UUCdrHistoryUserBo; import org.wfc.user.domain.vo.UCdrClientVo; import org.wfc.user.domain.vo.UCdrHistoryUserVo; import org.wfc.user.domain.vo.UCdrUserVo; @@ -23,7 +24,7 @@ public interface IUCdrService extends IService { List getByClient(UCdrClientBo client); - List getHistoryByUser(); + List getHistoryByUser(UUCdrHistoryUserBo item); void addCdrInfoByOmadaApi(); diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UCdrServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UCdrServiceImpl.java index dbb85b2..6f308f5 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UCdrServiceImpl.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UCdrServiceImpl.java @@ -31,6 +31,7 @@ import org.wfc.user.domain.UCdrHistory; import org.wfc.user.domain.UClient; import org.wfc.user.domain.UDevice; import org.wfc.user.domain.bo.UCdrClientBo; +import org.wfc.user.domain.bo.UUCdrHistoryUserBo; import org.wfc.user.domain.constant.UserTypeEnum; import org.wfc.user.domain.vo.UCdrClientVo; import org.wfc.user.domain.vo.UCdrHistoryUserVo; @@ -104,9 +105,10 @@ public class UCdrServiceImpl extends ServiceImpl implements IU } @Override - public List getHistoryByUser() { + public List getHistoryByUser(UUCdrHistoryUserBo item) { LoginUser loginUser = SecurityUtils.getLoginUser(); - return this.baseMapper.getHistoryByUser(loginUser.getUserid()); + item.setUserId(loginUser.getUserid()); + return this.baseMapper.getHistoryByUser(item); } @Override diff --git a/wfc-modules/wfc-user/src/main/resources/mapper/user/UCdrMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/UCdrMapper.xml index e32e9af..8be573d 100644 --- a/wfc-modules/wfc-user/src/main/resources/mapper/user/UCdrMapper.xml +++ b/wfc-modules/wfc-user/src/main/resources/mapper/user/UCdrMapper.xml @@ -126,8 +126,20 @@ WHERE cdr.del_flag = 0 AND ch.id is not null - - AND cdr.user_id = #{userId} + + AND cdr.user_id = #{item.userId} + + + AND c.client_name like concat('%', #{item.clientName}, '%') + + + AND c.client_mac like concat('%', #{item.clientMac}, '%') + + + AND ch.start_time between #{item.startTimeS} and #{item.startTimeE} + + + AND ch.end_time between #{item.endTimeS} and #{item.endTimeE} ORDER BY ch.start_time DESC