From 01a1a6e25bf3d61451cca36ef7526bffd057d7db Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Fri, 12 Sep 2025 11:48:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=9B=B4=E6=A0=8F=E8=BF=9B?= =?UTF-8?q?=E5=87=BA=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/DeviceFenceAccessRecordVo.java | 16 ++++++++-- .../mapper/DeviceFenceAccessRecordMapper.java | 12 ++++++++ .../DeviceFenceAccessRecordServiceImpl.java | 4 +-- .../DeviceFenceAccessRecordMapper.xml | 29 +++++++++++++++++-- 4 files changed, 55 insertions(+), 6 deletions(-) diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceFenceAccessRecordVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceFenceAccessRecordVo.java index 8e4ab2b3..b0f69026 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceFenceAccessRecordVo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceFenceAccessRecordVo.java @@ -1,6 +1,7 @@ package com.fuyuanshen.equipment.domain.vo; import java.util.Date; + import com.fasterxml.jackson.annotation.JsonFormat; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; @@ -15,7 +16,6 @@ import java.io.Serializable; import java.util.Date; - /** * 围栏进出记录视图对象 device_fence_access_record * @@ -42,11 +42,23 @@ public class DeviceFenceAccessRecordVo implements Serializable { @ExcelProperty(value = "围栏ID") private Long fenceId; + /** + * 围栏名称 + */ + @ExcelProperty(value = "围栏名称") + private String fenceName; + /** * 设备标识 */ @ExcelProperty(value = "设备标识") - private String deviceId; + private Long deviceId; + + /** + * 设备名称 + */ + @ExcelProperty(value = "设备名称") + private String deviceName; /** * 用户ID diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceFenceAccessRecordMapper.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceFenceAccessRecordMapper.java index f6f03f6d..8bdb2d57 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceFenceAccessRecordMapper.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceFenceAccessRecordMapper.java @@ -1,8 +1,12 @@ package com.fuyuanshen.equipment.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; import com.fuyuanshen.equipment.domain.DeviceFenceAccessRecord; import com.fuyuanshen.equipment.domain.vo.DeviceFenceAccessRecordVo; +import org.apache.ibatis.annotations.Param; /** * 围栏进出记录Mapper接口 @@ -12,4 +16,12 @@ import com.fuyuanshen.equipment.domain.vo.DeviceFenceAccessRecordVo; */ public interface DeviceFenceAccessRecordMapper extends BaseMapperPlus { + /** + * 分页查询围栏进出记录列表（包含围栏名称和设备名称） + * + * @param page 分页参数 + * @param wrapper 查询条件 + * @return 围栏进出记录分页列表 + */ + Page selectVoPageWithFenceAndDeviceName(Page page, @Param(Constants.WRAPPER) Wrapper wrapper); } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceFenceAccessRecordServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceFenceAccessRecordServiceImpl.java index 51df807a..4acc8ce2 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceFenceAccessRecordServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceFenceAccessRecordServiceImpl.java @@ -54,7 +54,7 @@ public class DeviceFenceAccessRecordServiceImpl implements IDeviceFenceAccessRec @Override public TableDataInfo queryPageList(DeviceFenceAccessRecordBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result = baseMapper.selectVoPageWithFenceAndDeviceName(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -73,7 +73,7 @@ public class DeviceFenceAccessRecordServiceImpl implements IDeviceFenceAccessRec private LambdaQueryWrapper buildQueryWrapper(DeviceFenceAccessRecordBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(DeviceFenceAccessRecord::getId); + // lqw.orderByAsc(DeviceFenceAccessRecord::getId); lqw.eq(bo.getFenceId() != null, DeviceFenceAccessRecord::getFenceId, bo.getFenceId()); lqw.eq(StringUtils.isNotBlank(bo.getDeviceId()), DeviceFenceAccessRecord::getDeviceId, bo.getDeviceId()); lqw.eq(bo.getUserId() != null, DeviceFenceAccessRecord::getUserId, bo.getUserId()); diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceFenceAccessRecordMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceFenceAccessRecordMapper.xml index 2667e1b3..819ba779 100644 --- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceFenceAccessRecordMapper.xml +++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceFenceAccessRecordMapper.xml @@ -1,7 +1,32 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + +