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

1. 111

Browse Source
This commit is contained in:
邱贞招 2024-06-18 20:43:01 +08:00
parent 36dabe0e30
commit ecd98bd977
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,11 +324,13 @@ public class ReceiveController {
AsDevice device = asDeviceService.selectAsDeviceByMac(mac); AsDevice device = asDeviceService.selectAsDeviceByMac(mac);
//开异步线程保存回调参数 //开异步线程保存回调参数
scheduledExecutorService.schedule(() -> { scheduledExecutorService.schedule(() -> {
log.info("【接收onenet推送】异步更新在线状态"+JSON.toJSONString(device)); if(device.getOnlineStatus().equals(ServiceConstants.VEHICLE_STATUS_OFFLINE)){
device.setOnlineStatus(ServiceConstants.VEHICLE_STATUS_ONLINE); log.info("【接收onenet推送】异步更新在线状态"+JSON.toJSONString(device));
int i = asDeviceService.updateAsDevice(device); device.setOnlineStatus(ServiceConstants.VEHICLE_STATUS_ONLINE);
if(i>0){ int i = asDeviceService.updateAsDevice(device);
log.info("【接收onenet推送】异步保存在线状态成功"); if(i>0){
log.info("【接收onenet推送】异步保存在线状态成功");
}
} }
}, 0, TimeUnit.SECONDS); }, 0, TimeUnit.SECONDS);
} }

26
electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java
View File

@ -242,6 +242,9 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
if(ObjectUtil.isNotNull(status)){ if(ObjectUtil.isNotNull(status)){
String typeName = sysDictDataService.selectDictLabel("as_device_status", status); String typeName = sysDictDataService.selectDictLabel("as_device_status", status);
asDevice1.setStatusStr(typeName); asDevice1.setStatusStr(typeName);
if(status.equals(ServiceConstants.VEHICLE_STATUS_NOT_BAND) && ObjectUtil.isNotNull(asDevice1.getAreaId())){
asDevice1.setStatus(ServiceConstants.VEHICLE_STATUS_IN_OFFLINE);
}
} }
if(ObjectUtil.isNotNull(areaId)){ if(ObjectUtil.isNotNull(areaId)){
SysDept sysDept = wxPayService.getDeptObjByAreaId(areaId); SysDept sysDept = wxPayService.getDeptObjByAreaId(areaId);
@ -468,6 +471,7 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
/** 2.发送命令*/ /** 2.发送命令*/
ResponseVo responseVo = sendCommandWithResp(asDevice.getMac(), token, IotConstants.COMMAND_OPEN+IotConstants.COMMAND_FREQUENCY_5, "编号开锁"); ResponseVo responseVo = sendCommandWithResp(asDevice.getMac(), token, IotConstants.COMMAND_OPEN+IotConstants.COMMAND_FREQUENCY_5, "编号开锁");
if(responseVo.getCode() != 0){ if(responseVo.getCode() != 0){
asynchronousUpdateOnlineStatus(asDevice.getMac());
throw new ServiceException("【扫码/编号开锁骑行】更新车辆状态失败"); throw new ServiceException("【扫码/编号开锁骑行】更新车辆状态失败");
} }
/** 3.更新车辆状态*/ /** 3.更新车辆状态*/
@ -665,10 +669,28 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
//记录命令 //记录命令
if (!HttpStatus.IOT_SUCCESS.equals(code)) if (!HttpStatus.IOT_SUCCESS.equals(code))
{ {
// 异步更新在线状态
asynchronousUpdateOnlineStatus(mac);
throw new ServiceException(code+"-----"+ IotUtil.formatMsg(code)); throw new ServiceException(code+"-----"+ IotUtil.formatMsg(code));
} }
} }
private void asynchronousUpdateOnlineStatus(String mac) {
AsDevice device = asDeviceMapper.selectAsDeviceByMac(mac);
//异步更新在线状态
scheduledExecutorService.schedule(() -> {
if(device.getOnlineStatus().equals(ServiceConstants.VEHICLE_STATUS_ONLINE)){
log.info("【接收onenet推送】异步更新在线状态"+JSON.toJSONString(device));
device.setOnlineStatus(ServiceConstants.VEHICLE_STATUS_OFFLINE);
int i = asDeviceMapper.updateAsDevice(device);
if(i>0){
log.info("【接收onenet推送】异步保存在线状态成功");
}
}
}, 0, TimeUnit.SECONDS);
}
@Override @Override
/** 发送命令*/ /** 发送命令*/
public ResponseVo sendCommandWithResp(String mac, String token,String command,String type) { public ResponseVo sendCommandWithResp(String mac, String token,String command,String type) {
@ -1403,10 +1425,12 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
@SneakyThrows @SneakyThrows
@Override @Override
public boolean isOnline(String sn) { public boolean isOnline(String sn) {
ResponseVo responseVo = sendCommandWithResp(asDeviceMapper.selectAsDeviceBySn(sn).getMac(), Token.getToken(), "111", "是否在线"); AsDevice device = asDeviceMapper.selectAsDeviceBySn(sn);
ResponseVo responseVo = sendCommandWithResp(device.getMac(), Token.getToken(), "111", "是否在线");
if(responseVo.getCode() == 0){ if(responseVo.getCode() == 0){
return true; return true;
} }
asynchronousUpdateOnlineStatus(device.getMac());
return false; return false;
} }