diff --git a/maibu-common/src/main/java/com/maibu/core/business/DevicePlanTask.java b/maibu-common/src/main/java/com/maibu/core/business/DevicePlanTask.java index 8dfe277..1610977 100644 --- a/maibu-common/src/main/java/com/maibu/core/business/DevicePlanTask.java +++ b/maibu-common/src/main/java/com/maibu/core/business/DevicePlanTask.java @@ -26,6 +26,9 @@ public class DevicePlanTask extends OrgBaseDO { private String deviceId; + @TableField(exist = false) + private String deviceAlias; // 别名 + private DeviceTaskStaus taskStaus; // 任务状态 @TableField(exist = false) diff --git a/maibu-common/src/main/java/com/maibu/core/business/device/NettyDevice.java b/maibu-common/src/main/java/com/maibu/core/business/device/NettyDevice.java index ce82bc5..c2bcd63 100644 --- a/maibu-common/src/main/java/com/maibu/core/business/device/NettyDevice.java +++ b/maibu-common/src/main/java/com/maibu/core/business/device/NettyDevice.java @@ -163,8 +163,9 @@ public class NettyDevice extends Connector { return true; } - public synchronized boolean canceledTask() { + public synchronized Long canceledTask() { if (task != null) { + Long taskId = task.getId(); task.setTaskStaus(DeviceTaskStaus.CANCELED); task.setUpdateTime(LocalDateTime.now()); devicePlanTaskMapper.saveOrUpdate(task); @@ -177,12 +178,14 @@ public class NettyDevice extends Connector { currentPoint = null; locationQueue.clear(); executingTask = false; + return taskId; } - return true; + return null; } - public synchronized boolean failedTask() { + public synchronized Long failedTask() { if (task != null) { + Long taskId = task.getId(); task.setTaskStaus(DeviceTaskStaus.FAILED); task.setUpdateTime(LocalDateTime.now()); devicePlanTaskMapper.saveOrUpdate(task); @@ -195,8 +198,9 @@ public class NettyDevice extends Connector { currentPoint = null; locationQueue.clear(); executingTask = false; + return taskId; } - return true; + return null; } public void sendPathCommand(byte commandType, short pointCounts, double lat, double lng, short speed) { @@ -366,7 +370,7 @@ public class NettyDevice extends Connector { dto.setProtocol_version(Constant.protocol_version); PointEntity point = new PointEntity(); - //TODO 增加其他系统任务类型 写死的code + // TODO 增加其他系统任务类型 写死的code if (RouteType.BACK_TO_REST_POINT.equals(task.getRouteType())) { point.setLongitude(task.getBackTaskPoint().getPosition().getLng()); point.setLatitude(task.getBackTaskPoint().getPosition().getLat()); diff --git a/maibu-common/src/main/java/com/maibu/core/domain/rule/IotAutoRuleRecord.java b/maibu-common/src/main/java/com/maibu/core/domain/rule/IotAutoRuleRecord.java index feff304..20e1f1a 100644 --- a/maibu-common/src/main/java/com/maibu/core/domain/rule/IotAutoRuleRecord.java +++ b/maibu-common/src/main/java/com/maibu/core/domain/rule/IotAutoRuleRecord.java @@ -40,11 +40,7 @@ public class IotAutoRuleRecord extends OrgNoUserDO { */ private String deviceId; - /** - * 触发时的指标快照 - */ - @TableField(typeHandler = JacksonTypeHandler.class) - private Object triggerValue; + private String triggerValue; /** * 触发时间 diff --git a/maibu-common/src/main/java/com/maibu/mapper/DevicePlanTaskMapper.java b/maibu-common/src/main/java/com/maibu/mapper/DevicePlanTaskMapper.java index cd2656a..fd31adc 100644 --- a/maibu-common/src/main/java/com/maibu/mapper/DevicePlanTaskMapper.java +++ b/maibu-common/src/main/java/com/maibu/mapper/DevicePlanTaskMapper.java @@ -1,8 +1,15 @@ package com.maibu.mapper; +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.springframework.stereotype.Repository; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.maibu.core.business.DevicePlanTask; import com.maibu.mybatis.mapper.BaseMapperX; -import org.springframework.stereotype.Repository; /** * 设备历史状态 @@ -10,4 +17,11 @@ import org.springframework.stereotype.Repository; @Repository public interface DevicePlanTaskMapper extends BaseMapperX { + @Select("SELECT t.*, d.device_alias " + + "FROM iot_device_task t " + + "LEFT JOIN iot_device d ON d.device_id = t.device_id " + + "${ew.customSqlSegment}") + List selectTaskHistoryWithDeviceAlias( + @Param(Constants.WRAPPER) Wrapper wrapper); + } diff --git a/maibu-common/src/main/java/com/maibu/mqtt/HostMessageHandler.java b/maibu-common/src/main/java/com/maibu/mqtt/HostMessageHandler.java index 404aa73..d0c17b5 100644 --- a/maibu-common/src/main/java/com/maibu/mqtt/HostMessageHandler.java +++ b/maibu-common/src/main/java/com/maibu/mqtt/HostMessageHandler.java @@ -465,6 +465,16 @@ public class HostMessageHandler implements CustomMqttMessageHandler { } } } + try { + NettyDevice device = deviceSessionManager.getDevice(deviceId); + if (device != null && device.getDevice() != null) { + Long siteId = device.getDevice().getSiteId(); + websocketMesDispather.mapMessageDispather(siteId, + JsonUtils.toJsonString(dto)); + } + } catch (Exception e) { + log.error("实时地图数据websocket推送失败: siteId={}, error={}", e); + } // todo 推送实时位置和状态消息到外部 try { GlobalMemory.customMqttDeviceMonitor.publish(mqttClientId, @@ -512,44 +522,22 @@ public class HostMessageHandler implements CustomMqttMessageHandler { NettyDevice nettyDevice = deviceSessionManager.getDevice(deviceId); if ("completed".equals(dto.getStatus())) { Long taskId = nettyDevice.finishTask(); - - WebDeviceTaskStatusMessageDTO sendDto = new WebDeviceTaskStatusMessageDTO(); - sendDto.setDeviceId(deviceId); - sendDto.setTaskId(taskId); - sendDto.setStatus(DeviceTaskStaus.FINISH.toString()); - sendDto.setType(MesType.device_task_change); - - List controlMasters = deviceSessionManager - .getAllSlaveControl(deviceId); - if (!CollectionUtils.isEmpty(controlMasters)) { - for (NettyDevice x : controlMasters) { - try { - websocketMesDispather.dispather(x.getConnectorId(), JsonUtils.toJsonString(sendDto)); - } catch (Exception e) { - log.error("实时数据websocket任务状态推送失败: connectorId={}, error={}", x.getConnectorId(), - e.getMessage()); - } - } - } - // todo 推送实时位置和状态消息到外部 - try { - GlobalMemory.customMqttDeviceMonitor.publish(mqttClientId, - String.format(MqttTopic.DEVICE_TASK_STATUS_TOPIC, taskId), - JsonUtils.toJsonString(sendDto)); - } catch (MqttException e) { - log.error("实时数据websocket任务状态推送失败: deviceId={}, error={}", deviceId, e.getMessage(), e); - } + pushTaskChangeMessage(deviceId, taskId, DeviceTaskStaus.FINISH.toString()); } if ("cancelled".equals(dto.getStatus())) { - nettyDevice.canceledTask(); + Long taskId = nettyDevice.canceledTask(); + pushTaskChangeMessage(deviceId, taskId, DeviceTaskStaus.CANCELED.toString()); + } // if("paused".equals(dto.getStatus())){ // NettyDevice nettyDevice = deviceSessionManager.getDevice(deviceId); // nettyDevice.finishTask(); // } if ("failed".equals(dto.getStatus())) { - nettyDevice.failedTask(); + Long taskId = nettyDevice.failedTask(); + pushTaskChangeMessage(deviceId, taskId, DeviceTaskStaus.FAILED.toString()); + } // if ("accepted".equals(dto.getStatus())) { // NettyDevice nettyDevice = deviceSessionManager.getDevice(deviceId); @@ -563,6 +551,45 @@ public class HostMessageHandler implements CustomMqttMessageHandler { } + public void pushTaskChangeMessage(String deviceId, Long taskId, String status) { + WebDeviceTaskStatusMessageDTO sendDto = new WebDeviceTaskStatusMessageDTO(); + sendDto.setDeviceId(deviceId); + sendDto.setTaskId(taskId); + sendDto.setStatus(status); + sendDto.setType(MesType.device_task_change); + + List controlMasters = deviceSessionManager + .getAllSlaveControl(deviceId); + if (!CollectionUtils.isEmpty(controlMasters)) { + for (NettyDevice x : controlMasters) { + try { + websocketMesDispather.dispather(x.getConnectorId(), JsonUtils.toJsonString(sendDto)); + } catch (Exception e) { + log.error("实时数据websocket任务状态推送失败: connectorId={}, error={}", x.getConnectorId(), + e.getMessage()); + } + } + } + // try { + // NettyDevice device = deviceSessionManager.getDevice(deviceId); + // if (device != null && device.getDevice() != null) { + // Long siteId = device.getDevice().getSiteId(); + // websocketMesDispather.mapMessageDispather(siteId, + // JsonUtils.toJsonString(sendDto)); + // } + // } catch (Exception e) { + // log.error("实时地图数据websocket推送失败: siteId={}, error={}", e); + // } + // todo 推送实时位置和状态消息到外部 + try { + GlobalMemory.customMqttDeviceMonitor.publish(mqttClientId, + String.format(MqttTopic.DEVICE_TASK_STATUS_TOPIC, taskId), + JsonUtils.toJsonString(sendDto)); + } catch (MqttException e) { + log.error("实时数据websocket任务状态推送失败: deviceId={}, error={}", deviceId, e.getMessage(), e); + } + } + /** * 处理配置响应 */ @@ -609,6 +636,15 @@ public class HostMessageHandler implements CustomMqttMessageHandler { } } } + try { + if (device != null && device.getDevice() != null) { + Long siteId = device.getDevice().getSiteId(); + websocketMesDispather.mapMessageDispather(siteId, + JsonUtils.toJsonString(sendDto)); + } + } catch (Exception e) { + log.error("实时地图数据websocket推送失败: siteId={}, error={}", e); + } // todo 推送实时位置和状态消息到外部 try { GlobalMemory.customMqttDeviceMonitor.publish(mqttClientId, @@ -671,7 +707,7 @@ public class HostMessageHandler implements CustomMqttMessageHandler { JsonUtils.toJsonString(data)); } } catch (Exception e) { - log.error("实时地图数据websocket推送失败: siteId={}, error={}", e); + log.error("实时地图数据websocket推送失败: siteId={}, error={}", e); } try { GlobalMemory.customMqttDeviceMonitor.publish(mqttClientId, diff --git a/maibu-netty-server/src/main/java/com/maibu/service/DeviceTaskService.java b/maibu-netty-server/src/main/java/com/maibu/service/DeviceTaskService.java index 15e287c..4b262e4 100644 --- a/maibu-netty-server/src/main/java/com/maibu/service/DeviceTaskService.java +++ b/maibu-netty-server/src/main/java/com/maibu/service/DeviceTaskService.java @@ -17,6 +17,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.maibu.core.business.Device; @@ -420,29 +421,29 @@ public class DeviceTaskService { } public List getSiteDeviceTaskHistory(DeviceTaskQueryDTO dto) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); if (dto.getSiteId() != null) { - queryWrapper.eq(DevicePlanTask::getSiteId, dto.getSiteId()); + queryWrapper.eq("t.site_id", dto.getSiteId()); } if (dto.getOrgId() != null) { - queryWrapper.eq(DevicePlanTask::getOrgId, dto.getOrgId()); + queryWrapper.eq("t.org_id", dto.getOrgId()); } if (dto.getTaskStaus() != null) { - queryWrapper.eq(DevicePlanTask::getTaskStaus, dto.getTaskStaus()); + queryWrapper.eq("t.task_staus", dto.getTaskStaus()); } if (dto.getPlanId() != null) { - queryWrapper.eq(DevicePlanTask::getPlanId, dto.getPlanId()); + queryWrapper.eq("t.plan_id", dto.getPlanId()); } - if (!StringUtils.isEmpty(dto.getDeviceId())) { - queryWrapper.eq(DevicePlanTask::getDeviceId, dto.getDeviceId()); + if (StringUtils.isNotEmpty(dto.getDeviceId())) { + queryWrapper.eq("t.device_id", dto.getDeviceId()); } if (dto.getStartTime() != null) { - queryWrapper.ge(DevicePlanTask::getCreateTime, dto.getStartTime()); + queryWrapper.ge("t.create_time", dto.getStartTime()); } if (dto.getEndTime() != null) { - queryWrapper.le(DevicePlanTask::getCreateTime, dto.getEndTime()); + queryWrapper.le("t.create_time", dto.getEndTime()); } - return transferDeviceTaskData(devicePlanTaskMapper.selectList(queryWrapper)); + return transferDeviceTaskData(devicePlanTaskMapper.selectTaskHistoryWithDeviceAlias(queryWrapper)); } public List transferDevicePlanData(List list) { @@ -552,7 +553,7 @@ public class DeviceTaskService { NettyDevice device = deviceSessionManager.getDevice(deviceId); if (device != null && device.getTask() != null) { if (dto.isForceCancel()) { - return device.canceledTask(); + return device.canceledTask() != null; } else { return device.cancelingTask(); } diff --git a/maibu-netty-server/src/main/java/com/maibu/service/DeviceThreadService.java b/maibu-netty-server/src/main/java/com/maibu/service/DeviceThreadService.java index 2f364f1..f13652b 100644 --- a/maibu-netty-server/src/main/java/com/maibu/service/DeviceThreadService.java +++ b/maibu-netty-server/src/main/java/com/maibu/service/DeviceThreadService.java @@ -399,11 +399,16 @@ public class DeviceThreadService { statusChangePush(deviceId, device.getSiteId(), 1); } } else { + + Integer lastOnlineStatus = nettyDevice.getOnlineStatus(); + if (lastOnlineStatus == 0) { + statusChangePush(deviceId, device.getSiteId(), 1); + } // todo 推送设备上线 nettyDevice.status(1); nettyDevice.setDevice(device); nettyDevice.setConnectorStatus(ConnectorStatus.ACTIVE); - statusChangePush(deviceId, device.getSiteId(), 1); + } } }); diff --git a/maibu-web-middleware/src/main/java/com/maibu/utils/HttpService.java b/maibu-web-middleware/src/main/java/com/maibu/utils/HttpService.java index 9cb15e8..aabfdd8 100644 --- a/maibu-web-middleware/src/main/java/com/maibu/utils/HttpService.java +++ b/maibu-web-middleware/src/main/java/com/maibu/utils/HttpService.java @@ -7,13 +7,14 @@ import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.HttpServerErrorException; import org.springframework.web.client.RestTemplate; +import com.maibu.constant.Constants; + @Service public class HttpService { @Autowired private RestTemplate restTemplate; - /** * 通用 GET 请求(手动传入 Token,每次可传不同值) * @@ -32,8 +33,7 @@ public class HttpService { apiUrl, HttpMethod.GET, httpEntity, - String.class - ); + String.class); // 校验响应状态并返回结果 if (response.getStatusCode().is2xxSuccessful()) { return response.getBody() == null ? "" : response.getBody(); @@ -68,8 +68,7 @@ public class HttpService { apiUrl, HttpMethod.POST, httpEntity, - String.class - ); + String.class); // 校验响应状态并返回结果 if (response.getStatusCode().is2xxSuccessful()) { return response.getBody() == null ? "" : response.getBody(); @@ -93,18 +92,18 @@ public class HttpService { */ private HttpHeaders buildHeadersWithToken(String token) { HttpHeaders headers = new HttpHeaders(); - // 设置默认 Content-Type 为 JSON 格式 - headers.setContentType(MediaType.APPLICATION_JSON_UTF8); + + headers.setContentType(MediaType.APPLICATION_JSON); headers.set("Accept", "application/json"); - // 若 Token 不为空,添加 Authorization 头(默认 Bearer 格式,可按需修改) + + // 与 LanguageInterceptor 读取的请求头保持一致 + headers.set(Constants.LANGUAGE, "zh-CN"); + if (token != null && !token.trim().isEmpty()) { - // 如需去掉 Bearer 前缀,直接改为 headers.set("Authorization", token.trim()) headers.set("Authorization", "Bearer " + token.trim()); } - // 可按需添加其他通用请求头(如 User-Agent) - // headers.set("User-Agent", "RestTemplate-Common/1.0"); + return headers; } - }