#消息推送相关
This commit is contained in:
@@ -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<DevicePlanTask> getSiteDeviceTaskHistory(DeviceTaskQueryDTO dto) {
|
||||
LambdaQueryWrapper<DevicePlanTask> queryWrapper = new LambdaQueryWrapper<>();
|
||||
QueryWrapper<DevicePlanTask> 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<DevicePlan> transferDevicePlanData(List<DevicePlan> 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();
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user