IOT/MiddlePlatform
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#update

Browse Source
This commit is contained in:
rqian
2026-06-09 15:30:06 +08:00
parent 665e3f3632
commit 1ece1b2336
4 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
maibu-netty-server/src/main/java/com/maibu/service/DeviceTaskService.java
View File

@@ -443,17 +443,14 @@ public class DeviceTaskService {
}
} else {
Long taskId = dto.getTaskId();
Long siteId = dto.getSiteId();
Long orgId = dto.getOrgId();
// Long siteId = dto.getSiteId();
// Long orgId = dto.getOrgId();
DevicePlanTask devicePlanTask = devicePlanTaskMapper.selectById(taskId);
if (devicePlanTask != null) {
devicePlanTask.setUpdateTime(LocalDateTime.now());
devicePlanTask.setTaskStaus(DeviceTaskStaus.CANCELED);
devicePlanTask.setUpdateBy(username);
devicePlanTaskMapper.saveOrUpdate(devicePlanTask);
SiteMemory siteMemory = GlobalMemory.getSiteMemory(orgId, siteId);
siteMemory.removeDevicePlanPrepare(devicePlanTask);
siteMemory.removeDevicePlanExecute(devicePlanTask.getDeviceId());
NettyDevice device = deviceSessionManager.getDevice(devicePlanTask.getDeviceId());
if (device != null) {
return device.cancelTask();
}
}
}
return false;

1
maibu-netty-server/src/main/java/com/maibu/utils/CommandUtils.java
View File

@@ -23,4 +23,5 @@ public class CommandUtils {
buf.writeByte(0x00);
buf.writeShort(0xAAAB);
}
}