qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: qzz:ec42f427048cbc64a0cbe1f4536fb9ece845f5eb
Branches Tags
qzz:master
qzz:bug
qzz:redis
qzz:test
qzz:coupon
qzz:new-pay
..
compare: qzz:c115f0ef626d9e10c88796d0ba34f208f72e238c
Branches Tags
qzz:master
qzz:bug
qzz:redis
qzz:test
qzz:coupon
qzz:new-pay

No commits in common. "ec42f427048cbc64a0cbe1f4536fb9ece845f5eb" and "c115f0ef626d9e10c88796d0ba34f208f72e238c" have entirely different histories.
ec42f42704 ... c115f0ef62

3 changed files with 15 additions and 54 deletions
Show Stats Expand all files Collapse all files

48
electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java
View File

@ -40,8 +40,6 @@ 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;
@ -96,9 +94,6 @@ 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<String, Long> commandCooldownMap = new ConcurrentHashMap<>();
private static final long COOLDOWN_PERIOD_MS = 10000; // 冷却时间为 10 秒
/**
* 功能描述：第三方平台数据接收。<p>
@ -323,25 +318,24 @@ public class ReceiveController {
Geometry polygon = GeoUtils.fromWkt(area.getBoundary());
// 是否在缩短后的运营区边界内
boolean inPolygonWithTolerance = GeoUtils.isInPolygonWithShorten(lon.toString(), lat.toString(), polygon, nearBoundaryDistance);
log.info("=========================是否在缩短后的运营区边界内：{}，车辆定位=【{},{}】边界=【{}】",inPolygonWithTolerance,lon,lat,polygon);
if(!inPolygonWithTolerance && !isAdminUnlocking.equals("1") && device.getStatus().equals(ServiceConstants.VEHICLE_STATUS_IN_USING)){//没有在缩短后的运营区边界内
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());
sendCommandWithCooldown(device, IotConstants.COMMAND_PLAY2, "靠近运营区边界");
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("超出运营区"+exceedDistance+"米内发送警告命令==============--SN：" + device.getSn());
sendCommandWithCooldown(device, IotConstants.COMMAND_PLAY3, "超出运营区" + exceedDistance + "米内");
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")) { // 超出营运区断电
log.info("超出营运区断电命令=================--SN：" + device.getSn());
sendCommandWithCooldown(device, IotConstants.COMMAND_QLOSE + IotConstants.COMMAND_FREQUENCY_5, "超出营运区断电");
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);
if (updateAsDevice > 0) {
@ -350,34 +344,10 @@ public class ReceiveController {
}
}
}else{
log.info("在缩短后的运营区边界内====================：" + device.getSn());
returnPower(device, noRidingArea);
}
}
/** 带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 {
// 判断该车辆是否在进行中的订单,并且车辆的锁状态是关，状态是骑行中
@ -404,7 +374,7 @@ public class ReceiveController {
String noRidingOutage = area.getNoRidingOutage();
if (noRidingOutage.equals("1") && value.getStatus() != 3 && !isAdminUnlocking.equals("1")) { // 禁行区内断电
log.info("禁行区内断电命令--SN：" + device.getSn());
sendCommandWithCooldown(device, IotConstants.COMMAND_QLOSE + IotConstants.COMMAND_FREQUENCY_5, "禁行区内断电");
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);
if (updateAsDevice > 0) {
@ -416,7 +386,7 @@ public class ReceiveController {
boolean inPolygon = asDeviceService.isNoRidingAreaWithTolerance(device.getSn(), device.getAreaId(),30);
if (inPolygon && !isAdminUnlocking.equals("1")) {
log.info("距离禁行区20米内发送警告命令--SN：" + device.getSn());
sendCommandWithCooldown(device, IotConstants.COMMAND_PLAY2, "距离禁行区30米内");
asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_PLAY2, "距离禁行区30米内",null,null);
}
}
return noRidingArea;

2
electripper-admin/src/main/resources/application-druid.yml
View File

@ -6,7 +6,7 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://localhost:3306/ele2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://localhost:3306/electripper?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: 123456
# url: jdbc:mysql://117.26.179.22:61110/electripper?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8

19
electripper-system/src/main/java/com/ruoyi/system/task/EtTask.java
View File

@ -505,8 +505,6 @@ public class EtTask {
*/
public void updateLocation10(){
log.info("-------------------【定时任务10秒一次】更新设备的定位和电压-----开始--------------");
// 记录开始时间
long startTime = System.nanoTime();
Collection<String> keys = redisCache.keys(CacheConstants.CACHE_DEVICE_KEY + "*");
log.info("redis缓存中的数据：" + JSON.toJSONString(keys));
for(String key:keys){
@ -516,14 +514,11 @@ public class EtTask {
log.info("logEntry转换后的对象: logEntry---【{}】" , JSON.toJSONString(logEntry));
LogEntry.LocationValue value = logEntry.getValue();
AsDevice device = asDeviceMapper.selectAsDeviceByMac(logEntry.getDevName());
log.info("device: sn={},【{}】",device.getSn() , JSON.toJSONString(device));
if(ServiceConstants.LOCK_STATUS_OPEN.equals(device.getLockStatus()) && device.getStatus().equals(ServiceConstants.VEHICLE_STATUS_IN_USING)){
if(ServiceConstants.LOCK_STATUS_OPEN.equals(device.getLockStatus())){
updateLocationHandle(msg, logEntry, value, device);
}
}
// 计算执行时间（以毫秒为单位）
long duration = (System.nanoTime() - startTime) / 1_000_000;
log.info("-------------------【定时任务10秒一次】更新设备的定位和电压----结束---------------"+duration+ " 毫秒");
log.info("-------------------【定时任务10秒一次】更新设备的定位和电压----结束---------------");
}
/**
@ -532,8 +527,6 @@ public class EtTask {
*/
public void updateLocation300(){
log.info("-------------------【定时任务5分钟一次】更新设备的定位和电压-----开始--------------");
// 记录开始时间
long startTime = System.nanoTime();
Collection<String> keys = redisCache.keys(CacheConstants.CACHE_DEVICE_KEY + "*");
log.info("redis缓存中的数据：" + JSON.toJSONString(keys));
for(String key:keys){
@ -547,18 +540,16 @@ public class EtTask {
updateLocationHandle(msg, logEntry, value, device);
}
}
// 计算执行时间（以毫秒为单位）
long duration = (System.nanoTime() - startTime) / 1_000_000;
log.info("-------------------【定时任务5分钟一次】更新设备的定位和电压----结束---------------"+duration+ " 毫秒");
log.info("-------------------【定时任务5分钟一次】更新设备的定位和电压----结束---------------");
}
private void updateLocationHandle(String msg, LogEntry logEntry, LogEntry.LocationValue value, AsDevice device) {
// 坐标转换 WGS84 转 GCJ02
double[] doubles = coordinateConvert(value);
BigDecimal lon = new BigDecimal(doubles[1]).setScale(8, RoundingMode.HALF_UP);
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(), lon, lat, device);
asynchronousSaveLog(msg, logEntry.getAt(), logEntry.getDevName(), lat, lon, device);
BigDecimal divide = new BigDecimal(value.getBat()).divide(new BigDecimal(10));
device.setVoltage(divide.toString());//电压