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 46f7e0a..f14e26e 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 @@ -21,12 +21,12 @@ import com.ruoyi.system.domain.EtAdminOrder; import com.ruoyi.system.domain.EtOnlineLog; import com.ruoyi.system.domain.EtOperatingArea; import com.ruoyi.system.mapper.AsDeviceMapper; -import com.ruoyi.system.mapper.EtLocationLogMapper; import com.ruoyi.system.service.*; import com.ruoyi.web.controller.iot.domain.BodyObj; import com.ruoyi.web.controller.iot.util.Util; import lombok.SneakyThrows; import org.jetbrains.annotations.NotNull; +import org.locationtech.jts.geom.Geometry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -58,16 +58,12 @@ public class ReceiveController { @Value(value = "${iot.token}") private String token; - @Resource private IAsDeviceService asDeviceService; @Resource private AsDeviceMapper asDeviceMapper; - @Autowired - private IEtModelService etModelService; - @Resource private IEtOperatingAreaService etOperatingAreaService; @@ -86,14 +82,14 @@ public class ReceiveController { @Autowired private IEtOnlineLogService etOnlineLogService; - @Resource - private EtLocationLogMapper etLocationLogMapper; - private final Object lock = new Object(); @Autowired private RedisCache redisCache; + @Autowired + private ISysConfigService sysConfigService; + // 用于记录上次发送命令的时间 private static AtomicLong lastCommandTime = new AtomicLong(0); private static final long COMMAND_COOLDOWN_MS = 5 * 60 * 1000; // 5分钟 @@ -143,6 +139,9 @@ public class ReceiveController { boolean dataRight = Util.checkSignature(obj, token); if (dataRight){ + // 记录开始时间 + long startTime = System.nanoTime(); + log.info("receive方法验证签名正确: content" + JSON.toJSONString(obj)); String msg = (String) obj.getMsg(); log.info("receive方法-获取到消息体: msg---" +msg); @@ -174,7 +173,7 @@ public class ReceiveController { /** 2. 判断是否在禁行区内 如果在， 根据配置‘禁行区内断电配置’进行断电 **/ String isAdminUnlocking = asDevice.getIsAdminUnlocking();// 是否是管理员开锁：0-否；1-是 boolean noRidingArea = isNoRidingArea(value, asDevice, area, isAdminUnlocking); - /** 3.超出运营区外断电*/ + /** 3.超出运营区外断电 包含靠近运营区播报 */ outAreaOutage(value, asDevice, lon, lat, area, isAdminUnlocking, noRidingArea); /** 4.锁同步关锁 */ lockSynchronization(msg, asDevice, logEntry, value, asDevice, lon, lat); @@ -185,6 +184,10 @@ public class ReceiveController { log.info("未找到车辆对象：" +logEntry.getDevName()); } } + // 计算执行时间（以毫秒为单位） + long duration = (System.nanoTime() - startTime) / 1_000_000; + // 输出执行时间 + log.info("===============回调方法执行时间============= " + duration + " 毫秒"); }else { log.info("receive方法验证签名错误: signature error"); } @@ -302,44 +305,62 @@ 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 { - boolean isAreaZone = asDeviceService.isAreaZone(device.getSn(), area); - if(!isAreaZone){ - //是否在30米范围内 - boolean inPolygon = GeoUtils.isInPolygonWithTolerance(lon.toString(), lat.toString(), GeoUtils.fromWkt(area.getBoundary()), 60); - if(inPolygon && !isAdminUnlocking.equals("1")){ + String nearBoundaryDistanceConfig = sysConfigService.selectConfigByKey("near.boundary.distance");// 靠近运营区边界时的播报距离 + log.info("靠近运营区边界时的播报距离==================：" + nearBoundaryDistanceConfig); + double nearBoundaryDistance = Double.parseDouble(nearBoundaryDistanceConfig); + String exceedArea = sysConfigService.selectConfigByKey("exceed.area.distance");// 超出运营区外断电距离 + 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")){//没有在缩短后的运营区边界内 + 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); + returnPower(device, noRidingArea); + }else if(isNearBoundary){ // 是否在超出运营区边界多少米内 //在20米范围内，发报警 - log.info("超出运营区30米内发送警告命令--SN：" + device.getSn()); - asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_PLAY3, "超出运营区30米内",null,null); + log.info("超出运营区"+exceedDistance+"米内发送警告命令--SN：" + device.getSn()); + asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_PLAY3, "超出运营区"+exceedDistance+"米内",null,null); }else{ - //超出运营区外断电 + // 超出运营区外断电 String areaOutOutage = area.getAreaOutOutage(); - if (areaOutOutage.equals("1") && value.getStatus() != 3 && !isAdminUnlocking.equals("1")) { // 超出营运区断电 + if (areaOutOutage.equals("1")) { // 超出营运区断电 log.info("超出营运区断电命令--SN：" + device.getSn()); asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_QLOSE+IotConstants.COMMAND_FREQUENCY_5, "超出营运区断电",null,null); device.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE); - int updateAsDevice = asDeviceMapper.updateAsDevice(device); + int updateAsDevice = asDeviceService.updateAsDevice(device); if (updateAsDevice > 0) { log.info("禁行区内断电--更新设备锁状态成功SN：" + device.getSn()); } } } }else{ - // 判断该车辆是否在进行中的订单,并且车辆的锁状态是关，状态是骑行中 - Boolean inOrderBySn = etOrderService.isInOrderBySn(device.getSn()); - if (inOrderBySn && ServiceConstants.VEHICLE_STATUS_IN_USING.equals(device.getStatus()) && ServiceConstants.LOCK_STATUS_CLOSE.equals(device.getLockStatus())) { // 有正在骑行的订单，给车辆上电 - if(!noRidingArea){ - log.info("返回营运区上电，有正在骑行的订单，给车辆上电--SN：" + device.getSn()); - asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_OPEN+IotConstants.COMMAND_FREQUENCY_5, "返回营运区上电",null,null); - // 更新车辆状态和锁状态 - /** 3.更新车辆状态*/ - device.setLockStatus(ServiceConstants.LOCK_STATUS_OPEN); - device.setStatus(ServiceConstants.VEHICLE_STATUS_IN_USING); - device.setIsAdminUnlocking("0"); - int i1 = asDeviceMapper.updateAsDevice(device); - if(i1>1){ - log.info("【返回营运区上电】更新车辆状态成功"); - } - } + returnPower(device, noRidingArea); + } + } + + /** 返回运营区上电 */ + private void returnPower(AsDevice device, boolean noRidingArea) throws UnsupportedEncodingException, NoSuchAlgorithmException, InvalidKeyException { + // 判断该车辆是否在进行中的订单,并且车辆的锁状态是关，状态是骑行中 + Boolean inOrderBySn = etOrderService.isInOrderBySn(device.getSn()); + if (inOrderBySn && ServiceConstants.VEHICLE_STATUS_IN_USING.equals(device.getStatus()) && ServiceConstants.LOCK_STATUS_CLOSE.equals(device.getLockStatus()) && !noRidingArea) { // 有正在骑行的订单，给车辆上电 + log.info("返回营运区上电，有正在骑行的订单，给车辆上电--SN：" + device.getSn()); + asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_OPEN+IotConstants.COMMAND_FREQUENCY_5, "返回营运区上电",null,null); + // 更新车辆状态和锁状态 + /** 3.更新车辆状态*/ + device.setLockStatus(ServiceConstants.LOCK_STATUS_OPEN); + device.setStatus(ServiceConstants.VEHICLE_STATUS_IN_USING); + device.setIsAdminUnlocking("0"); + int i1 = asDeviceMapper.updateAsDevice(device); + if(i1>1){ + log.info("【返回营运区上电】更新车辆状态成功"); } } } diff --git a/electripper-admin/src/test/java/MainTests.java b/electripper-admin/src/test/java/MainTests.java index 772ae36..7e9bd73 100644 --- a/electripper-admin/src/test/java/MainTests.java +++ b/electripper-admin/src/test/java/MainTests.java @@ -38,6 +38,8 @@ public class MainTests { @Test @SneakyThrows public void testSelectActivityById() { + // 记录开始时间 + long startTime = System.nanoTime(); AsDevice device = asDeviceService.selectAsDeviceByMac("75D30EA71454"); BigDecimal lon = new BigDecimal("120.25709"); @@ -85,6 +87,15 @@ public class MainTests { }else{ log.info("在运营区域内"); } + + // 记录结束时间 + long endTime = System.nanoTime(); + + // 计算执行时间（以毫秒为单位） + long duration = (endTime - startTime) / 1_000_000; + + // 输出执行时间 + System.out.println("Execution time: " + duration + " milliseconds"); }