From 1722f92328d24995b33b31748917d33244ff7554 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Fri, 12 Sep 2025 09:04:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=AD=90=E5=9B=B4=E6=A0=8F-=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fence/DeviceFenceAccessRecordController.java | 7 ++++--- .../device/fence/DeviceGeoFenceController.java | 9 +++++---- .../equipment/domain/DeviceFenceAccessRecord.java | 6 ------ .../equipment/domain/DeviceGeoFence.java | 15 --------------- .../domain/bo/DeviceFenceAccessRecordBo.java | 2 +- .../equipment/domain/bo/DeviceGeoFenceBo.java | 9 ++------- .../equipment/domain/query/FenceCheckRequest.java | 3 ++- .../domain/vo/DeviceFenceAccessRecordVo.java | 2 +- .../equipment/domain/vo/DeviceGeoFenceVo.java | 6 +++--- .../impl/DeviceFenceAccessRecordServiceImpl.java | 2 +- .../service/impl/DeviceGeoFenceServiceImpl.java | 10 +++++++--- .../equipment/service/impl/DeviceServiceImpl.java | 3 ++- 12 files changed, 28 insertions(+), 46 deletions(-) diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/fence/DeviceFenceAccessRecordController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/fence/DeviceFenceAccessRecordController.java index 97e7aa97..fc2e2c66 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/fence/DeviceFenceAccessRecordController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/fence/DeviceFenceAccessRecordController.java @@ -32,11 +32,12 @@ import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/fys-equipment/fenceAccessRecord") +@RequestMapping("/api/equipment/fenceAccessRecord") public class DeviceFenceAccessRecordController extends BaseController { private final IDeviceFenceAccessRecordService deviceFenceAccessRecordService; + /** * 查询围栏进出记录列表 */ @@ -47,10 +48,10 @@ public class DeviceFenceAccessRecordController extends BaseController { } /** - * 围栏进出记录列表 + * 导出围栏进出记录列表 */ @SaCheckPermission("fys-equipment:fenceAccessRecord:export") - @Log(title = "围栏进出记录", businessType = BusinessType.EXPORT) + @Log(title = "导出围栏进出记录列表", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(DeviceFenceAccessRecordBo bo, HttpServletResponse response) { List list = deviceFenceAccessRecordService.queryList(bo); diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/fence/DeviceGeoFenceController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/fence/DeviceGeoFenceController.java index cae25e3f..1e70c64c 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/fence/DeviceGeoFenceController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/fence/DeviceGeoFenceController.java @@ -35,11 +35,12 @@ import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/fys-equipment/geoFence") +@RequestMapping("/api/equipment/geoFence") public class DeviceGeoFenceController extends BaseController { private final IDeviceGeoFenceService deviceGeoFenceService; + /** * 查询电子围栏列表 */ @@ -50,10 +51,10 @@ public class DeviceGeoFenceController extends BaseController { } /** - * 电子围栏列表 + * 导出电子围栏列表 */ @SaCheckPermission("fys-equipment:geoFence:export") - @Log(title = "电子围栏", businessType = BusinessType.EXPORT) + @Log(title = "导出电子围栏列表", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(DeviceGeoFenceBo bo, HttpServletResponse response) { List list = deviceGeoFenceService.queryList(bo); @@ -109,7 +110,7 @@ public class DeviceGeoFenceController extends BaseController { /** - * 位置检查 + * 电子围栏-位置检查 * * @param request * @return 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 8b50674c..9652c302 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,10 +69,4 @@ public class DeviceFenceAccessRecord extends BaseEntity { */ private Date eventTime; - /** - * 记录创建时间 - */ - private Date createdTime; - - } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceGeoFence.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceGeoFence.java index 37285038..7cade915 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceGeoFence.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceGeoFence.java @@ -59,20 +59,5 @@ public class DeviceGeoFence extends BaseEntity { */ private Long isActive; - /** - * 创建人 - */ - private Long createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新时间 - */ - private Date updatedTime; - } 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 60d00f4e..84b70f40 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 @@ -77,7 +77,7 @@ public class DeviceFenceAccessRecordBo extends BaseEntity { /** * 记录创建时间 */ - private Date createdTime; + private Date createTime; } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGeoFenceBo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGeoFenceBo.java index d13217d9..a2506385 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGeoFenceBo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGeoFenceBo.java @@ -61,20 +61,15 @@ public class DeviceGeoFenceBo extends BaseEntity { */ private Long isActive; - /** - * 创建人 - */ - private Long createdBy; - /** * 创建时间 */ - private Date createdTime; + private Date createTime; /** * 更新时间 */ - private Date updatedTime; + private Date updateTime; } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/FenceCheckRequest.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/FenceCheckRequest.java index de556516..00704953 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/FenceCheckRequest.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/FenceCheckRequest.java @@ -35,5 +35,6 @@ public class FenceCheckRequest { /** * 定位精度(米) */ - private Double accuracy; + private Long accuracy; + } 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 a91b3950..8e4ab2b3 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 @@ -88,7 +88,7 @@ public class DeviceFenceAccessRecordVo implements Serializable { * 记录创建时间 */ @ExcelProperty(value = "记录创建时间") - private Date createdTime; + private Date createTime; } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceGeoFenceVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceGeoFenceVo.java index 50fbc372..119dd8d7 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceGeoFenceVo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceGeoFenceVo.java @@ -76,19 +76,19 @@ public class DeviceGeoFenceVo implements Serializable { * 创建人 */ @ExcelProperty(value = "创建人") - private Long createdBy; + private Long createBy; /** * 创建时间 */ @ExcelProperty(value = "创建时间") - private Date createdTime; + private Date createTime; /** * 更新时间 */ @ExcelProperty(value = "更新时间") - private Date updatedTime; + private Date updateTime; } 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 a09f8386..51df807a 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 @@ -82,7 +82,7 @@ public class DeviceFenceAccessRecordServiceImpl implements IDeviceFenceAccessRec lqw.eq(bo.getLongitude() != null, DeviceFenceAccessRecord::getLongitude, bo.getLongitude()); lqw.eq(bo.getAccuracy() != null, DeviceFenceAccessRecord::getAccuracy, bo.getAccuracy()); lqw.eq(bo.getEventTime() != null, DeviceFenceAccessRecord::getEventTime, bo.getEventTime()); - lqw.eq(bo.getCreatedTime() != null, DeviceFenceAccessRecord::getCreatedTime, bo.getCreatedTime()); + lqw.eq(bo.getCreateTime() != null, DeviceFenceAccessRecord::getCreateTime, bo.getCreateTime()); return lqw; } 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 c5fbb2df..242cf77b 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 lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Collection; @@ -85,9 +86,9 @@ public class DeviceGeoFenceServiceImpl implements IDeviceGeoFenceService { lqw.eq(StringUtils.isNotBlank(bo.getCoordinates()), DeviceGeoFence::getCoordinates, bo.getCoordinates()); lqw.eq(bo.getRadius() != null, DeviceGeoFence::getRadius, bo.getRadius()); lqw.eq(bo.getIsActive() != null, DeviceGeoFence::getIsActive, bo.getIsActive()); - lqw.eq(bo.getCreatedBy() != null, DeviceGeoFence::getCreatedBy, bo.getCreatedBy()); - lqw.eq(bo.getCreatedTime() != null, DeviceGeoFence::getCreatedTime, bo.getCreatedTime()); - lqw.eq(bo.getUpdatedTime() != null, DeviceGeoFence::getUpdatedTime, bo.getUpdatedTime()); + lqw.eq(bo.getCreateBy() != null, DeviceGeoFence::getCreateBy, bo.getCreateBy()); + lqw.eq(bo.getCreateTime() != null, DeviceGeoFence::getCreateTime, bo.getCreateTime()); + lqw.eq(bo.getUpdateTime() != null, DeviceGeoFence::getUpdateTime, bo.getUpdateTime()); return lqw; } @@ -181,13 +182,16 @@ public class DeviceGeoFenceServiceImpl implements IDeviceGeoFenceService { } FenceCheckResponse.FenceInfo fenceInfo = new FenceCheckResponse.FenceInfo(); + List list = new ArrayList<>(); boolean pointInFence = GeoFenceChecker.isPointInFence(request.getLatitude(), request.getLongitude(), fence.getAreaType(), coordinateList, fence.getRadius()); if (pointInFence) { fenceInfo.setFenceId(fence.getId()); fenceInfo.setFenceName(fence.getName()); fenceInfo.setFenceType(fence.getAreaType()); + response.setEnteredFences(list); response.getEnteredFences().add(fenceInfo); } else { + response.setExitedFences(list); response.getExitedFences().add(fenceInfo); } } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java index 5646e991..48f09d86 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java @@ -238,7 +238,8 @@ public class DeviceServiceImpl extends ServiceImpl impleme DeviceTypeQueryCriteria deviceTypeQueryCriteria = new DeviceTypeQueryCriteria(); deviceTypeQueryCriteria.setDeviceTypeId(deviceAssignments.getDeviceId()); - deviceTypeQueryCriteria.setCustomerId(LoginHelper.getUserId()); + // 被授权的客户 + // deviceTypeQueryCriteria.setCustomerId(LoginHelper.getUserId()); List deviceTypes = deviceTypeMapper.findAll(deviceTypeQueryCriteria); if (deviceTypes.isEmpty()) { throw new Exception("设备类型不存在!!!");