From ec42f427048cbc64a0cbe1f4536fb9ece845f5eb Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Mon, 2 Sep 2024 16:38:18 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E5=86=B7=E5=8D=B4?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/receive/ReceiveController.java | 45 +++++++++++++++---- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java index 0c17976..05edb1a 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java @@ -40,6 +40,8 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; @@ -94,6 +96,9 @@ public class ReceiveController { private static AtomicLong lastCommandTime = new AtomicLong(0); private static final long COMMAND_COOLDOWN_MS = 5 * 60 * 1000; // 5分钟 + private static final Map commandCooldownMap = new ConcurrentHashMap<>(); + private static final long COOLDOWN_PERIOD_MS = 10000; // 冷却时间为 10 秒 + /** * 功能描述：第三方平台数据接收。

@@ -308,34 +313,35 @@ public class ReceiveController { /** 超出运营区断电*/ private void outAreaOutage(LogEntry.LocationValue value, AsDevice device, BigDecimal lon, BigDecimal lat, EtOperatingArea area, String isAdminUnlocking, boolean noRidingArea) throws UnsupportedEncodingException, NoSuchAlgorithmException, InvalidKeyException { String nearBoundaryDistanceConfig = sysConfigService.selectConfigByKey("near.boundary.distance");// 靠近运营区边界时的播报距离 -// log.info("靠近运营区边界时的播报距离==================：" + nearBoundaryDistanceConfig); + log.info("靠近运营区边界时的播报距离==================：" + nearBoundaryDistanceConfig); double nearBoundaryDistance = Double.parseDouble(nearBoundaryDistanceConfig); String exceedArea = sysConfigService.selectConfigByKey("exceed.area.distance");// 超出运营区外断电距离 -// log.info("超出运营区外断电距离================：" + exceedArea); + log.info("超出运营区外断电距离================：" + exceedArea); int exceedDistance = Integer.parseInt(exceedArea); // 创建多边形对象 Geometry polygon = GeoUtils.fromWkt(area.getBoundary()); // 是否在缩短后的运营区边界内 boolean inPolygonWithTolerance = GeoUtils.isInPolygonWithShorten(lon.toString(), lat.toString(), polygon, nearBoundaryDistance); - if(!inPolygonWithTolerance && !isAdminUnlocking.equals("1")){//没有在缩短后的运营区边界内 + log.info("=========================是否在缩短后的运营区边界内：{}，车辆定位=【{},{}】边界=【{}】",inPolygonWithTolerance,lon,lat,polygon); + if(!inPolygonWithTolerance && !isAdminUnlocking.equals("1") && device.getStatus().equals(ServiceConstants.VEHICLE_STATUS_IN_USING)){//没有在缩短后的运营区边界内 boolean inPolygonWithTolerance1 = GeoUtils.isInPolygonWithTolerance(lon.toString(), lat.toString(), polygon, 0);// 是否在运营区内 boolean isNearBoundary = GeoUtils.isInPolygonWithTolerance(lon.toString(), lat.toString(), polygon, exceedDistance ); if(inPolygonWithTolerance1){//是否在运营区边界内 // 在靠近运营区边界时发警报 log.info("靠近运营区边界发警告命令===============--SN：" + device.getSn()); - asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_PLAY2, "靠近运营区边界", null, null); + sendCommandWithCooldown(device, IotConstants.COMMAND_PLAY2, "靠近运营区边界"); returnPower(device, noRidingArea); }else if(isNearBoundary){ // 是否在超出运营区边界多少米内 //在20米范围内，发报警 log.info("超出运营区"+exceedDistance+"米内发送警告命令==============--SN：" + device.getSn()); - asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_PLAY3, "超出运营区"+exceedDistance+"米内",null,null); + sendCommandWithCooldown(device, IotConstants.COMMAND_PLAY3, "超出运营区" + exceedDistance + "米内"); }else{ // 超出运营区外断电 String areaOutOutage = area.getAreaOutOutage(); if (areaOutOutage.equals("1")) { // 超出营运区断电 log.info("超出营运区断电命令=================--SN：" + device.getSn()); - asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_QLOSE+IotConstants.COMMAND_FREQUENCY_5, "超出营运区断电",null,null); + sendCommandWithCooldown(device, IotConstants.COMMAND_QLOSE + IotConstants.COMMAND_FREQUENCY_5, "超出营运区断电"); device.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE); int updateAsDevice = asDeviceService.updateAsDevice(device); if (updateAsDevice > 0) { @@ -349,6 +355,29 @@ public class ReceiveController { } } + /** 带20秒的冷却时间 */ + private void sendCommandWithCooldown(AsDevice device, String command, String message) { + String deviceKey = device.getSn() + "_" + command; // 使用设备SN和命令作为唯一标识 + long currentTime = System.currentTimeMillis(); + Long lastCommandTime = commandCooldownMap.get(deviceKey); + + if (lastCommandTime == null || (currentTime - lastCommandTime) > COOLDOWN_PERIOD_MS) { + // 冷却时间已过，可以发送命令 + try { + asDeviceService.sendCommand(device.getMac(), Token.getToken(), command, message, null, null); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + } catch (InvalidKeyException e) { + e.printStackTrace(); + } + commandCooldownMap.put(deviceKey, currentTime); // 更新命令发送时间 + } else { + log.info("命令在冷却时间内，不执行命令==============--SN：" + device.getSn()); + } + } + /** 返回运营区上电 */ private void returnPower(AsDevice device, boolean noRidingArea) throws UnsupportedEncodingException, NoSuchAlgorithmException, InvalidKeyException { // 判断该车辆是否在进行中的订单,并且车辆的锁状态是关，状态是骑行中 @@ -375,7 +404,7 @@ public class ReceiveController { String noRidingOutage = area.getNoRidingOutage(); if (noRidingOutage.equals("1") && value.getStatus() != 3 && !isAdminUnlocking.equals("1")) { // 禁行区内断电 log.info("禁行区内断电命令--SN：" + device.getSn()); - asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_QLOSE+IotConstants.COMMAND_FREQUENCY_5, "禁行区内断电",null,null); + sendCommandWithCooldown(device, IotConstants.COMMAND_QLOSE + IotConstants.COMMAND_FREQUENCY_5, "禁行区内断电"); device.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE); int updateAsDevice = asDeviceMapper.updateAsDevice(device); if (updateAsDevice > 0) { @@ -387,7 +416,7 @@ public class ReceiveController { boolean inPolygon = asDeviceService.isNoRidingAreaWithTolerance(device.getSn(), device.getAreaId(),30); if (inPolygon && !isAdminUnlocking.equals("1")) { log.info("距离禁行区20米内发送警告命令--SN：" + device.getSn()); - asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_PLAY2, "距离禁行区30米内",null,null); + sendCommandWithCooldown(device, IotConstants.COMMAND_PLAY2, "距离禁行区30米内"); } } return noRidingArea;