chuangte/electripper-v2
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

车辆轨迹

Browse Source
This commit is contained in:
磷叶 2025-04-03 20:53:52 +08:00
parent 045666041b
commit af7c91e57b
33 changed files with 1200 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java
View File

@ -91,4 +91,13 @@ public class CacheConstants
* 定位日志队列
*/
public static final String LOCATION_LOG_QUEUE = "location_log_queue";
/**
* 待插入的命令日志
*/
public static final String INSERT_COMMAND_LOG = "insert_command_log";
/**
* 运营区禁行区列表
*/
public static final String NO_RIDING_AREA_SUB_LIST = "no_riding_area_sub_list:";
}

9
common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
View File

@ -3,13 +3,13 @@ package com.ruoyi.common.utils;
import java.lang.management.ManagementFactory;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.YearMonth;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Calendar;
@ -384,11 +384,14 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
}
/**
* 将时间戳转换为LocalDateTime
* 将时间戳转换为LocalDateTime，并且保持yyyy-MM-dd HH:mm:ss格式
* @param timestamp 时间戳
*/
public static LocalDateTime toLocalDateTime(Long timestamp) {
return LocalDateTime.ofEpochSecond(timestamp, 0, ZoneOffset.of("+8"));
if (timestamp == null) {
return null;
}
return LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault());
}
public static LocalDateTime toLocalDateTime(String time) {

22
common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/utils/map/GeoUtils.java
View File

@ -234,12 +234,13 @@ public class GeoUtils {
/**
* 判断一个点是否在一个多边形区域内或者在区域外（考虑误差）
* */
public static boolean isInPolygonWithTolerance(BigDecimal longitude, BigDecimal latitude, Geometry polygon, double tolerance) {
public static boolean isInPolygonWithTolerance(BigDecimal longitude, BigDecimal latitude, Geometry polygon, BigDecimal tolerance) {
if (longitude == null || latitude == null || polygon == null) {
return false;
}
double lon = longitude.doubleValue();
double lat = latitude.doubleValue();
double toleranceValue = tolerance == null ? 0 : tolerance.doubleValue();
GeometryFactory geometryFactory = new GeometryFactory();
Coordinate coordinate = new Coordinate(lon, lat);
@ -252,9 +253,7 @@ public class GeoUtils {
Coordinate[] coordinates = polygon.getCoordinates();
for (Coordinate coord : coordinates) {
double distance = calculateDistance(lat, lon, coord.y, coord.x);
// log.info("距离----distance:{}",distance);
if (distance <= tolerance) {
// log.info("最小距离----distance:{}",distance);
if (distance <= toleranceValue) {
return true;
}
}
@ -265,10 +264,13 @@ public class GeoUtils {
/**
* 判断一个点是否在一个缩短后的圆形区域内
* */
public static boolean isInPolygonWithShorten(String longitude, String latitude, Geometry polygon, double shortenDistance) {
double lon = Double.parseDouble(longitude);
double lat = Double.parseDouble(latitude);
public static boolean isInPolygonWithShorten(BigDecimal longitude, BigDecimal latitude, Geometry polygon, BigDecimal shortenDistance) {
if (longitude == null || latitude == null || polygon == null ) {
return false;
}
double lon = longitude.doubleValue();
double lat = latitude.doubleValue();
double shortenDistanceValue = shortenDistance == null ? 0 : shortenDistance.doubleValue();
GeometryFactory geometryFactory = new GeometryFactory();
Coordinate coordinate = new Coordinate(lon, lat);
Point point = geometryFactory.createPoint(coordinate);
@ -278,9 +280,7 @@ public class GeoUtils {
Coordinate[] coordinates = polygon.getCoordinates();
for (Coordinate coord : coordinates) {
double distance = calculateDistance(lat, lon, coord.y, coord.x);
// log.info("距离----distance:{}",distance);
if (shortenDistance >= distance) {
// log.info("最小距离----distance:{}",distance);
if (shortenDistanceValue >= distance) {
return false;
}
}

7
ruoyi-service/src/main/java/com/ruoyi/bst/area/domain/Area.java
View File

@ -161,4 +161,11 @@ public class Area extends BaseEntity
@ApiModelProperty("创建人ID")
private Long createId;
@Excel(name = "靠近边界播报距离")
@ApiModelProperty("靠近边界播报距离(米)")
private BigDecimal boundaryDistance;
@Excel(name = "运营区外断电距离")
@ApiModelProperty("运营区外断电距离(米)")
private BigDecimal outageDistance;
}

8
ruoyi-service/src/main/java/com/ruoyi/bst/area/mapper/AreaMapper.xml
View File

@ -44,6 +44,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ba.create_id,
ba.create_time,
ba.deleted,
ba.boundary_distance,
ba.outage_distance,
su.nick_name as user_name,
su.agent_id as agent_id,
suc.nick_name as create_name
@ -142,6 +144,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="guideSwitch != null">guide_switch,</if>
<if test="createId != null">create_id,</if>
<if test="createTime != null">create_time,</if>
<if test="boundaryDistance != null">boundary_distance,</if>
<if test="outageDistance != null">outage_distance,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userId != null">#{userId},</if>
@ -176,6 +180,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="guideSwitch != null">#{guideSwitch},</if>
<if test="createId != null">#{createId},</if>
<if test="createTime != null">#{createTime},</if>
<if test="boundaryDistance != null">#{boundaryDistance},</if>
<if test="outageDistance != null">#{outageDistance},</if>
</trim>
</insert>
@ -220,6 +226,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="data.guideSwitch != null">guide_switch = #{data.guideSwitch},</if>
<if test="data.createId != null">create_id = #{data.createId},</if>
<if test="data.createTime != null">create_time = #{data.createTime},</if>
<if test="data.boundaryDistance != null">boundary_distance = #{data.boundaryDistance},</if>
<if test="data.outageDistance != null">outage_distance = #{data.outageDistance},</if>
</sql>
<delete id="deleteAreaById" parameterType="Long">

4
ruoyi-service/src/main/java/com/ruoyi/bst/area/service/impl/AreaConverterImpl.java
View File

@ -30,6 +30,8 @@ public class AreaConverterImpl implements AreaConverter {
po.setMsgSwitch(data.getMsgSwitch());
po.setNoRidingOutage(data.getNoRidingOutage());
po.setAreaOutOutage(data.getAreaOutOutage());
po.setBoundaryDistance(data.getBoundaryDistance());
po.setOutageDistance(data.getOutageDistance());
// 还车设置
po.setError(data.getError());
@ -68,6 +70,8 @@ public class AreaConverterImpl implements AreaConverter {
po.setMsgSwitch(data.getMsgSwitch());
po.setNoRidingOutage(data.getNoRidingOutage());
po.setAreaOutOutage(data.getAreaOutOutage());
po.setBoundaryDistance(data.getBoundaryDistance());
po.setOutageDistance(data.getOutageDistance());
// 还车设置
po.setError(data.getError());

35
ruoyi-service/src/main/java/com/ruoyi/bst/area/utils/AreaUtil.java
View File

@ -2,23 +2,46 @@ package com.ruoyi.bst.area.utils;
import java.math.BigDecimal;
import com.ruoyi.bst.area.domain.Area;
import com.ruoyi.common.utils.map.GeoUtils;
import org.locationtech.jts.geom.Geometry;
import com.ruoyi.bst.area.domain.Area;
import com.ruoyi.bst.area.domain.AreaVO;
import com.ruoyi.common.utils.map.GeoUtils;
public class AreaUtil {
// 是否在运营区内
public static boolean isInArea(Area area, BigDecimal longitude, BigDecimal latitude) {
double tolerance = 0; // 误差距离
if (area.getError() != null) {
tolerance = area.getError().doubleValue();
Geometry geometry = GeoUtils.fromWkt(area.getBoundary());
if (geometry == null) {
return false;
}
return GeoUtils.isInPolygonWithTolerance(longitude, latitude, geometry, area.getOutageDistance());
}
// 是否在运营区最小内边界
public static boolean isInAreaMin(AreaVO area, BigDecimal longitude, BigDecimal latitude) {
if (area == null) {
return false;
}
Geometry geometry = GeoUtils.fromWkt(area.getBoundary());
if (geometry == null) {
return false;
}
return GeoUtils.isInPolygonWithTolerance(longitude, latitude, geometry, tolerance);
return GeoUtils.isInPolygonWithShorten(longitude, latitude, geometry, area.getBoundaryDistance());
}
// 是否在运营区最大外边界
public static boolean isInAreaMax(AreaVO area, BigDecimal longitude, BigDecimal latitude) {
if (area == null) {
return false;
}
Geometry geometry = GeoUtils.fromWkt(area.getBoundary());
if (geometry == null) {
return false;
}
return GeoUtils.isInPolygonWithTolerance(longitude, latitude, geometry, area.getOutageDistance());
}
}

2
ruoyi-service/src/main/java/com/ruoyi/bst/areaSub/domain/AreaSub.java
View File

@ -58,7 +58,7 @@ public class AreaSub extends BaseEntity
@Excel(name = "还车误差")
@ApiModelProperty("还车误差")
@Min(value = 0, message = "还车误差不允许为负数")
private Integer error;
private BigDecimal error;
@Excel(name = "经度")
@ApiModelProperty("经度")

11
ruoyi-service/src/main/java/com/ruoyi/bst/areaSub/domain/vo/AreaSubSimpleVO.java Normal file
View File

@ -0,0 +1,11 @@
package com.ruoyi.bst.areaSub.domain.vo;
import lombok.Data;
/**
* @author wjh
* 2025/4/3
*/
@Data
public class AreaSubSimpleVO {
}

23
ruoyi-service/src/main/java/com/ruoyi/bst/areaSub/service/AreaSubService.java
View File

@ -50,22 +50,6 @@ public interface AreaSubService
*/
public int updateAreaSub(AreaSub areaSub);
/**
* 批量删除子区域
*
* @param ids 需要删除的子区域主键集合
* @return 结果
*/
public int deleteAreaSubByIds(Long[] ids);
/**
* 删除子区域信息
*
* @param id 子区域主键
* @return 结果
*/
public int deleteAreaSubById(Long id);
/**
* 根据运营区ID查询子区域列表
*
@ -94,4 +78,11 @@ public interface AreaSubService
* @return 子区域列表
*/
public List<AreaSubVO> selectParkingAreaByAreaId(Long areaId);
/**
* 查询运营区的可还车的子区域列表
* @param areaId 运营区ID
* @return 子区域列表
*/
public List<AreaSubVO> selectSimpleNoRidingListByAreaId(Long areaId);
}

97
ruoyi-service/src/main/java/com/ruoyi/bst/areaSub/service/impl/AreaSubServiceImpl.java
View File

@ -15,6 +15,8 @@ import com.ruoyi.bst.areaSub.domain.enums.AreaSubStatus;
import com.ruoyi.bst.areaSub.domain.enums.AreaSubType;
import com.ruoyi.bst.areaSub.mapper.AreaSubMapper;
import com.ruoyi.bst.areaSub.service.AreaSubService;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.common.utils.map.GeoUtils;
@ -31,6 +33,9 @@ public class AreaSubServiceImpl implements AreaSubService
@Autowired
private AreaSubMapper areaSubMapper;
@Autowired
private RedisCache redisCache;
/**
* 查询子区域
*
@ -83,7 +88,13 @@ public class AreaSubServiceImpl implements AreaSubService
Geometry geometry = GeoUtils.toGeometry(areaSub.getBoundaryStr());
areaSub.setBoundary(GeoUtils.wkt(geometry));
}
return areaSubMapper.insertAreaSub(areaSub);
int result = areaSubMapper.insertAreaSub(areaSub);
if (result > 0) {
this.clearCache(areaSub.getAreaId());
}
return result;
}
/**
@ -100,32 +111,15 @@ public class AreaSubServiceImpl implements AreaSubService
Geometry geometry = GeoUtils.toGeometry(areaSub.getBoundaryStr());
areaSub.setBoundary(GeoUtils.wkt(geometry));
}
return areaSubMapper.updateAreaSub(areaSub);
int result = areaSubMapper.updateAreaSub(areaSub);
if (result > 0) {
this.clearCache(areaSub.getAreaId());
}
return result;
}
/**
* 批量删除子区域
*
* @param ids 需要删除的子区域主键
* @return 结果
*/
@Override
public int deleteAreaSubByIds(Long[] ids)
{
return areaSubMapper.deleteAreaSubByIds(ids);
}
/**
* 删除子区域信息
*
* @param id 子区域主键
* @return 结果
*/
@Override
public int deleteAreaSubById(Long id)
{
return areaSubMapper.deleteAreaSubById(id);
}
/**
* 根据运营区ID查询子区域列表
@ -150,9 +144,37 @@ public class AreaSubServiceImpl implements AreaSubService
*/
@Override
public int logicDel(List<Long> ids) {
return areaSubMapper.logicDel(ids);
if (CollectionUtils.isEmptyElement(ids)) {
return 0;
}
List<AreaSubVO> list = this.selectAreaSubByIds(ids);
if (CollectionUtils.isEmptyElement(list)) {
return 0;
}
// 删除数据库
int result = areaSubMapper.logicDel(ids);
// 删除缓存
if (result > 0) {
for (AreaSubVO areaSub : list) {
this.clearCache(areaSub.getAreaId());
}
}
return result;
}
private List<AreaSubVO> selectAreaSubByIds(List<Long> ids) {
if (CollectionUtils.isEmptyElement(ids)) {
return Collections.emptyList();
}
AreaSubQuery query = new AreaSubQuery();
query.setIds(ids);
return areaSubMapper.selectAreaSubList(query);
}
@Override
public List<AreaSubVO> selectParkingAreaByAreaId(Long areaId) {
if (areaId == null) {
@ -164,4 +186,27 @@ public class AreaSubServiceImpl implements AreaSubService
query.setType(AreaSubType.PARKING.getCode());
return areaSubMapper.selectAreaSubList(query);
}
@Override
public List<AreaSubVO> selectSimpleNoRidingListByAreaId(Long areaId) {
if (areaId == null) {
return Collections.emptyList();
}
String key = CacheConstants.NO_RIDING_AREA_SUB_LIST + areaId;
List<AreaSubVO> list = redisCache.getCacheObject(key);
if (CollectionUtils.isEmptyElement(list)) {
AreaSubQuery query = new AreaSubQuery();
query.setAreaId(areaId);
list = areaSubMapper.selectAreaSubList(query);
}
return list;
}
private void clearCache(Long areaId) {
if (areaId == null) {
return;
}
String key = CacheConstants.NO_RIDING_AREA_SUB_LIST + areaId;
redisCache.deleteObject(key);
}
}

32
ruoyi-service/src/main/java/com/ruoyi/bst/areaSub/utils/AreaSubUtil.java
View File

@ -26,9 +26,9 @@ public class AreaSubUtil {
if (CollectionUtils.isEmptyElement(areaSubList)) {
return null;
}
double tolerance = 0; // 误差距离
BigDecimal tolerance = BigDecimal.ZERO; // 误差距离
if (areaError != null) {
tolerance = areaError.doubleValue();
tolerance = areaError;
}
for (AreaSubVO area : areaSubList) {
Geometry geometry = GeoUtils.fromWkt(area.getBoundary());
@ -36,9 +36,8 @@ public class AreaSubUtil {
continue;
}
if(area.getError() != null ){
tolerance = area.getError().doubleValue();
tolerance = area.getError();
}
// log.debug(" ---- 区域{} ---- 定位 {},{} ----",area.getName(), longitude, latitude);
boolean inCircle = GeoUtils.isInPolygonWithTolerance(longitude, latitude, geometry, tolerance);
if (inCircle) {
return area;
@ -47,4 +46,29 @@ public class AreaSubUtil {
return null;
}
/**
* 获取靠近的区域
* @param areaSubList 区域列表
* @param longitude 经度
* @param latitude 纬度
* @param error 误差
* @return 靠近的区域
*/
public static AreaSubVO getNearAreaSub(List<AreaSubVO> areaSubList, BigDecimal longitude, BigDecimal latitude, BigDecimal error) {
if (CollectionUtils.isEmptyElement(areaSubList)) {
return null;
}
for (AreaSubVO area : areaSubList) {
Geometry geometry = GeoUtils.fromWkt(area.getBoundary());
if (geometry == null) {
continue;
}
boolean inCircle = GeoUtils.isInPolygonWithTolerance(longitude, latitude, geometry, error);
if (inCircle) {
return area;
}
}
return null;
}
}

64
ruoyi-service/src/main/java/com/ruoyi/bst/commandLog/domain/CommandLog.java Normal file
View File

@ -0,0 +1,64 @@
package com.ruoyi.bst.commandLog.domain;
import java.time.LocalDateTime;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 命令日志对象 bst_command_log
*
* @author ruoyi
* @date 2025-04-03
*/
@Data
public class CommandLog extends BaseEntity
{
private static final long serialVersionUID = 1L;
private Long id;
@Excel(name = "类型", readConverterExp = "1=-在线API,2=-蓝牙")
@ApiModelProperty("类型")
private String type;
@Excel(name = "MAC号")
@ApiModelProperty("MAC号")
private String mac;
@Excel(name = "发送命令的原因")
@ApiModelProperty("发送命令的原因")
private String reason;
@Excel(name = "命令")
@ApiModelProperty("命令")
private String command;
@Excel(name = "命令发送的结果")
@ApiModelProperty("命令发送的结果")
private String result;
@Excel(name = "操作人ID")
@ApiModelProperty("操作人ID")
private Long userId;
@Excel(name = "操作人名称")
@ApiModelProperty("操作人名称")
private String userName;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("操作时间")
private LocalDateTime operaTime;
@Excel(name = "返回值code")
@ApiModelProperty("返回值code")
private Integer iotCode;
}

13
ruoyi-service/src/main/java/com/ruoyi/bst/commandLog/domain/CommandLogQuery.java Normal file
View File

@ -0,0 +1,13 @@
package com.ruoyi.bst.commandLog.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class CommandLogQuery extends CommandLogVO{
@ApiModelProperty("精准MAC")
private String eqMac;
}

8
ruoyi-service/src/main/java/com/ruoyi/bst/commandLog/domain/CommandLogVO.java Normal file
View File

@ -0,0 +1,8 @@
package com.ruoyi.bst.commandLog.domain;
import lombok.Data;
@Data
public class CommandLogVO extends CommandLog {
}

16
ruoyi-service/src/main/java/com/ruoyi/bst/commandLog/domain/enums/CommandLogType.java Normal file
View File

@ -0,0 +1,16 @@
package com.ruoyi.bst.commandLog.domain.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public enum CommandLogType {
API("1", "在线API"),
BLUETOOTH("2", "蓝牙");
private final String type;
private final String msg;
}

73
ruoyi-service/src/main/java/com/ruoyi/bst/commandLog/mapper/CommandLogMapper.java Normal file
View File

@ -0,0 +1,73 @@
package com.ruoyi.bst.commandLog.mapper;
import java.time.LocalDate;
import java.util.List;
import com.ruoyi.bst.commandLog.domain.CommandLog;
import com.ruoyi.bst.commandLog.domain.CommandLogVO;
import com.ruoyi.bst.commandLog.domain.CommandLogQuery;
import org.apache.ibatis.annotations.Param;
/**
* 命令日志Mapper接口
*
* @author ruoyi
* @date 2025-04-03
*/
public interface CommandLogMapper
{
/**
* 查询命令日志
*
* @param id 命令日志主键
* @return 命令日志
*/
CommandLogVO selectCommandLogById(Long id);
/**
* 查询命令日志列表
*
* @param query 命令日志
* @return 命令日志集合
*/
List<CommandLogVO> selectCommandLogList(@Param("query")CommandLogQuery query);
/**
* 新增命令日志
*
* @param commandLog 命令日志
* @return 结果
*/
int insertCommandLog(CommandLog commandLog);
/**
* 批量新增命令日志
*/
int batchInsert(@Param("list") List<? extends CommandLog> list);
/**
* 修改命令日志
*
* @param commandLog 命令日志
* @return 结果
*/
public int updateCommandLog(@Param("data") CommandLog commandLog);
/**
* 删除命令日志
*
* @param id 命令日志主键
* @return 结果
*/
int deleteCommandLogById(Long id);
/**
* 批量删除命令日志
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteCommandLogByIds(Long[] ids);
int clearBeforeDateLater(@Param("date") LocalDate date);
}

148
ruoyi-service/src/main/java/com/ruoyi/bst/commandLog/mapper/CommandLogMapper.xml Normal file
View File

@ -0,0 +1,148 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.bst.commandLog.mapper.CommandLogMapper">
<resultMap type="CommandLogVO" id="CommandLogResult" autoMapping="true"/>
<sql id="selectCommandLogVo">
select
bcl.id,
bcl.type,
bcl.mac,
bcl.reason,
bcl.command,
bcl.result,
bcl.user_id,
bcl.user_name,
bcl.opera_time,
bcl.iot_code
from bst_command_log bcl
</sql>
<sql id="searchCondition">
<if test="query.id != null "> and bcl.id = #{query.id}</if>
<if test="query.type != null and query.type != ''"> and bcl.type = #{query.type}</if>
<if test="query.mac != null and query.mac != ''"> and bcl.mac like concat('%', #{query.mac}, '%')</if>
<if test="query.eqMac != null and query.eqMac != ''"> and bcl.mac = #{query.eqMac}</if>
<if test="query.reason != null and query.reason != ''"> and bcl.reason like concat('%', #{query.reason}, '%')</if>
<if test="query.command != null and query.command != ''"> and bcl.command like concat('%', #{query.command}, '%')</if>
<if test="query.result != null and query.result != ''"> and bcl.result like concat('%', #{query.result}, '%')</if>
<if test="query.userId != null "> and bcl.user_id = #{query.userId}</if>
<if test="query.userName != null and query.userName != ''"> and bcl.user_name like concat('%', #{query.userName}, '%')</if>
<if test="query.iotCode != null "> and bcl.iot_code = #{query.iotCode}</if>
${query.params.dataScope}
</sql>
<select id="selectCommandLogList" parameterType="CommandLogQuery" resultMap="CommandLogResult">
<include refid="selectCommandLogVo"/>
<where>
<include refid="searchCondition"/>
</where>
</select>
<select id="selectCommandLogById" parameterType="Long" resultMap="CommandLogResult">
<include refid="selectCommandLogVo"/>
where bcl.id = #{id}
</select>
<insert id="batchInsert" parameterType="CommandLog" useGeneratedKeys="true" keyProperty="id">
insert into bst_command_log
<trim prefix="(" suffix=")" suffixOverrides=",">
type,
mac,
reason,
command,
result,
user_id,
user_name,
opera_time,
iot_code,
</trim>
values
<foreach collection="list" item="i" separator=",">
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="i.type != null and i.type != ''">#{i.type},</if>
<if test="i.type == null or i.type == ''">default,</if>
<if test="i.mac != null and i.mac != ''">#{i.mac},</if>
<if test="i.mac == null or i.mac == ''">default,</if>
<if test="i.reason != null ">#{i.reason},</if>
<if test="i.reason == null ">default,</if>
<if test="i.command != null ">#{i.command},</if>
<if test="i.command == null ">default,</if>
<if test="i.result != null ">#{i.result},</if>
<if test="i.result == null ">default,</if>
<if test="i.userId != null ">#{i.userId},</if>
<if test="i.userId == null ">default,</if>
<if test="i.userName != null ">#{i.userName},</if>
<if test="i.userName == null ">default,</if>
<if test="i.operaTime != null ">#{i.operaTime},</if>
<if test="i.operaTime == null ">default,</if>
<if test="i.iotCode != null ">#{i.iotCode},</if>
<if test="i.iotCode == null ">default,</if>
</trim>
</foreach>
</insert>
<insert id="insertCommandLog" parameterType="CommandLog" useGeneratedKeys="true" keyProperty="id">
insert into bst_command_log
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="type != null and type != ''">type,</if>
<if test="mac != null and mac != ''">mac,</if>
<if test="reason != null">reason,</if>
<if test="command != null">command,</if>
<if test="result != null">result,</if>
<if test="userId != null">user_id,</if>
<if test="userName != null">user_name,</if>
<if test="operaTime != null">opera_time,</if>
<if test="iotCode != null">iot_code,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="type != null and type != ''">#{type},</if>
<if test="mac != null and mac != ''">#{mac},</if>
<if test="reason != null">#{reason},</if>
<if test="command != null">#{command},</if>
<if test="result != null">#{result},</if>
<if test="userId != null">#{userId},</if>
<if test="userName != null">#{userName},</if>
<if test="operaTime != null">#{operaTime},</if>
<if test="iotCode != null">#{iotCode},</if>
</trim>
</insert>
<update id="updateCommandLog" parameterType="CommandLog">
update bst_command_log
<trim prefix="SET" suffixOverrides=",">
<include refid="updateColumns"/>
</trim>
where id = #{data.id}
</update>
<sql id="updateColumns">
<if test="data.type != null and data.type != ''">type = #{data.type},</if>
<if test="data.mac != null and data.mac != ''">mac = #{data.mac},</if>
<if test="data.reason != null">reason = #{data.reason},</if>
<if test="data.command != null">command = #{data.command},</if>
<if test="data.result != null">result = #{data.result},</if>
<if test="data.userId != null">user_id = #{data.userId},</if>
<if test="data.userName != null">user_name = #{data.userName},</if>
<if test="data.operaTime != null">opera_time = #{data.operaTime},</if>
<if test="data.iotCode != null">iot_code = #{data.iotCode},</if>
</sql>
<delete id="deleteCommandLogById" parameterType="Long">
delete from bst_command_log where id = #{id}
</delete>
<delete id="deleteCommandLogByIds" parameterType="String">
delete from bst_command_log where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<delete id="clearBeforeDateLater">
delete from bst_command_log where date(opera_time) &lt; #{date}
</delete>
</mapper>

93
ruoyi-service/src/main/java/com/ruoyi/bst/commandLog/service/CommandLogService.java Normal file
View File

@ -0,0 +1,93 @@
package com.ruoyi.bst.commandLog.service;
import java.time.LocalDate;
import java.util.List;
import com.ruoyi.bst.commandLog.domain.CommandLog;
import com.ruoyi.bst.commandLog.domain.CommandLogQuery;
import com.ruoyi.bst.commandLog.domain.CommandLogVO;
import com.ruoyi.common.core.domain.model.LoginUser;
/**
* 命令日志Service接口
*
* @author ruoyi
* @date 2025-04-03
*/
public interface CommandLogService
{
/**
* 查询命令日志
*
* @param id 命令日志主键
* @return 命令日志
*/
public CommandLogVO selectCommandLogById(Long id);
/**
* 查询命令日志列表
*
* @param commandLog 命令日志
* @return 命令日志集合
*/
public List<CommandLogVO> selectCommandLogList(CommandLogQuery commandLog);
/**
* 新增命令日志
*
* @param commandLog 命令日志
* @return 结果
*/
public int insertCommandLog(CommandLog commandLog);
/**
* 修改命令日志
*
* @param commandLog 命令日志
* @return 结果
*/
public int updateCommandLog(CommandLog commandLog);
/**
* 批量删除命令日志
*
* @param ids 需要删除的命令日志主键集合
* @return 结果
*/
public int deleteCommandLogByIds(Long[] ids);
/**
* 删除命令日志信息
*
* @param id 命令日志主键
* @return 结果
*/
public int deleteCommandLogById(Long id);
/**
* 插入一条API日志
*
* @param mac MAC
* @param command 命令
* @param result 结果
* @param reason 原因
* @param loginUser
* @param iotCode
*/
int addApiLog(String mac, String command, String result, String reason, LoginUser loginUser, Integer iotCode);
/**
* 插入一条蓝牙命令日志
*/
int addBluetoothLog(CommandLog po, LoginUser loginUser);
/**
* 批量插入
*/
int batchInsert(List<CommandLog> list);
/**
* 清除指定日期之前的日志
*/
int clearBeforeDateLater(LocalDate date);
}

161
ruoyi-service/src/main/java/com/ruoyi/bst/commandLog/service/impl/CommandLogServiceImpl.java Normal file
View File

@ -0,0 +1,161 @@
package com.ruoyi.bst.commandLog.service.impl;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
import com.ruoyi.bst.commandLog.domain.enums.CommandLogType;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.collection.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.bst.commandLog.domain.CommandLog;
import com.ruoyi.bst.commandLog.domain.CommandLogQuery;
import com.ruoyi.bst.commandLog.domain.CommandLogVO;
import com.ruoyi.bst.commandLog.mapper.CommandLogMapper;
import com.ruoyi.bst.commandLog.service.CommandLogService;
/**
* 命令日志Service业务层处理
*
* @author ruoyi
* @date 2025-04-03
*/
@Service
public class CommandLogServiceImpl implements CommandLogService
{
@Autowired
private CommandLogMapper commandLogMapper;
@Autowired
private RedisCache redisCache;
/**
* 查询命令日志
*
* @param id 命令日志主键
* @return 命令日志
*/
@Override
public CommandLogVO selectCommandLogById(Long id)
{
return commandLogMapper.selectCommandLogById(id);
}
/**
* 查询命令日志列表
*
* @param commandLog 命令日志
* @return 命令日志
*/
@Override
public List<CommandLogVO> selectCommandLogList(CommandLogQuery commandLog)
{
return commandLogMapper.selectCommandLogList(commandLog);
}
/**
* 新增命令日志
*
* @param commandLog 命令日志
* @return 结果
*/
@Override
public int insertCommandLog(CommandLog commandLog)
{
return commandLogMapper.insertCommandLog(commandLog);
}
/**
* 修改命令日志
*
* @param commandLog 命令日志
* @return 结果
*/
@Override
public int updateCommandLog(CommandLog commandLog)
{
return commandLogMapper.updateCommandLog(commandLog);
}
/**
* 批量删除命令日志
*
* @param ids 需要删除的命令日志主键
* @return 结果
*/
@Override
public int deleteCommandLogByIds(Long[] ids)
{
return commandLogMapper.deleteCommandLogByIds(ids);
}
/**
* 删除命令日志信息
*
* @param id 命令日志主键
* @return 结果
*/
@Override
public int deleteCommandLogById(Long id)
{
return commandLogMapper.deleteCommandLogById(id);
}
@Override
public int addApiLog(String mac, String command, String result, String reason, LoginUser loginUser, Integer iotCode) {
CommandLog po = new CommandLog();
po.setType(CommandLogType.API.getType());
po.setMac(mac);
po.setCommand(command);
po.setResult(result);
po.setReason(reason);
po.setIotCode(iotCode);
return this.addLog(po, loginUser);
}
@Override
public int addBluetoothLog(CommandLog po, LoginUser loginUser) {
po.setType(CommandLogType.BLUETOOTH.getType());
return this.addLog(po, loginUser);
}
@Override
public int batchInsert(List<CommandLog> list) {
if (CollectionUtils.isEmptyElement(list)) {
return 0;
}
return commandLogMapper.batchInsert(list);
}
@Override
public int clearBeforeDateLater(LocalDate date) {
if (date == null) {
return 0;
}
return commandLogMapper.clearBeforeDateLater(date);
}
private int addLog(CommandLog po, LoginUser loginUser) {
if (po == null || StringUtils.isBlank(po.getMac())) {
return 0;
}
po.setOperaTime(LocalDateTime.now());
if (loginUser != null) {
po.setUserId(loginUser.getUserId());
po.setUserName(loginUser.getNickName());
po.setUserId(loginUser.getUserId());
}
// 添加到缓存中
redisCache.rightPush(CacheConstants.INSERT_COMMAND_LOG, po);
return 1;
}
}

2
ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml
View File

@ -307,6 +307,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bd.mac,
bd.sn,
bd.status,
bd.lock_status,
bd.area_id,
bod.order_id
from bst_device bd
left join bst_order_device bod on bod.id = bd.order_device_id

11
ruoyi-service/src/main/java/com/ruoyi/bst/device/service/DeviceIotService.java
View File

@ -26,6 +26,16 @@ public interface DeviceIotService {
*/
int lock(DeviceVO device, boolean isAdmin, String reason, boolean requiredIot);
/**
* 强制断电
* @param device 设备
* @param isAdmin 是否管理员操作
* @param reason 原因
* @param requiredIot 是否IOT操作必须成功
* @return 结果
*/
int qLock(DeviceVO device, boolean isAdmin, String reason, boolean requiredIot);
/**
* 播放语音
* @param device 设备
@ -99,4 +109,5 @@ public interface DeviceIotService {
* @param ids 设备ID列表，若为空，则监控所有设备
*/
void monitor(List<Long> ids);
}

41
ruoyi-service/src/main/java/com/ruoyi/bst/device/service/impl/DeviceIotServiceImpl.java
View File

@ -49,8 +49,8 @@ public class DeviceIotServiceImpl implements DeviceIotService {
@Autowired
private ScheduledExecutorService scheduledExecutorService;
private final static Integer SUB_FAST = 300; // 上报频率（快）
private final static Integer SUB_SLOW = 3600; // 上报频率（慢）
private final static Integer SUB_FAST = 5; // 上报频率（快）
private final static Integer SUB_SLOW = 300; // 上报频率（慢）
@Override
public int unlock(DeviceVO device, boolean isAdmin, String reason, boolean requiredIot) {
@ -137,6 +137,43 @@ public class DeviceIotServiceImpl implements DeviceIotService {
return result == null ? 0 : result;
}
@Override
public int qLock(DeviceVO device, boolean isAdmin, String reason, boolean requiredIot) {
if (device == null || device.getId() == null) {
return 0;
}
ServiceUtil.assertion(!DeviceStatus.canLock().contains(device.getStatus()), "设备%s当前状态不允许锁车", device.getSn());
// 是否有正在进行的订单
boolean hasOrder = device.getOrderDeviceId() != null && OrderDeviceStatus.inUse().contains(device.getOrderDeviceStatus());
Integer result = transactionTemplate.execute(status -> {
// 更新设备状态
Device data = new Device();
data.setLockStatus(DeviceLockStatus.CLOSE.getCode());
data.setStatus(hasOrder ? DeviceStatus.TEMP_LOCKED.getCode() : DeviceStatus.AVAILABLE.getCode());
DeviceQuery query = new DeviceQuery();
query.setId(device.getId());
query.setStatusList(DeviceStatus.canLock());
int rows = deviceMapper.updateByQuery(data, query);
if (rows > 0) {
// 发送命令锁车
CommandResponse res = iotService.qLock(device, SUB_FAST, reason);
ServiceUtil.assertion(requiredIot && !IotUtil.isSuccess(res), IotUtil.getMsg(res));
}
return rows;
});
// 异步执行3次设备监控
if (!requiredIot) {
this.asyncMonitorCount(device.getId(), 3);
}
return result == null ? 0 : result;
}
@Override
public boolean play(DeviceVO device, String type, String reason) {
if (device == null) {

6
ruoyi-service/src/main/java/com/ruoyi/bst/locationLog/domain/LocationLogQuery.java
View File

@ -11,6 +11,9 @@ import lombok.Data;
@Data
public class LocationLogQuery extends LocationLogVO {
@ApiModelProperty("精准MAC")
private String eqMac;
@ApiModelProperty("id列表")
private List<Long> ids;
@ -22,4 +25,7 @@ public class LocationLogQuery extends LocationLogVO {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
@ApiModelProperty("时间范围")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private List<LocalDateTime> timeRange;
}

7
ruoyi-service/src/main/java/com/ruoyi/bst/locationLog/mapper/LocationLogMapper.xml
View File

@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="searchCondition">
<if test="query.id != null "> and bll.id = #{query.id}</if>
<if test="query.mac != null and query.mac != ''"> and bll.mac like concat('%', #{query.mac}, '%')</if>
<if test="query.eqMac != null and query.eqMac != ''"> and bll.mac = #{query.eqMac}</if>
<if test="query.sn != null and query.sn != ''"> and bll.sn like concat('%', #{query.sn}, '%')</if>
<if test="query.status != null and query.status != ''"> and bll.status = #{query.status}</if>
<if test="query.lockStatus != null and query.lockStatus != ''"> and bll.lock_status = #{query.lockStatus}</if>
@ -42,6 +43,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.iotStatus != null and query.iotStatus != ''"> and bll.iot_status = #{query.iotStatus}</if>
<if test="query.deviceId != null "> and bll.device_id = #{query.deviceId}</if>
<if test="query.orderId != null "> and bll.order_id = #{query.orderId}</if>
<if test="query.startTime != null"> and bll.at &gt;= #{query.startTime}</if>
<if test="query.endTime != null"> and bll.at &lt;= #{query.endTime}</if>
<if test="query.timeRange != null and query.timeRange.size() > 1">
and bll.at &gt;= #{query.timeRange[0]}
and bll.at &lt;= #{query.timeRange[1]}
</if>
<if test="query.ids != null and query.ids.size() > 0">
and bll.id in
<foreach item="item" collection="query.ids" open="(" separator="," close=")">

5
ruoyi-service/src/main/java/com/ruoyi/bst/locationLog/service/LocationLogConverter.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.bst.locationLog.service;
import com.ruoyi.bst.device.domain.DeviceVO;
import com.ruoyi.bst.locationLog.domain.LocationLog;
import com.ruoyi.iot.domain.ReceiveMsg;
@ -8,6 +9,6 @@ public interface LocationLogConverter {
/**
* 将ReceiveMsg转换为LocationLog
*/
LocationLog toPo(ReceiveMsg msg);
LocationLog toPo(DeviceVO device);
}

18
ruoyi-service/src/main/java/com/ruoyi/bst/locationLog/service/impl/LocationLogConverterImpl.java
View File

@ -29,33 +29,25 @@ public class LocationLogConverterImpl implements LocationLogConverter {
private IotConverter iotConverter;
@Override
public LocationLog toPo(ReceiveMsg msg) {
if (msg == null || StringUtils.isBlank(msg.getDevName())) {
public LocationLog toPo(DeviceVO device) {
if (device == null || StringUtils.isBlank(device.getMac())) {
return null;
}
// 查询设备信息
DeviceVO device = deviceService.selectSimpleByMacForLocationLog(msg.getDevName());
if (device == null) {
return null;
}
// 转为设备信息
IotDeviceSysInfo sys = IotUtil.toSysInfo(msg.getValue());
// 设置设备信息
DeviceUtil.setIotSysInfo(device, sys);
// 转为定位日志
LocationLog po = new LocationLog();
po.setMac(device.getMac());
po.setSn(device.getSn());
po.setStatus(device.getStatus());
po.setLockStatus(device.getLockStatus());
po.setIotStatus(device.getIotStatus());
po.setQuality(device.getQuality());
po.setVoltage(device.getVoltage());
po.setSignal(device.getSignalStrength());
po.setSatellites(device.getSatellites());
po.setLongitude(device.getLongitude());
po.setLatitude(device.getLatitude());
po.setAt(DateUtils.toLocalDateTime(msg.getAt()));
po.setAt(device.getLastLocationTime());
po.setDeviceId(device.getId());
po.setOrderId(device.getOrderId());
return po;

9
ruoyi-service/src/main/java/com/ruoyi/iot/service/IotService.java
View File

@ -54,6 +54,15 @@ public interface IotService {
* @return 结果
*/
CommandResponse lock(IotDevice device, int sub, String reason);
/**
* 强制断电
* @param device 设备
* @param sub 上报频率
* @param reason 原因
* @return 结果
*/
CommandResponse qLock(IotDevice device, int sub, String reason);
/**
* 播放语音

165
ruoyi-service/src/main/java/com/ruoyi/iot/service/impl/IotReceiveServiceImpl.java
View File

@ -1,16 +1,40 @@
package com.ruoyi.iot.service.impl;
import java.math.BigDecimal;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.List;
import org.locationtech.jts.geom.Geometry;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.bst.area.domain.AreaVO;
import com.ruoyi.bst.area.service.AreaService;
import com.ruoyi.bst.area.utils.AreaUtil;
import com.ruoyi.bst.areaSub.domain.AreaSubVO;
import com.ruoyi.bst.areaSub.service.AreaSubService;
import com.ruoyi.bst.areaSub.utils.AreaSubUtil;
import com.ruoyi.bst.device.domain.DeviceVO;
import com.ruoyi.bst.device.domain.enums.DeviceLockStatus;
import com.ruoyi.bst.device.domain.enums.DeviceStatus;
import com.ruoyi.bst.device.service.DeviceIotService;
import com.ruoyi.bst.device.service.DeviceService;
import com.ruoyi.bst.device.utils.DeviceUtil;
import com.ruoyi.bst.locationLog.domain.LocationLog;
import com.ruoyi.bst.locationLog.service.LocationLogConverter;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.map.GeoUtils;
import com.ruoyi.common.utils.map.GpsCoordinateUtils;
import com.ruoyi.iot.constants.IotConstants;
import com.ruoyi.iot.domain.IotDeviceSysInfo;
import com.ruoyi.iot.domain.ReceiveMsg;
import com.ruoyi.iot.enums.ReceiveType;
import com.ruoyi.iot.service.IotReceiveService;
import com.ruoyi.iot.service.IotService;
import com.ruoyi.iot.util.IotUtil;
import lombok.extern.slf4j.Slf4j;
@ -31,6 +55,18 @@ public class IotReceiveServiceImpl implements IotReceiveService {
@Autowired
private LocationLogConverter locationLogConverter;
@Autowired
private DeviceService deviceService;
@Autowired
private AreaSubService areaSubService;
@Autowired
private AreaService areaService;
@Autowired
private DeviceIotService deviceIotService;
@Override
public void handleReceive(ReceiveMsg msg) {
if (msg == null) {
@ -38,20 +74,139 @@ public class IotReceiveServiceImpl implements IotReceiveService {
}
// 数据点推送
if (ReceiveType.DATA_POINT.getType().equals(msg.getType())) {
this.handleLocationLog(msg);
log.info("dsId = {}", msg.getDsId());
if (IotConstants.DS_SYS.equals(msg.getDsId())) {
// 查询设备信息
DeviceVO device = deviceService.selectSimpleByMacForLocationLog(msg.getDevName());
if (device == null) {
return;
}
// 转为设备信息
IotDeviceSysInfo sys = IotUtil.toSysInfo(msg.getValue());
// 设置设备信息
DeviceUtil.setIotSysInfo(device, sys);
LocalDateTime at = DateUtils.toLocalDateTime(msg.getAt());
device.setLastTime(at);
device.setLastLocationTime(at);
this.handleArea(device);
this.handleLocationLog(device);
}
}
// 生命周期
else if (ReceiveType.DEVICE_STATUS.getType().equals(msg.getType())) {
}
}
private void handleLocationLog(ReceiveMsg msg) {
log.info("处理定位日志: {}", msg);
/**
* 处理车辆运营区
*/
private void handleArea(DeviceVO device) {
if (device == null) {
return;
}
// 相差一分钟以上的消息不做处理
Duration duration = Duration.between(device.getLastTime(), LocalDateTime.now());
if (duration.getSeconds() > 60) {
return;
}
// 管理员开锁，不处理
boolean isAdminUnlocking = DeviceStatus.DISPATCHING.getCode().equals(device.getStatus());
if (isAdminUnlocking) {
return;
}
// 坐标转换 WGS84 转 GCJ02
List<BigDecimal> position = GpsCoordinateUtils.coordinateConvert(device.getLongitude(), device.getLatitude());
BigDecimal lon = position.get(1);
BigDecimal lat = position.get(0);
log.info("转换后的GCJ02经纬度：{}---{}", lon, lat);
// 查询运营区
AreaVO area = areaService.selectAreaById(device.getAreaId());
if(area == null){
return;
}
// 查询运营区内的禁行区
List<AreaSubVO> noRidingList = areaSubService.selectSimpleNoRidingListByAreaId(device.getAreaId());
// 处理设备在运营区内的行为
handleDeviceArea(device, area, noRidingList);
}
// 设备运营区处理
private void handleDeviceArea(DeviceVO device, AreaVO area, List<AreaSubVO> noRidingList) {
if (device == null || area == null) {
return;
}
// 车辆是否开锁
boolean isOpen = DeviceLockStatus.OPEN.getCode().equals(device.getLockStatus());
BigDecimal boundaryDistance = area.getBoundaryDistance();// 靠近运营区边界时的播报距离
BigDecimal outAreaDistance = area.getOutageDistance();// 超出运营区外断电距离
// 创建多边形对象
Geometry polygon = GeoUtils.fromWkt(area.getBoundary());
// 是否在运营区最小内边界
boolean isInAreaMin = AreaUtil.isInAreaMin(area, device.getLongitude(), device.getLatitude());
// 是否在运营区最大外边界
boolean isInAreaMax = AreaUtil.isInAreaMax(area, device.getLongitude(), device.getLatitude());
// 是否在运营区内
boolean isInArea = AreaUtil.isInArea(area, device.getLongitude(), device.getLatitude());
// 是否在禁行区内
AreaSubVO inAreaSub = AreaSubUtil.getInAreaSub(noRidingList, device.getLongitude(), device.getLatitude(), area.getError());
boolean isInNoRidingArea = inAreaSub != null;
// 是否靠近禁行区
AreaSubVO nearAreaSub = AreaSubUtil.getNearAreaSub(noRidingList, device.getLongitude(), device.getLatitude(), boundaryDistance);
boolean isNearyNoRidingArea = nearAreaSub != null;
// 在运营区内，并且不在禁行区内，并且车辆为关锁状态，为车辆上电
if (isInAreaMax && !isInNoRidingArea && !isOpen) {
deviceIotService.unlock(device, false, "重新返回运营区上电", false);
return;
}
// 靠近运营区内边界，且车辆为开锁状态，播报语音警告
if(isOpen) {
if (isNearyNoRidingArea) {
deviceIotService.play(device, IotConstants.PLAY_BOUNDARY_NEAR, "靠近禁行区");
return;
}
if (isInArea && !isInAreaMin) {
deviceIotService.play(device, IotConstants.PLAY_BOUNDARY_NEAR, "靠近运营区内边界");
return;
}
// 靠近运营区外边界，且车辆为开锁状态，播报二次语音警告
if(!isInArea && isInAreaMax) {
deviceIotService.play(device, IotConstants.PLAY_BOUNDARY_OUT, "超出运营区外边界，还未到达断电距离");
return;
}
// 超出运营区域外的最大范围，且车辆为开锁状态，强制断电
if (area.getAreaOutOutage() != null && area.getAreaOutOutage()) {
if (isInNoRidingArea) {
deviceIotService.qLock(device, false, "进入禁行区，强制断电", false);
return;
}
if (!isInAreaMax) {
deviceIotService.qLock(device, false, "超出运营区外边界最大值，强制断电", false);
return;
}
}
}
}
// 定位日志处理
private void handleLocationLog(DeviceVO device) {
// 转换定位日志
LocationLog po = locationLogConverter.toPo(msg);
LocationLog po = locationLogConverter.toPo(device);
if (po == null) {
log.error("转换定位日志失败: {}", msg);
log.error("转换定位日志失败: {}", device.getMac());
return;
}

23
ruoyi-service/src/main/java/com/ruoyi/iot/service/impl/IotServiceImpl.java
View File

@ -8,13 +8,14 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import com.ruoyi.bst.device.service.DeviceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.bst.commandLog.service.CommandLogService;
import com.ruoyi.bst.device.service.DeviceService;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.model.LoginUser;
@ -86,6 +87,9 @@ public class IotServiceImpl implements IotService {
@Autowired
private ScheduledExecutorService scheduledExecutorService;
@Autowired
private CommandLogService commandLogService;
// 查询OneNet设备在线状态
@Override
public String getOnlineStatus(IotDevice device, String type) {
@ -287,7 +291,7 @@ public class IotServiceImpl implements IotService {
}
}
// TODO 异步添加日志
// 异步添加日志
private void addCommandLog(String deviceName, String command, String result, String reason, Integer iotCode) {
LoginUser loginUser = null;
try {
@ -295,7 +299,7 @@ public class IotServiceImpl implements IotService {
} catch (Exception e) {
log.error(e.getMessage());
}
// commandLogService.addApiLog(deviceName, command, result, reason, loginUser, iotCode);
commandLogService.addApiLog(deviceName, command, result, reason, loginUser, iotCode);
}
private CommandResponse uploadData(String deviceName, String productId, String reason) {
@ -310,7 +314,7 @@ public class IotServiceImpl implements IotService {
if (device == null) {
return null;
}
String command = IotConstants.COMMAND_UNLOCK + IotConstants.COMMAND_SEPARATOR + IotConstants.COMMAND_SUB + sub;
String command = IotConstants.COMMAND_UNLOCK + IotConstants.COMMAND_SUB + sub + IotConstants.COMMAND_SEPARATOR;
return sendCommand(device.mac(), command, productId, reason);
}
@ -319,10 +323,19 @@ public class IotServiceImpl implements IotService {
if (device == null) {
return null;
}
String command = IotConstants.COMMAND_LOCK + IotConstants.COMMAND_SEPARATOR + IotConstants.COMMAND_SUB + sub;
String command = IotConstants.COMMAND_LOCK + IotConstants.COMMAND_SUB + sub + IotConstants.COMMAND_SEPARATOR;
return sendCommand(device.mac(), command, productId, reason);
}
@Override
public CommandResponse qLock(IotDevice device, int sub, String reason) {
if (device == null) {
return null;
}
String command = IotConstants.COMMAND_QLOSE + IotConstants.COMMAND_SUB + sub + IotConstants.COMMAND_SEPARATOR;
return sendCommand(device.mac(), command, productId, reason);
}
@Override
public CommandResponse play(IotDevice device, String type, String reason) {
if (device == null || StringUtils.isBlank(type)) {

46
ruoyi-web/src/main/java/com/ruoyi/task/commandLog/CommandLogTask.java Normal file
View File

@ -0,0 +1,46 @@
package com.ruoyi.task.commandLog;
import com.ruoyi.bst.commandLog.domain.CommandLog;
import com.ruoyi.bst.commandLog.service.CommandLogService;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.collection.CollectionUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.time.LocalDate;
import java.util.List;
/**
* @author wjh
* 2025/1/4
*/
@Component
@Slf4j
public class CommandLogTask {
@Autowired
private RedisCache redisCache;
@Autowired
private CommandLogService commandLogService;
// 从缓存中获取数据，并插入到数据库中
public void recordRedis() {
List<CommandLog> list = redisCache.getAndClearCacheList(CacheConstants.INSERT_COMMAND_LOG);
if (CollectionUtils.isEmptyElement(list)) {
log.info("暂无需要保存的数据");
return;
}
// 插入数据库
int insert = commandLogService.batchInsert(list);
log.info("插入命令日志成功，共插入{}条数据", insert);
}
public void clearBeforeDays(Integer days) {
commandLogService.clearBeforeDateLater(LocalDate.now().plusDays(-days));
}
}

110
ruoyi-web/src/main/java/com/ruoyi/web/bst/CommandLogController.java Normal file
View File

@ -0,0 +1,110 @@
package com.ruoyi.web.bst;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.bst.commandLog.domain.CommandLog;
import com.ruoyi.bst.commandLog.domain.CommandLogQuery;
import com.ruoyi.bst.commandLog.domain.CommandLogVO;
import com.ruoyi.bst.commandLog.service.CommandLogService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
/**
* 命令日志Controller
*
* @author ruoyi
* @date 2025-04-03
*/
@RestController
@RequestMapping("/bst/commandLog")
public class CommandLogController extends BaseController
{
@Autowired
private CommandLogService commandLogService;
/**
* 查询命令日志列表
*/
@PreAuthorize("@ss.hasPermi('bst:commandLog:list')")
@GetMapping("/list")
public TableDataInfo list(CommandLogQuery query)
{
startPage();
startOrderBy();
List<CommandLogVO> list = commandLogService.selectCommandLogList(query);
return getDataTable(list);
}
/**
* 导出命令日志列表
*/
@PreAuthorize("@ss.hasPermi('bst:commandLog:export')")
@Log(title = "命令日志", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, CommandLogQuery query)
{
List<CommandLogVO> list = commandLogService.selectCommandLogList(query);
ExcelUtil<CommandLogVO> util = new ExcelUtil<CommandLogVO>(CommandLogVO.class);
util.exportExcel(response, list, "命令日志数据");
}
/**
* 获取命令日志详细信息
*/
@PreAuthorize("@ss.hasPermi('bst:commandLog:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(commandLogService.selectCommandLogById(id));
}
/**
* 新增命令日志
*/
@PreAuthorize("@ss.hasPermi('bst:commandLog:add')")
@Log(title = "命令日志", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody CommandLog commandLog)
{
return toAjax(commandLogService.insertCommandLog(commandLog));
}
/**
* 修改命令日志
*/
@PreAuthorize("@ss.hasPermi('bst:commandLog:edit')")
@Log(title = "命令日志", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody CommandLog commandLog)
{
return toAjax(commandLogService.updateCommandLog(commandLog));
}
/**
* 删除命令日志
*/
@PreAuthorize("@ss.hasPermi('bst:commandLog:remove')")
@Log(title = "命令日志", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(commandLogService.deleteCommandLogByIds(ids));
}
}

16
ruoyi-web/src/main/java/com/ruoyi/web/bst/LocationLogController.java
View File

@ -55,6 +55,22 @@ public class LocationLogController extends BaseController
return getDataTable(list);
}
/**
* 查询全部，不分页
*/
@PreAuthorize("@ss.hasPermi('bst:locationLog:list')")
@GetMapping("/listAll")
public AjaxResult listAll(LocationLogQuery query)
{
if (query.getDeviceId() == null && query.getEqMac() == null && query.getOrderId() == null) {
return error("设备ID、MAC、订单ID不能同时为空");
}
startOrderBy();
query.setScope(true);
List<LocationLogVO> list = locationLogService.selectLocationLogList(query);
return success(list);
}
/**
* 根据时间段查询全部定位日志
*/