From d2bc7617a69b2dcd8388ac6f082c45b856d7941c Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Wed, 28 Aug 2024 21:43:56 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=BF=83=E8=B7=B3=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E7=A7=BB=E5=88=B0redis=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/receive/ReceiveController.java | 266 ++++++++---------- .../src/test/java/MainTests.java | 3 - .../ruoyi/common/constant/CacheConstants.java | 5 + .../ruoyi/common/utils/onenet}/LogEntry.java | 2 +- .../java/com/ruoyi/system/task/EtTask.java | 141 +++++++++- 5 files changed, 265 insertions(+), 152 deletions(-) rename {electripper-admin/src/main/java/com/ruoyi/web/controller/iot/domain => electripper-common/src/main/java/com/ruoyi/common/utils/onenet}/LogEntry.java (94%) 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 90584f1..46f7e0a 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 @@ -1,26 +1,29 @@ package com.ruoyi.web.controller.iot.receive; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; +import com.ruoyi.common.constant.CacheConstants; import com.ruoyi.common.constant.IotConstants; import com.ruoyi.common.constant.ServiceConstants; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.CommonUtil; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.map.GeoUtils; import com.ruoyi.common.utils.map.GpsCoordinateUtils; +import com.ruoyi.common.utils.onenet.LogEntry; import com.ruoyi.common.utils.onenet.Token; import com.ruoyi.common.utils.uuid.IdUtils; -import com.ruoyi.system.domain.*; +import com.ruoyi.system.domain.AsDevice; +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.domain.LogEntry; import com.ruoyi.web.controller.iot.util.Util; import lombok.SneakyThrows; import org.jetbrains.annotations.NotNull; @@ -37,7 +40,6 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; -import java.util.Date; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; @@ -60,6 +62,9 @@ public class ReceiveController { @Resource private IAsDeviceService asDeviceService; + @Resource + private AsDeviceMapper asDeviceMapper; + @Autowired private IEtModelService etModelService; @@ -113,29 +118,22 @@ public class ReceiveController { log.info("receive方法接收到参数: body String --- " +body); /************************************************ * 解析数据推送请求，非加密模式。 - * 如果是明文模式使用以下代码 hangdleBody(body, false); ChatGPT is under heavy load + * 如果是明文模式使用以下代码 hangdleBody(body, false); **************************************************/ /*************明文模式 start****************/ BodyObj obj = Util.resolveBody(body, false); log.info("receive方法解析对象: body Object --- " + JSON.toJSONString(obj)); log.info("接收到receive方法时间: " + System.currentTimeMillis()); - /** */ - // 起一个异步线程处理数据 - scheduledExecutorService.schedule(() -> { - new Thread(() -> { - synchronized (lock) { - try { - handleBody(obj); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } catch (NoSuchAlgorithmException e) { - e.printStackTrace(); - } catch (InvalidKeyException e) { - e.printStackTrace(); - } + // 使用线程池提交任务 + scheduledExecutorService.submit(() -> { + synchronized (lock) { + try { + handleBody(obj); + } catch (UnsupportedEncodingException | NoSuchAlgorithmException | InvalidKeyException e) { + e.printStackTrace(); } - }).start(); - }, 0, TimeUnit.SECONDS); + } + }); /*************明文模式 end****************/ return "ok"; } @@ -144,13 +142,6 @@ public class ReceiveController { if (obj != null){ boolean dataRight = Util.checkSignature(obj, token); -// elec_device_设备id_info:{ccccccc} - // 1. handleBody中的所有保存数据库的操作全部保存在redis中 - // 2. 定时任务：更新设备的在线状态, 5秒一次 - // 3. 定时任务：更新设备的定位和电压, 5秒一次 - // 4. 定时任务：插入onenet定位信息, 5秒一次 - // 5. 获取最新的定位从redis中获取 - if (dataRight){ log.info("receive方法验证签名正确: content" + JSON.toJSONString(obj)); String msg = (String) obj.getMsg(); @@ -158,56 +149,37 @@ public class ReceiveController { JSONObject jsonObject = JSONObject.parseObject(msg, JSONObject.class); String devName = (String)jsonObject.get("dev_name"); /*异步更新在线状态*/ - AsDevice asDevice = asDeviceService.selectAsDeviceByMac(devName); + AsDevice asDevice = asDeviceMapper.selectAsDeviceByMac(devName); asynchronousUpdateOnlineStatus(asDevice); if(IotConstants.ONENET_LOCATION.equals(jsonObject.get("ds_id")) && ObjectUtil.isNotNull(jsonObject.get("value"))){ LogEntry logEntry = JSONObject.parseObject(msg, LogEntry.class); log.info("logEntry转换后的对象: logEntry---【{}】" , JSON.toJSONString(logEntry)); LogEntry.LocationValue value = logEntry.getValue(); - /**如果是定位日志则，获取到车辆mac，找到对应车辆 - * 1.更新车辆定位、计算续航里程 - * 2.判断是否在禁行区内，如果在，根据配置‘禁行区内断电配置’进行断电， - * 3.超出运营区外断电 - * 4.行程线路添加，更新订单中的trip_route字段 - * 5.低于电量（%）不得骑行，声音播报 - * 6.低电量 生成换电工单 - * 7.运营边界判断 - * */ - /** 1.更新车辆定位、电压；计算续航里程 */ - AsDevice device = asDeviceService.selectAsDeviceByMac(logEntry.getDevName()); - if(ObjectUtil.isNull(device)){ + if(ObjectUtil.isNull(asDevice)){ throw new ServiceException("未找到车辆信息"); } - if(ObjectUtil.isNotNull(device)){ + if(ObjectUtil.isNotNull(asDevice)){ + // 将msg的定位信息保存到redis中 + redisCache.setCacheObject(CacheConstants.CACHE_DEVICE_KEY+asDevice.getSn(),msg); + log.info("reids更新定位成功==========================>" +asDevice.getSn()); + // 坐标转换 WGS84 转 GCJ02 double[] doubles = coordinateConvert(value); BigDecimal lat = new BigDecimal(doubles[0]).setScale(8, RoundingMode.HALF_UP); BigDecimal lon = new BigDecimal(doubles[1]).setScale(8, RoundingMode.HALF_UP); log.info("转换后的GCJ02经纬度：" + lon + "---" + lat); - asynchronousSaveLog(msg,logEntry.getAt(),devName, lon,lat,device); - if(BigDecimal.ZERO.compareTo(lon) != 0 && BigDecimal.ZERO.compareTo(lat) != 0){ - // 计算电量和里程后更新设备 - int i = updateDevice(value, device, lon, lat); - if(i>0){ - log.info("更新定位成功==========================>" +logEntry.getDevName()); - EtOperatingArea area = etOperatingAreaService.selectEtOperatingAreaByAreaId(device.getAreaId()); - if(ObjectUtil.isNotNull(area)){ - /** 2. 判断是否在禁行区内 如果在， 根据配置‘禁行区内断电配置’进行断电 **/ - String isAdminUnlocking = device.getIsAdminUnlocking();// 是否是管理员开锁：0-否；1-是 - boolean noRidingArea = isNoRidingArea(value, device, area, isAdminUnlocking); - /** 3.超出运营区外断电*/ - outAreaOutage(value, device, lon, lat, area, isAdminUnlocking, noRidingArea); - /** 4.锁同步关锁 */ - lockSynchronization(msg, asDevice, logEntry, value, device, lon, lat); - /** 5.低电量 生成换电工单*/ - replacementOrder(device, area); - } - }else{ - log.info("更新定位失败：" +logEntry.getDevName()); - } - }else{ - log.info("----------------无定位更新设备----------------" + logEntry.getDevName()); - noLocationUpdateDevice(logEntry, value, device); + + EtOperatingArea area = etOperatingAreaService.selectEtOperatingAreaByAreaId(asDevice.getAreaId()); + if(ObjectUtil.isNotNull(area)){ + /** 2. 判断是否在禁行区内 如果在， 根据配置‘禁行区内断电配置’进行断电 **/ + String isAdminUnlocking = asDevice.getIsAdminUnlocking();// 是否是管理员开锁：0-否；1-是 + boolean noRidingArea = isNoRidingArea(value, asDevice, area, isAdminUnlocking); + /** 3.超出运营区外断电*/ + outAreaOutage(value, asDevice, lon, lat, area, isAdminUnlocking, noRidingArea); + /** 4.锁同步关锁 */ + lockSynchronization(msg, asDevice, logEntry, value, asDevice, lon, lat); + /** 5.低电量 生成换电工单*/ + replacementOrder(asDevice, area); } }else{ log.info("未找到车辆对象：" +logEntry.getDevName()); @@ -216,88 +188,88 @@ public class ReceiveController { }else { log.info("receive方法验证签名错误: signature error"); } - }else { log.info("receive方法参数为空: body empty error"); } } - /** - * 异步保存定位 - */ - private void asynchronousSaveLog(String msg, long at,String mac,BigDecimal lon,BigDecimal lat,AsDevice device) { - //异步保存定位 - scheduledExecutorService.schedule(() -> { - EtLocationLog etLocationLog = new EtLocationLog(); - etLocationLog.setOnenetMsg(msg); - etLocationLog.setCreateTime(DateUtils.getNowDate()); - etLocationLog.setLongitude(lon.toString()); - etLocationLog.setLatitude(lat.toString()); - etLocationLog.setMac(mac); - etLocationLog.setAt(new Date(at)); - etLocationLog.setStatus(device.getStatus()); - etLocationLog.setLockStatus(device.getLockStatus()); - etLocationLogMapper.insertEtLocationLog(etLocationLog); - }, 0, TimeUnit.SECONDS); - } - - /** 无定位更新设备 */ - private void noLocationUpdateDevice(LogEntry logEntry, LogEntry.LocationValue value, AsDevice device) { - Integer bat = value.getBat(); - BigDecimal divide = new BigDecimal(bat).divide(new BigDecimal(10)); - log.info("保存电压：" + divide); - device.setVoltage(divide.toString());//电压 - EtModel model = etModelService.selectEtModelByModelId(device.getModelId()); - // 根据电压计算续航里程 - if(ObjectUtil.isNotNull(model)){ - Integer remainingMileage = 0; - if(StrUtil.isNotBlank(device.getVoltage())){ - remainingMileage = CommonUtil.getRemainingMileage(device.getVoltage(), model.getFullVoltage(), model.getLowVoltage(), model.getFullEndurance()); - } - Integer electricQuantity = CommonUtil.getElectricQuantity(device.getVoltage(), model.getFullVoltage(), model.getLowVoltage());//电量百分百 - device.setRemainingMileage(remainingMileage); - device.setRemainingPower(electricQuantity.toString()); - } - device.setLastTime(DateUtils.getNowDate()); - device.setGps("0"); - device.setSignalStrength(value.getCsq()); - device.setSatellites(0); - device.setQuality(value.getQ()); - int i = asDeviceService.updateLocation(device); - if(i>0){ - log.info("未获取到定位===============保存电压等数值成功===========>" + logEntry.getDevName()); - } - } - - /** 计算电量和里程后更新设备*/ - private int updateDevice(LogEntry.LocationValue value, AsDevice device, BigDecimal lon, BigDecimal lat) { - device.setLatitude(lat.toString()); - device.setLongitude(lon.toString()); - Integer bat = value.getBat(); - BigDecimal divide = new BigDecimal(bat).divide(new BigDecimal(10)); - log.info("保存电压：" + divide); - device.setVoltage(divide.toString());//电压 - // 根据电压计算续航里程 - EtModel model = etModelService.selectEtModelByModelId(device.getModelId()); - if(ObjectUtil.isNotNull(model)){ - Integer remainingMileage = 0; - if(StrUtil.isNotBlank(device.getVoltage())){ - remainingMileage = CommonUtil.getRemainingMileage(device.getVoltage(), model.getFullVoltage(), model.getLowVoltage(), model.getFullEndurance()); - } - Integer electricQuantity = CommonUtil.getElectricQuantity(device.getVoltage(), model.getFullVoltage(), model.getLowVoltage());//电量百分百 - device.setRemainingMileage(remainingMileage); - device.setRemainingPower(electricQuantity.toString()); - } - device.setLastTime(DateUtils.getNowDate()); - device.setLastLocationTime(DateUtils.getNowDate()); - device.setGps("1"); - // 信号强度 - device.setSignalStrength(value.getCsq()); - device.setSatellites(value.getS()); - device.setQuality(value.getQ()); - int i = asDeviceService.updateLocation(device); - return i; - } +// 移动到定时任务中处理 +// /** +// * 异步保存定位 +// */ +// private void asynchronousSaveLog(String msg, long at,String mac,BigDecimal lon,BigDecimal lat,AsDevice device) { +// //异步保存定位 +// scheduledExecutorService.schedule(() -> { +// EtLocationLog etLocationLog = new EtLocationLog(); +// etLocationLog.setOnenetMsg(msg); +// etLocationLog.setCreateTime(DateUtils.getNowDate()); +// etLocationLog.setLongitude(lon.toString()); +// etLocationLog.setLatitude(lat.toString()); +// etLocationLog.setMac(mac); +// etLocationLog.setAt(new Date(at)); +// etLocationLog.setStatus(device.getStatus()); +// etLocationLog.setLockStatus(device.getLockStatus()); +// etLocationLogMapper.insertEtLocationLog(etLocationLog); +// }, 0, TimeUnit.SECONDS); +// } +// +// /** 无定位更新设备 */ +// private void noLocationUpdateDevice(LogEntry logEntry, LogEntry.LocationValue value, AsDevice device) { +// Integer bat = value.getBat(); +// BigDecimal divide = new BigDecimal(bat).divide(new BigDecimal(10)); +// log.info("保存电压：" + divide); +// device.setVoltage(divide.toString());//电压 +// EtModel model = etModelService.selectEtModelByModelId(device.getModelId()); +// // 根据电压计算续航里程 +// if(ObjectUtil.isNotNull(model)){ +// Integer remainingMileage = 0; +// if(StrUtil.isNotBlank(device.getVoltage())){ +// remainingMileage = CommonUtil.getRemainingMileage(device.getVoltage(), model.getFullVoltage(), model.getLowVoltage(), model.getFullEndurance()); +// } +// Integer electricQuantity = CommonUtil.getElectricQuantity(device.getVoltage(), model.getFullVoltage(), model.getLowVoltage());//电量百分百 +// device.setRemainingMileage(remainingMileage); +// device.setRemainingPower(electricQuantity.toString()); +// } +// device.setLastTime(DateUtils.getNowDate()); +// device.setGps("0"); +// device.setSignalStrength(value.getCsq()); +// device.setSatellites(0); +// device.setQuality(value.getQ()); +// int i = asDeviceService.updateLocation(device); +// if(i>0){ +// log.info("未获取到定位===============保存电压等数值成功===========>" + logEntry.getDevName()); +// } +// } +// +// /** 计算电量和里程后更新设备*/ +// private int updateDevice(LogEntry.LocationValue value, AsDevice device, BigDecimal lon, BigDecimal lat) { +// device.setLatitude(lat.toString()); +// device.setLongitude(lon.toString()); +// Integer bat = value.getBat(); +// BigDecimal divide = new BigDecimal(bat).divide(new BigDecimal(10)); +// log.info("保存电压：" + divide); +// device.setVoltage(divide.toString());//电压 +// // 根据电压计算续航里程 +// EtModel model = etModelService.selectEtModelByModelId(device.getModelId()); +// if(ObjectUtil.isNotNull(model)){ +// Integer remainingMileage = 0; +// if(StrUtil.isNotBlank(device.getVoltage())){ +// remainingMileage = CommonUtil.getRemainingMileage(device.getVoltage(), model.getFullVoltage(), model.getLowVoltage(), model.getFullEndurance()); +// } +// Integer electricQuantity = CommonUtil.getElectricQuantity(device.getVoltage(), model.getFullVoltage(), model.getLowVoltage());//电量百分百 +// device.setRemainingMileage(remainingMileage); +// device.setRemainingPower(electricQuantity.toString()); +// } +// device.setLastTime(DateUtils.getNowDate()); +// device.setLastLocationTime(DateUtils.getNowDate()); +// device.setGps("1"); +// // 信号强度 +// device.setSignalStrength(value.getCsq()); +// device.setSatellites(value.getS()); +// device.setQuality(value.getQ()); +// int i = asDeviceService.updateLocation(device); +// return i; +// } /** 坐标转换 */ @NotNull @@ -345,7 +317,7 @@ public class ReceiveController { 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 = asDeviceService.updateAsDevice(device); + int updateAsDevice = asDeviceMapper.updateAsDevice(device); if (updateAsDevice > 0) { log.info("禁行区内断电--更新设备锁状态成功SN：" + device.getSn()); } @@ -363,7 +335,7 @@ public class ReceiveController { device.setLockStatus(ServiceConstants.LOCK_STATUS_OPEN); device.setStatus(ServiceConstants.VEHICLE_STATUS_IN_USING); device.setIsAdminUnlocking("0"); - int i1 = asDeviceService.updateAsDevice(device); + int i1 = asDeviceMapper.updateAsDevice(device); if(i1>1){ log.info("【返回营运区上电】更新车辆状态成功"); } @@ -381,7 +353,7 @@ public class ReceiveController { 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 = asDeviceService.updateAsDevice(device); + int updateAsDevice = asDeviceMapper.updateAsDevice(device); if (updateAsDevice > 0) { log.info("禁行区内断电--更新设备锁状态成功SN：" + device.getSn()); } diff --git a/electripper-admin/src/test/java/MainTests.java b/electripper-admin/src/test/java/MainTests.java index cae180b..772ae36 100644 --- a/electripper-admin/src/test/java/MainTests.java +++ b/electripper-admin/src/test/java/MainTests.java @@ -1,4 +1,3 @@ -import com.alibaba.fastjson2.JSONObject; import com.ruoyi.RuoYiApplication; import com.ruoyi.common.constant.IotConstants; import com.ruoyi.common.constant.ServiceConstants; @@ -9,13 +8,11 @@ import com.ruoyi.system.domain.EtOperatingArea; import com.ruoyi.system.service.IAsDeviceService; import com.ruoyi.system.service.IEtOperatingAreaService; import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.web.controller.iot.domain.LogEntry; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.junit.Test; import org.junit.runner.RunWith; import org.locationtech.jts.geom.Geometry; -import org.locationtech.jts.operation.buffer.BufferOp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; diff --git a/electripper-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java b/electripper-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java index d2821db..90a837f 100644 --- a/electripper-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java +++ b/electripper-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java @@ -52,4 +52,9 @@ public class CacheConstants * 登录账户密码错误次数 redis key */ public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:"; + + /** + * 设备定位信息 redis key + */ + public static final String CACHE_DEVICE_KEY = "device:"; } diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/domain/LogEntry.java b/electripper-common/src/main/java/com/ruoyi/common/utils/onenet/LogEntry.java similarity index 94% rename from electripper-admin/src/main/java/com/ruoyi/web/controller/iot/domain/LogEntry.java rename to electripper-common/src/main/java/com/ruoyi/common/utils/onenet/LogEntry.java index 8e61665..ee259c4 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/domain/LogEntry.java +++ b/electripper-common/src/main/java/com/ruoyi/common/utils/onenet/LogEntry.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.iot.domain; +package com.ruoyi.common.utils.onenet; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/electripper-system/src/main/java/com/ruoyi/system/task/EtTask.java b/electripper-system/src/main/java/com/ruoyi/system/task/EtTask.java index 7d27e38..6eb0260 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/task/EtTask.java +++ b/electripper-system/src/main/java/com/ruoyi/system/task/EtTask.java @@ -3,21 +3,26 @@ package com.ruoyi.system.task; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.ruoyi.common.constant.CacheConstants; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.ServiceConstants; import com.ruoyi.common.core.domain.entity.AsUser; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.CommonUtil; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.map.GeoUtils; +import com.ruoyi.common.utils.map.GpsCoordinateUtils; +import com.ruoyi.common.utils.onenet.LogEntry; import com.ruoyi.common.utils.uuid.IdUtils; import com.ruoyi.system.domain.*; import com.ruoyi.system.mapper.*; import com.ruoyi.system.service.*; -import com.wechat.pay.java.service.payments.model.Transaction; import com.wechat.pay.java.service.refund.model.Refund; import lombok.extern.slf4j.Slf4j; +import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -25,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.PostConstruct; import javax.annotation.Resource; import java.math.BigDecimal; +import java.math.RoundingMode; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.Comparator; @@ -86,6 +92,15 @@ public class EtTask { @Resource private EtLocationLogMapper etLocationLogMapper; + private IEtOnlineLogService etOnlineLogService; + + @Resource + private IAsDeviceService asDeviceService; + + @Autowired + private IEtModelService etModelService; + + /** @@ -485,4 +500,128 @@ public class EtTask { } + + /** + * 更新设备的定位和电压 5秒一次 + * cron: 0 5 0 * * ? + */ + public void updateLocation(){ + log.info("-------------------【定时任务】更新设备的定位和电压-------------------"); + List cacheList = redisCache.getCacheList(CacheConstants.CACHE_DEVICE_KEY + "*"); + for(Object object:cacheList){ + String msg =(String)object; + LogEntry logEntry = JSONObject.parseObject(msg, LogEntry.class); + log.info("logEntry转换后的对象: logEntry---【{}】" , JSON.toJSONString(logEntry)); + LogEntry.LocationValue value = logEntry.getValue(); + AsDevice device = asDeviceMapper.selectAsDeviceByMac(logEntry.getDevName()); + // 坐标转换 WGS84 转 GCJ02 + double[] doubles = coordinateConvert(value); + BigDecimal lat = new BigDecimal(doubles[0]).setScale(8, RoundingMode.HALF_UP); + BigDecimal lon = new BigDecimal(doubles[1]).setScale(8, RoundingMode.HALF_UP); + + asynchronousSaveLog(msg,logEntry.getAt(),logEntry.getDevName(), lat, lon,device); + + BigDecimal divide = new BigDecimal(value.getBat()).divide(new BigDecimal(10)); + device.setVoltage(divide.toString());//电压 + EtModel model = etModelService.selectEtModelByModelId(device.getModelId()); + device.setLastTime(DateUtils.getNowDate()); + device.setSignalStrength(value.getCsq()); + device.setQuality(value.getQ()); + if(ObjectUtil.isNotNull(model)){ + Integer remainingMileage = 0; + if(StrUtil.isNotBlank(device.getVoltage())){ + remainingMileage = CommonUtil.getRemainingMileage(device.getVoltage(), model.getFullVoltage(), model.getLowVoltage(), model.getFullEndurance()); + } + Integer electricQuantity = CommonUtil.getElectricQuantity(device.getVoltage(), model.getFullVoltage(), model.getLowVoltage());//电量百分百 + device.setRemainingMileage(remainingMileage); + device.setRemainingPower(electricQuantity.toString()); + } + if(BigDecimal.ZERO.compareTo(lon) != 0 && BigDecimal.ZERO.compareTo(lat) != 0){ + device.setLatitude(lat.toString()); + device.setLongitude(lon.toString()); + device.setLastLocationTime(DateUtils.getNowDate()); + device.setGps("1"); + // 信号强度 + device.setSatellites(value.getS()); + }else{ + device.setGps("0"); + device.setSatellites(0); + } + int i = asDeviceService.updateLocation(device); + if(i>0){ + log.info("到定位===============保存电压等数值成功===========>" + logEntry.getDevName()); + } + } + } + + /** + * 异步保存定位 + */ + private void asynchronousSaveLog(String msg, long at,String mac,BigDecimal lon,BigDecimal lat,AsDevice device){ + //异步保存定位 + scheduledExecutorService.schedule(() -> { + EtLocationLog etLocationLog = new EtLocationLog(); + etLocationLog.setOnenetMsg(msg); + etLocationLog.setCreateTime(DateUtils.getNowDate()); + etLocationLog.setLongitude(lon.toString()); + etLocationLog.setLatitude(lat.toString()); + etLocationLog.setMac(mac); + etLocationLog.setAt(new Date(at)); + etLocationLog.setStatus(device.getStatus()); + etLocationLog.setLockStatus(device.getLockStatus()); + etLocationLogMapper.insertEtLocationLog(etLocationLog); + }, 0, TimeUnit.SECONDS); + } + + /** 坐标转换 */ + @NotNull + private double[] coordinateConvert(LogEntry.LocationValue value) { + BigDecimal lon = new BigDecimal(value.getLon()); + BigDecimal lat = new BigDecimal(value.getLat()); +// log.info("WGS84经纬度（未计算）：" + lon + "---" + lat); + // 除以100 + lon = lon.divide(new BigDecimal(100), 10, RoundingMode.HALF_UP); + lat = lat.divide(new BigDecimal(100), 10, RoundingMode.HALF_UP); +// log.info("WGS84经纬度（除以100后）：" + lon + "---" + lat); + // 取出lon中后面的小数点 + String[] lonStr = getDecimalPart(lon); + String[] latStr = getDecimalPart(lat); +// log.info("WGS84经纬度（截取小数点）：" + lonStr[0] + "---" + lonStr[1] + "---"+ latStr[0]+"---"+ latStr[1]); + // 再将结果乘以5/3 + String lon2 = "0."+ lonStr[1]; + String lat2 = "0."+ latStr[1]; + BigDecimal lons = new BigDecimal(lon2).multiply(new BigDecimal(5).divide(new BigDecimal(3), 8, RoundingMode.HALF_UP)); + BigDecimal lats = new BigDecimal(lat2).multiply(new BigDecimal(5).divide(new BigDecimal(3), 8, RoundingMode.HALF_UP)); + BigDecimal lo = new BigDecimal(lonStr[0]).add(lons); + BigDecimal la = new BigDecimal(latStr[0]).add(lats); +// log.info("WGS84经纬度（计算后）：" + lo + "---" + la); + lo = lo.setScale(8, RoundingMode.HALF_UP); + la = la.setScale(8, RoundingMode.HALF_UP); +// log.info("WGS84经纬度（保留8为小数）：" + lo + "---" + la); + double[] doubles = GpsCoordinateUtils.calWGS84toGCJ02(la.doubleValue(), lo.doubleValue()); + return doubles; + } + + private static String[] getDecimalPart(BigDecimal number) { + // 将BigDecimal转换为字符串 + String numberStr = number.toPlainString(); + + // 找到小数点的位置 + int indexOfDecimal = numberStr.indexOf("."); + + // 初始化结果数组 + String[] parts = new String[2]; + + // 如果有小数点 + if (indexOfDecimal >= 0) { + parts[0] = numberStr.substring(0, indexOfDecimal); // 整数部分 + parts[1] = numberStr.substring(indexOfDecimal + 1); // 小数部分 + } else { + // 如果没有小数点，整数部分为整个字符串，小数部分为空 + parts[0] = numberStr; + parts[1] = ""; + } + + return parts; + } }