dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

检查设备位置与围栏的关系

Browse Source
This commit is contained in:
daiyongfei
2025-09-15 09:41:10 +08:00
parent 8597dc5a9f
commit 9fbb0aefcf
9 changed files with 605 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceFenceStatusService.java Normal file
View File

@ -0,0 +1,81 @@
package com.fuyuanshen.equipment.service;
import com.fuyuanshen.equipment.domain.vo.DeviceFenceStatusVo;
import com.fuyuanshen.equipment.domain.bo.DeviceFenceStatusBo;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
import com.fuyuanshen.common.mybatis.core.page.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 设备进入围栏状态Service接口
*
* @author Lion Li
* @date 2025-09-15
*/
public interface IDeviceFenceStatusService {
/**
* 查询设备进入围栏状态
*
* @param id 主键
* @return 设备进入围栏状态
*/
DeviceFenceStatusVo queryById(Long id);
/**
* 分页查询设备进入围栏状态列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 设备进入围栏状态分页列表
*/
TableDataInfo<DeviceFenceStatusVo> queryPageList(DeviceFenceStatusBo bo, PageQuery pageQuery);
/**
* 查询符合条件的设备进入围栏状态列表
*
* @param bo 查询条件
* @return 设备进入围栏状态列表
*/
List<DeviceFenceStatusVo> queryList(DeviceFenceStatusBo bo);
/**
* 新增设备进入围栏状态
*
* @param bo 设备进入围栏状态
* @return 是否新增成功
*/
Boolean insertByBo(DeviceFenceStatusBo bo);
/**
* 修改设备进入围栏状态
*
* @param bo 设备进入围栏状态
* @return 是否修改成功
*/
Boolean updateByBo(DeviceFenceStatusBo bo);
/**
* 校验并批量删除设备进入围栏状态信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 查询设备在特定围栏的最新状态
*
* @param deviceId 设备ID
* @param fenceId 围栏ID
* @return 最新状态记录，如果不存在则返回null
*/
DeviceFenceStatusVo getLatestStatusByDeviceAndFence(String deviceId, Long fenceId);
}

152
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceFenceStatusServiceImpl.java Normal file
View File

