From 9d642f4913f72da2a61dc6cff4e22f33941b2d23 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Mon, 22 Sep 2025 15:58:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E5=9B=B4?= =?UTF-8?q?=E6=A0=8F=E8=BF=9B=E5=87=BA=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/bo/DeviceFenceAccessRecordBo.java | 21 ++-- .../mapper/DeviceFenceAccessRecordMapper.java | 10 ++ .../DeviceFenceAccessRecordServiceImpl.java | 6 +- .../DeviceFenceAccessRecordMapper.xml | 95 ++++++++++++++++--- 4 files changed, 110 insertions(+), 22 deletions(-) diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceFenceAccessRecordBo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceFenceAccessRecordBo.java index 2300d839..2bbc33bb 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceFenceAccessRecordBo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceFenceAccessRecordBo.java @@ -8,7 +8,9 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; + import java.util.Date; + import com.fasterxml.jackson.annotation.JsonFormat; /** @@ -25,19 +27,24 @@ public class DeviceFenceAccessRecordBo extends BaseEntity { /** * 记录ID */ - @NotNull(message = "记录ID不能为空", groups = { EditGroup.class }) + @NotNull(message = "记录ID不能为空", groups = {EditGroup.class}) private Long id; /** * 围栏ID */ - @NotNull(message = "围栏ID不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotNull(message = "围栏ID不能为空", groups = {AddGroup.class, EditGroup.class}) private Long fenceId; + /** + * 围栏名称 + */ + private String fenceName; + /** * 设备标识 */ - @NotBlank(message = "设备标识不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "设备标识不能为空", groups = {AddGroup.class, EditGroup.class}) private String deviceId; /** @@ -48,19 +55,19 @@ public class DeviceFenceAccessRecordBo extends BaseEntity { /** * 事件类型 */ - @NotNull(message = "事件类型不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotNull(message = "事件类型不能为空", groups = {AddGroup.class, EditGroup.class}) private Long eventType; /** * 纬度 */ - @NotNull(message = "纬度不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotNull(message = "纬度不能为空", groups = {AddGroup.class, EditGroup.class}) private Double latitude; /** * 经度 */ - @NotNull(message = "经度不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotNull(message = "经度不能为空", groups = {AddGroup.class, EditGroup.class}) private Double longitude; /** @@ -71,7 +78,7 @@ public class DeviceFenceAccessRecordBo extends BaseEntity { /** * 事件时间 */ - @NotNull(message = "事件时间不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotNull(message = "事件时间不能为空", groups = {AddGroup.class, EditGroup.class}) private Date eventTime; /** 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 5fc944ee..56a1ad2c 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 @@ -5,6 +5,7 @@ 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.bo.DeviceFenceAccessRecordBo; import com.fuyuanshen.equipment.domain.vo.DeviceFenceAccessRecordVo; import org.apache.ibatis.annotations.Param; @@ -29,5 +30,14 @@ public interface DeviceFenceAccessRecordMapper extends BaseMapperPlus selectVoPageWithFenceAndDeviceName(@Param(Constants.WRAPPER) Wrapper wrapper); + /** + * 分页查询围栏进出记录列表（纯XML形式） + * + * @param page 分页参数 + * @param bo 查询条件 + * @return 围栏进出记录分页列表 + */ + Page selectVoPageByXml(Page page, @Param("bo") DeviceFenceAccessRecordBo bo); + } 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 88002377..c46dc221 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,8 @@ public class DeviceFenceAccessRecordServiceImpl implements IDeviceFenceAccessRec @Override public TableDataInfo queryPageList(DeviceFenceAccessRecordBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPageWithFenceAndDeviceName(pageQuery.build(), lqw); + // Page result = baseMapper.selectVoPageWithFenceAndDeviceName(pageQuery.build(), lqw); + Page result = baseMapper.selectVoPageByXml(pageQuery.build(), bo); return TableDataInfo.build(result); } @@ -85,6 +86,9 @@ public class DeviceFenceAccessRecordServiceImpl implements IDeviceFenceAccessRec lqw.eq(bo.getAccuracy() != null, DeviceFenceAccessRecord::getAccuracy, bo.getAccuracy()); lqw.eq(bo.getEventTime() != null, DeviceFenceAccessRecord::getEventTime, bo.getEventTime()); lqw.eq(bo.getCreateTime() != null, DeviceFenceAccessRecord::getCreateTime, bo.getCreateTime()); + if (StringUtils.isNotBlank(bo.getFenceName())) { + params.put("fenceName", bo.getFenceName()); + } return lqw; } 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 b0541143..a1e7467e 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 @@ -8,21 +8,88 @@ + + + +