From e2821566c895c92edbc6e35d14d76fabc163ec87 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Mon, 22 Sep 2025 18:18:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/domain/DeviceFenceAccessRecord.java | 5 +++++ .../equipment/domain/bo/DeviceFenceAccessRecordBo.java | 6 ++++++ .../equipment/domain/vo/DeviceFenceAccessRecordVo.java | 6 ++++++ .../equipment/service/impl/DeviceGeoFenceServiceImpl.java | 4 ++++ .../equipment/utils/map/GetAddressFromLatUtil.java | 3 +++ .../mapper/equipment/DeviceFenceAccessRecordMapper.xml | 4 ++-- 6 files changed, 26 insertions(+), 2 deletions(-) diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceFenceAccessRecord.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceFenceAccessRecord.java index 58ab238..95c67d6 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceFenceAccessRecord.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceFenceAccessRecord.java @@ -69,4 +69,9 @@ public class DeviceFenceAccessRecord extends BaseEntity { */ private Date eventTime; + /** + * 事件地址 + */ + private String eventAddress; + } 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 2bbc33b..4141976 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 @@ -1,5 +1,6 @@ package com.fuyuanshen.equipment.domain.bo; +import cn.idev.excel.annotation.ExcelProperty; import com.fuyuanshen.common.core.validate.AddGroup; import com.fuyuanshen.common.core.validate.EditGroup; import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; @@ -81,6 +82,11 @@ public class DeviceFenceAccessRecordBo extends BaseEntity { @NotNull(message = "事件时间不能为空", groups = {AddGroup.class, EditGroup.class}) private Date eventTime; + /** + * 事件地址 + */ + private String eventAddress; + /** * 开始时间 */ 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 309158d..b61e750 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 @@ -97,6 +97,12 @@ public class DeviceFenceAccessRecordVo implements Serializable { @ExcelProperty(value = "事件时间") private Date eventTime; + /** + * 事件地址 + */ + @ExcelProperty(value = "事件地址") + private String eventAddress; + /** * 记录创建时间 */ diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGeoFenceServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGeoFenceServiceImpl.java index 2595b0a..086d473 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGeoFenceServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGeoFenceServiceImpl.java @@ -21,6 +21,7 @@ import com.fuyuanshen.equipment.service.IDeviceFenceAccessRecordService; import com.fuyuanshen.equipment.service.IDeviceFenceStatusService; import com.fuyuanshen.equipment.service.IDeviceGeoFenceService; import com.fuyuanshen.equipment.utils.map.GeoFenceChecker; +import com.fuyuanshen.equipment.utils.map.GetAddressFromLatUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -240,6 +241,9 @@ public class DeviceGeoFenceServiceImpl implements IDeviceGeoFenceService { recordBo.setFenceId(fence.getId()); recordBo.setLatitude(request.getLatitude()); recordBo.setLongitude(request.getLongitude()); + String address = GetAddressFromLatUtil.getAdd(request.getLongitude().toString(), request.getLatitude().toString()); + recordBo.setEventAddress(address); + recordBo.setEventTime(new Date()); // 1表示进入围栏，2表示离开围栏 recordBo.setEventType(currentStatus); diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/utils/map/GetAddressFromLatUtil.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/utils/map/GetAddressFromLatUtil.java index 2744977..03da1cf 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/utils/map/GetAddressFromLatUtil.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/utils/map/GetAddressFromLatUtil.java @@ -8,6 +8,8 @@ import org.slf4j.LoggerFactory; import java.net.URL; /** + * 根据经纬度获取地址信息工具类 + * * @author: 默苍璃 * @date: 2025-07-2615:59 */ @@ -74,5 +76,6 @@ public class GetAddressFromLatUtil { System.out.println("通过API获取到具体位置:" + res); return res; } + } 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 a1e7467..27be7c7 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 @@ -46,7 +46,7 @@ r.latitude, r.longitude, r.accuracy, - r.event_time, + r.event_time, r.event_address, r.create_time FROM device_fence_access_record r LEFT JOIN device_geo_fence f ON r.fence_id = f.id @@ -90,7 +90,7 @@ AND r.event_time #{bo.endTime} - ORDER BY r.id ASC + ORDER BY r.event_time DESC \ No newline at end of file