#区域连续作业相关

This commit is contained in:
2026-11-03 16:06:58 +08:00
parent f25a0b5018
commit 99c7a3ab87
24 changed files with 480 additions and 41 deletions

View File

@@ -1,6 +1,7 @@
package com.maibu.controller;
import java.time.LocalDate;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.paho.client.mqttv3.MqttException;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.maibu.core.business.DevicePlan;
import com.maibu.core.business.dto.ConsecutiveTaskDTO;
import com.maibu.core.business.dto.DeviceTaskCommandDTO;
import com.maibu.core.controller.BaseController;
import com.maibu.core.domain.AjaxResult;
@@ -121,6 +123,14 @@ public class DeviceTaskController extends BaseController {
if (siteMemory.hasTask(deviceId)) {
return AjaxResult.error("当前设备存在任务!");
}
Integer mode = siteMemory.getDeviceControlMode(deviceId);
if (mode == null) {
return AjaxResult.error("当前设备模式不存在,无法自动任务!");
}
if (mode != 2) {
String modeStr = switchMode(mode);
return AjaxResult.error("当前设备模式:" + modeStr + ",无法自动任务!");
}
return AjaxResult.success(deviceTaskService.createDeviceTask(dto, getLoginUser().getUsername()));
}
@@ -146,6 +156,14 @@ public class DeviceTaskController extends BaseController {
if (siteMemory.hasTask(deviceId)) {
return AjaxResult.error("当前设备存在任务!");
}
Integer mode = siteMemory.getDeviceControlMode(deviceId);
if (mode == null) {
return AjaxResult.error("当前设备模式不存在,无法自动任务!");
}
if (mode != 2) {
String modeStr = switchMode(mode);
return AjaxResult.error("当前设备模式:" + modeStr + ",无法自动任务!");
}
return AjaxResult.success(deviceTaskService.createRegionDeviceTask(dto, getLoginUser().getUsername()));
}
@@ -194,7 +212,70 @@ public class DeviceTaskController extends BaseController {
if (siteMemory.hasTask(deviceId)) {
return AjaxResult.error("当前设备存在任务!");
}
Integer mode = siteMemory.getDeviceControlMode(deviceId);
if (mode == null) {
return AjaxResult.error("当前设备模式不存在,无法自动任务!");
}
if (mode != 2) {
String modeStr = switchMode(mode);
return AjaxResult.error("当前设备模式:" + modeStr + ",无法自动任务!");
}
return AjaxResult.success(deviceTaskService.backToRestPoint(dto, getLoginUser().getUsername()));
}
@PostMapping("/createConsecutiveTasks")
public AjaxResult createConsecutiveTasks(@RequestBody ConsecutiveTaskDTO dto) {
String deviceId = dto.getDeviceId();
Long siteId = dto.getSiteId();
Long orgId = dto.getOrgId();
if (StringUtils.isEmpty(deviceId)) {
return AjaxResult.error("deviceId为空!");
}
if (siteId == null) {
return AjaxResult.error("siteId为空!");
}
if (orgId == null) {
return AjaxResult.error("orgId为空!");
}
SiteMemory siteMemory = GlobalMemory.getSiteMemory(orgId, siteId);
if (siteMemory.hasTask(deviceId)) {
return AjaxResult.error("当前设备存在任务!");
}
Integer mode = siteMemory.getDeviceControlMode(deviceId);
if (mode == null) {
return AjaxResult.error("当前设备模式不存在,无法自动任务!");
}
if (mode != 2) {
String modeStr = switchMode(mode);
return AjaxResult.error("当前设备模式:" + modeStr + ",无法自动任务!");
}
deviceTaskService.createConsecutiveTasks(dto, getLoginUser().getUsername());
return AjaxResult.success();
}
public String switchMode(Integer mode) {
String modeStr = "";
switch (mode) {
case 0:
modeStr = "无控制";
break;
case 1:
modeStr = "本地遥控";
break;
case 2:
modeStr = "自动任务";
break;
case 3:
modeStr = "远程遥控";
break;
}
return modeStr;
}
@PostMapping("/cancelConsecutiveTask")
public AjaxResult cancelConsecutiveTask(@RequestBody List<String> deviceIds) throws MqttException {
deviceTaskService.cancelConsecutiveTask(deviceIds);
return AjaxResult.success();
}
}

View File