@ -0,0 +1,152 @@
package com.fuyuanshen.equipment.service.impl;
import com.fuyuanshen.common.core.utils.MapstructUtils;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
import com.fuyuanshen.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.fuyuanshen.equipment.domain.bo.DeviceFenceStatusBo;
import com.fuyuanshen.equipment.domain.vo.DeviceFenceStatusVo;
import com.fuyuanshen.equipment.domain.DeviceFenceStatus;
import com.fuyuanshen.equipment.mapper.DeviceFenceStatusMapper;
import com.fuyuanshen.equipment.service.IDeviceFenceStatusService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 设备进入围栏状态Service业务层处理
*
* @author Lion Li
* @date 2025-09-15
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class DeviceFenceStatusServiceImpl implements IDeviceFenceStatusService {
private final DeviceFenceStatusMapper baseMapper;
/**
* 查询设备进入围栏状态
*
* @param id 主键
* @return 设备进入围栏状态
*/
@Override
public DeviceFenceStatusVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询设备进入围栏状态列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 设备进入围栏状态分页列表
*/
@Override
public TableDataInfo<DeviceFenceStatusVo> queryPageList(DeviceFenceStatusBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<DeviceFenceStatus> lqw = buildQueryWrapper(bo);
Page<DeviceFenceStatusVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的设备进入围栏状态列表
*
* @param bo 查询条件
* @return 设备进入围栏状态列表
*/
@Override
public List<DeviceFenceStatusVo> queryList(DeviceFenceStatusBo bo) {
LambdaQueryWrapper<DeviceFenceStatus> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<DeviceFenceStatus> buildQueryWrapper(DeviceFenceStatusBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<DeviceFenceStatus> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(DeviceFenceStatus::getId);
lqw.eq(StringUtils.isNotBlank(bo.getDeviceId()), DeviceFenceStatus::getDeviceId, bo.getDeviceId());
lqw.eq(bo.getFenceId() != null, DeviceFenceStatus::getFenceId, bo.getFenceId());
lqw.eq(bo.getStatus() != null, DeviceFenceStatus::getStatus, bo.getStatus());
lqw.eq(bo.getLastCheckTime() != null, DeviceFenceStatus::getLastCheckTime, bo.getLastCheckTime());
return lqw;
}
/**
* 新增设备进入围栏状态
*
* @param bo 设备进入围栏状态
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(DeviceFenceStatusBo bo) {
DeviceFenceStatus add = MapstructUtils.convert(bo, DeviceFenceStatus.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改设备进入围栏状态
*
* @param bo 设备进入围栏状态
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(DeviceFenceStatusBo bo) {
DeviceFenceStatus update = MapstructUtils.convert(bo, DeviceFenceStatus.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(DeviceFenceStatus entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除设备进入围栏状态信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
/**
* 查询设备在特定围栏的最新状态
*/
@Override
public DeviceFenceStatusVo getLatestStatusByDeviceAndFence(String deviceId, Long fenceId) {
LambdaQueryWrapper<DeviceFenceStatus> lqw = Wrappers.lambdaQuery();
lqw.eq(DeviceFenceStatus::getDeviceId, deviceId);
lqw.eq(DeviceFenceStatus::getFenceId, fenceId);
lqw.orderByDesc(DeviceFenceStatus::getLastCheckTime);
lqw.last("LIMIT 1");
DeviceFenceStatus status = baseMapper.selectOne(lqw);
return MapstructUtils.convert(status, DeviceFenceStatusVo.class);
}
}

97
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGeoFenceServiceImpl.java
View File

@ -9,11 +9,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.fuyuanshen.equipment.domain.DeviceGeoFence;
import com.fuyuanshen.equipment.domain.bo.DeviceFenceStatusBo;
import com.fuyuanshen.equipment.domain.bo.DeviceGeoFenceBo;
import com.fuyuanshen.equipment.domain.dto.FenceCheckResponse;
import com.fuyuanshen.equipment.domain.query.FenceCheckRequest;
import com.fuyuanshen.equipment.domain.vo.DeviceFenceStatusVo;
import com.fuyuanshen.equipment.domain.vo.DeviceGeoFenceVo;
import com.fuyuanshen.equipment.mapper.DeviceGeoFenceMapper;
import com.fuyuanshen.equipment.service.IDeviceFenceStatusService;
import com.fuyuanshen.equipment.service.IDeviceGeoFenceService;
import com.fuyuanshen.equipment.utils.map.GeoFenceChecker;
import lombok.RequiredArgsConstructor;
@ -21,10 +24,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;
import java.util.*;
/**
* 电子围栏Service业务层处理
@ -39,6 +39,10 @@ public class DeviceGeoFenceServiceImpl implements IDeviceGeoFenceService {
private final DeviceGeoFenceMapper baseMapper;
private final IDeviceFenceStatusService fenceStatusService; // 添加此行
/**
* 查询电子围栏
*
@ -158,41 +162,84 @@ public class DeviceGeoFenceServiceImpl implements IDeviceGeoFenceService {
bo.setIsActive(1L); // 假设1表示激活状态
List<DeviceGeoFenceVo> activeFences = queryList(bo);
// 2. 判断设备位置与各围栏的关系
// 2. 初始化响应对象
FenceCheckResponse response = new FenceCheckResponse();
response.setDeviceId(request.getDeviceId());
response.setCheckTime(System.currentTimeMillis());
response.setEnteredFences(new ArrayList<>());
response.setExitedFences(new ArrayList<>());
response.setCurrentFences(new ArrayList<>());
// 这里需要实现具体的围栏判断逻辑
// 根据您之前提供的算法实现点在围栏内的判断
// 3. 遍历所有激活的围栏
for (DeviceGeoFenceVo fence : activeFences) {
String coordinates = fence.getCoordinates();
// 在需要转换的地方
// 解析围栏坐标
ObjectMapper objectMapper = new ObjectMapper();
List<GeoFenceChecker.Coordinate> coordinateList = List.of();
List<GeoFenceChecker.Coordinate> coordinateList = new ArrayList<>();
try {
coordinateList = objectMapper.readValue(coordinates,
coordinateList = objectMapper.readValue(fence.getCoordinates(),
new TypeReference<List<GeoFenceChecker.Coordinate>>() {
});
} catch (Exception e) {
// 处理解析异常
log.error("坐标数据解析失败: {}", e.getMessage());
continue; // 解析失败则跳过该围栏
}
// 检查设备是否在围栏内
boolean pointInFence = GeoFenceChecker.isPointInFence(
request.getLatitude(),
request.getLongitude(),
fence.getAreaType(),
coordinateList,
fence.getRadius());
// 创建围栏信息对象
FenceCheckResponse.FenceInfo fenceInfo = new FenceCheckResponse.FenceInfo();
List<FenceCheckResponse.FenceInfo> 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);
fenceInfo.setFenceId(fence.getId());
fenceInfo.setFenceName(fence.getName());
fenceInfo.setFenceType(fence.getAreaType());
// // 查询设备在该围栏的历史状态
// DeviceFenceStatusBo statusQuery = new DeviceFenceStatusBo();
// statusQuery.setDeviceId(request.getDeviceId());
// statusQuery.setFenceId(fence.getId());
// List<DeviceFenceStatusVo> statusHistory = fenceStatusService.queryList(statusQuery);
//
// // 获取最新的状态记录
// DeviceFenceStatusVo latestStatus = statusHistory.stream()
// .max(Comparator.comparing(DeviceFenceStatusVo::getLastCheckTime))
// .orElse(null);
// 查询设备在该围栏的最新状态
DeviceFenceStatusVo latestStatus = fenceStatusService.getLatestStatusByDeviceAndFence(
request.getDeviceId(), fence.getId());
// 判断设备与围栏的关系变化
Long previousStatus = latestStatus != null ? latestStatus.getStatus() : 0L; // 默认在围栏外
Long currentStatus = pointInFence ? 1L : 0L; // 当前状态：1-在围栏内，0-在围栏外
// 如果状态发生变化，则记录
if (!previousStatus.equals(currentStatus)) {
// 创建新的状态记录
DeviceFenceStatusBo newStatus = new DeviceFenceStatusBo();
newStatus.setDeviceId(request.getDeviceId());
newStatus.setFenceId(fence.getId());
newStatus.setStatus(currentStatus);
newStatus.setLastCheckTime(new Date());
// 保存状态记录
fenceStatusService.insertByBo(newStatus);
// 根据状态变化更新响应
if (currentStatus == 1L) {
// 设备进入围栏
response.getEnteredFences().add(fenceInfo);
} else {
// 设备离开围栏
response.getExitedFences().add(fenceInfo);
}
} else if (currentStatus == 1L) {
// 状态未变，但设备仍在围栏内
response.getCurrentFences().add(fenceInfo);
}
}