WFC/be.wfc
2
0
Fork 0
Code Activity

feat: 上网记录添加搜索

Browse Source
This commit is contained in:
caiyuchao
2025-03-06 18:08:31 +08:00
parent ba4d88637b
commit 9230988009
5 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UCdrController.java
View File

@@ -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<UCdrHistoryUserVo> result = cdrService.getHistoryByUser();
List<UCdrHistoryUserVo> result = cdrService.getHistoryByUser(item);
return getDataTable(result);
}

3
wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UCdrMapper.java
View File

@@ -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<UCdr> {
List<UCdrClientVo> getByClient(@Param("client") UCdrClientBo client);
List<UCdrHistoryUserVo> getHistoryByUser(@Param("userId") Long userId);
List<UCdrHistoryUserVo> getHistoryByUser(@Param("item") UUCdrHistoryUserBo item);
List<UCdrLatestHistoryVo> getLatestHistory(@Param("userIds") List<Long> userIds, @Param("endTime") Date endTime);

3
wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUCdrService.java
View File

@@ -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<UCdr> {
List<UCdrClientVo> getByClient(UCdrClientBo client);
List<UCdrHistoryUserVo> getHistoryByUser();
List<UCdrHistoryUserVo> getHistoryByUser(UUCdrHistoryUserBo item);
void addCdrInfoByOmadaApi();

6
wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UCdrServiceImpl.java
View File

@@ -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<UCdrMapper, UCdr> implements IU
}
@Override
public List<UCdrHistoryUserVo> getHistoryByUser() {
public List<UCdrHistoryUserVo> getHistoryByUser(UUCdrHistoryUserBo item) {
LoginUser<Object> loginUser = SecurityUtils.getLoginUser();
return this.baseMapper.getHistoryByUser(loginUser.getUserid());
item.setUserId(loginUser.getUserid());
return this.baseMapper.getHistoryByUser(item);
}
@Override

16
wfc-modules/wfc-user/src/main/resources/mapper/user/UCdrMapper.xml
View File

@@ -126,8 +126,20 @@
WHERE
cdr.del_flag = 0
AND ch.id is not null
<if test="userId != null and userId != ''">
AND cdr.user_id = #{userId}
<if test="item.userId != null and item.userId != ''">
AND cdr.user_id = #{item.userId}
</if>
<if test="item.clientName != null and item.clientName != ''">
AND c.client_name like concat('%', #{item.clientName}, '%')
</if>
<if test="item.clientMac != null and item.clientMac != ''">
AND c.client_mac like concat('%', #{item.clientMac}, '%')
</if>
<if test="item.startTimeS != null and item.startTimeE != null">
AND ch.start_time between #{item.startTimeS} and #{item.startTimeE}
</if>
<if test="item.endTimeS != null and item.endTimeE != null">
AND ch.end_time between #{item.endTimeS} and #{item.endTimeE}
</if>
ORDER BY
ch.start_time DESC