@@ -79,6 +79,9 @@ public class InitThread implements ApplicationRunner {
@Resource(name = FastBeeConstant.TASK.AUTO_RULE)
private Executor autoRuleExecutor;
@Resource(name = FastBeeConstant.TASK.REGION_CONSECUTIVE_TASK)
private Executor regionConsecutiveTasksExecutor;
@Resource(name = FastBeeConstant.TASK.COMMON_DEVICE_MONITOR)
private Executor commonDeviceMonitorExecutor;
@@ -182,6 +185,11 @@ public class InitThread implements ApplicationRunner {
GlobalMemory.initMqttDeviceMonitor(mqttHostUrl, mqttClientId, mqttUsername, mqttPassword);
// 区域连续任务处理线程
regionConsecutiveTasksExecutor.execute(() -> {
deviceThreadService.regionConsecutiveTaskHandler();
});
// 规则触发线程
autoRuleExecutor.execute(() -> {
deviceThreadService.autoRule();

View File

@@ -9,7 +9,6 @@ import java.util.List;
import java.util.Random;
import java.util.stream.Collectors;
import com.maibu.memory.DeviceSessionManager;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.paho.client.mqttv3.MqttException;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,8 +23,10 @@ import com.maibu.core.business.Device;
import com.maibu.core.business.DevicePlan;
import com.maibu.core.business.DevicePlanTask;
import com.maibu.core.business.DeviceTaskPlanRule;
import com.maibu.core.business.RegionConsecutiveTaskRecord;
import com.maibu.core.business.WorkRecord;
import com.maibu.core.business.device.NettyDevice;
import com.maibu.core.business.dto.ConsecutiveTaskDTO;
import com.maibu.core.business.dto.DeviceTaskCommandDTO;
import com.maibu.core.domain.entity.SysRegion;
import com.maibu.core.domain.entity.SysSite;
@@ -42,10 +43,11 @@ import com.maibu.exception.ServiceException;
import com.maibu.mapper.DeviceMapper;
import com.maibu.mapper.DevicePlanMapper;
import com.maibu.mapper.DevicePlanTaskMapper;
import com.maibu.mapper.SiteMapInfoMapper;
import com.maibu.mapper.RegionConsecutiveTaskRecordMapper;
import com.maibu.mapper.SysRegionMapper;
import com.maibu.mapper.SysSiteMapper;
import com.maibu.mapper.WorkRecordMapper;
import com.maibu.memory.DeviceSessionManager;
import com.maibu.memory.GlobalMemory;
import com.maibu.memory.SiteMemory;
import com.maibu.utils.MessageUtils;
@@ -77,6 +79,9 @@ public class DeviceTaskService {
@Autowired
private SysRegionMapper sysRegionMapper;
@Autowired
private RegionConsecutiveTaskRecordMapper regionConsecutiveTaskRecordMapper;
private static final ObjectMapper objectMapper = new ObjectMapper();
public int insertOrUpdate(DevicePlan devicePlan, LoginUser loginUser) {
@@ -669,4 +674,50 @@ public class DeviceTaskService {
return task.getId();
}
public void createConsecutiveTasks(ConsecutiveTaskDTO dto, String username) {
if (dto.getOrgId() == null) {
SysSite site = sysSiteMapper.selectById(dto.getSiteId());
if (site != null) {
dto.setOrgId(site.getOrgId());
}
}
SiteMemory siteMemory = GlobalMemory.getSiteMemory(dto.getOrgId(), dto.getSiteId());
if (siteMemory == null) {
throw new ServiceException(MessageUtils.message("任务下发出错!"));
}
siteMemory.saveRegionConsecutiveTask(dto.getDeviceId(), dto, username);
}
public void cancelConsecutiveTask(List<String> deivceIds) throws MqttException {
if (CollectionUtils.isEmpty(deivceIds)) {
return;
}
List<RegionConsecutiveTaskRecord> records = new ArrayList<>();
for (String deviceId : deivceIds) {
NettyDevice device = deviceSessionManager.getDevice(deviceId);
if (device != null && device.getDevice() != null) {
// 取消当前执行的任务
device.cancelingTask();
Long orgId = device.getDevice().getOrgId();
Long siteId = device.getDevice().getSiteId();
SiteMemory siteMemory = GlobalMemory.getSiteMemory(orgId, siteId);
RegionConsecutiveTaskRecord record = null;
if (siteMemory != null) {
record = siteMemory.removeRegionConsecutiveTask(deviceId);
}
if (record != null) {
record.setUpdateTime(LocalDateTime.now());
record.setTaskStatus(DeviceTaskStaus.CANCELED);
records.add(record);
}
}
}
if (!CollectionUtils.isEmpty(records)) {
regionConsecutiveTaskRecordMapper.saveOrUpdateBatch(records);
}
}
}

View File

@@ -20,6 +20,8 @@ import com.maibu.core.business.dto.WebMapMessageDTO;
import com.maibu.core.business.dto.WebOlineStatusMessageDTO;
import com.maibu.core.enums.*;
import com.maibu.utils.json.JsonUtils;
import com.maibu.utils.spring.SpringUtils;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.s;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +33,7 @@ import org.springframework.util.CollectionUtils;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.maibu.constant.Constant;
import com.maibu.constant.NettyCacheKey;
import com.maibu.core.business.Device;
@@ -38,6 +41,7 @@ import com.maibu.core.business.DeviceRunStatistics;
import com.maibu.core.business.DeviceRunningStatusHistory;
import com.maibu.core.business.DeviceStatusRecordDTO;
import com.maibu.core.business.ErrorIdentificationStandard;
import com.maibu.core.business.RegionConsecutiveTaskRecord;
import com.maibu.core.business.alarm_center.AlarmMessage;
import com.maibu.core.business.device.NettyDevice;
import com.maibu.core.business.inter.WebsocketMesDispather;
@@ -54,6 +58,7 @@ import com.maibu.dto.DeviceTaskStatusMessageDTO;
import com.maibu.mapper.DeviceRunStatisticsMapper;
import com.maibu.mapper.ErrorIdentificationStandardMapper;
import com.maibu.mapper.HostLocationMapper;
import com.maibu.mapper.RegionConsecutiveTaskRecordMapper;
import com.maibu.memory.DeviceSessionManager;
import com.maibu.memory.GlobalMemory;
import com.maibu.memory.SiteMemory;
@@ -104,6 +109,9 @@ public class DeviceThreadService {
@Autowired
private DeviceTaskService deviceTaskService;
@JsonIgnore
private RegionConsecutiveTaskRecordMapper regionConsecutiveTaskRecordMapper;
public void deviceErrorMonitor() throws InterruptedException, IOException {
initStandard();
@@ -308,7 +316,8 @@ public class DeviceThreadService {
}
if (nowTime - lastActiveTime >= Constant.hostOfflineInterval) {
// 超时了判断离线
if (nettyDevice != null && nettyDevice.getOnlineStatus() == 1) {
if (nettyDevice != null && nettyDevice.getOnlineStatus() != null
&& nettyDevice.getOnlineStatus() == 1) {
nettyDevice.status(DeviceStatus.offline.getType());
// todo 推送设备离线
String key = NettyCacheKey.latestPositonKey + deviceId;
@@ -401,7 +410,7 @@ public class DeviceThreadService {
} else {
Integer lastOnlineStatus = nettyDevice.getOnlineStatus();
if (lastOnlineStatus == 0) {
if (lastOnlineStatus == null || lastOnlineStatus == 0) {
statusChangePush(deviceId, device.getSiteId(), 1);
}
// todo 推送设备上线
@@ -567,4 +576,49 @@ public class DeviceThreadService {
return null;
}
/**
* 规则触发自动判断
*/
public void regionConsecutiveTaskHandler() {
executor.scheduleWithFixedDelay(() -> {
try {
List<SiteMemory> list = GlobalMemory.getAllSiteMemory();
if (!CollectionUtils.isEmpty(list)) {
list.forEach(siteMemory -> {
ConcurrentHashMap<String, RegionConsecutiveTaskRecord> recordMap = siteMemory.regionConsecutiveTaskMap;
if (!CollectionUtils.isEmpty(recordMap)) {
recordMap.keySet().forEach(key -> {
RegionConsecutiveTaskRecord record = recordMap.get(key);
if (record == null || record.getDeviceId() == null
|| CollectionUtils.isEmpty(record.getRouteIds()))
return;
if (siteMemory.hasTask(record.getDeviceId()))
return;
int currentIndex = record.getCurrentIndex();
Long routeId = record.getRouteIds().get(currentIndex);
DeviceTaskCommandDTO dto = new DeviceTaskCommandDTO();
dto.setDeviceId(record.getDeviceId());
dto.setOrgId(siteMemory.getSysSite().getOrgId());
dto.setSiteId(siteMemory.getSysSite().getId());
dto.setRouteId(routeId);
Long taskId = deviceTaskService.createDeviceTask(dto, "system");
if (taskId != null) {
record.getTaskIds().add(taskId);
record.setCurrentIndex(currentIndex + 1);
regionConsecutiveTaskRecordMapper.saveOrUpdate(record);
siteMemory.regionConsecutiveTaskMap.put(key, record);
}
});
}
});
}
} catch (Exception e) {
log.error("区域连续任务处理线程错误:{}", e.getMessage());
}
}, 0, 500, TimeUnit.MILLISECONDS);
}
}