root/nl-Frebot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:1.增加操作台功能。2.调整数据刷新时间。

Browse Source
This commit is contained in:
liejiu946
2026-03-18 19:00:26 +08:00
parent 2407369bb9
commit b693340185
16 changed files with 187 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nl-business-task/src/main/java/org/nl/task/controller/TaskController.java
View File

@@ -2,6 +2,7 @@ package org.nl.task.controller;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.nl.api.task.core.OneClickOperationRequestParam;
import org.nl.logging.annotation.Log;
import org.nl.enums.TaskSourceEnum;
import org.nl.task.param.*;

24
nl-business-task/src/main/java/org/nl/task/param/OneClickOperationRequestParam.java
View File

@@ -1,24 +0,0 @@
package org.nl.task.param;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
/**
* @author dsh
* 2025/12/13
*/
@Data
public class OneClickOperationRequestParam {
/**
* 车号
*/
@NotBlank(message = "{validation_vehicle_number_empty}")
private String vehicle_number;
/**
* 一键任务类型
*/
@NotBlank(message = "{validation_task_type_empty}")
private String type;
}

32
nl-business-task/src/main/java/org/nl/task/provider/TaskAPIProvider.java
View File

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.nl.api.task.api.TaskAPI;
import org.nl.api.task.core.OneClickOperationRequestParam;
import org.nl.api.task.core.TaskRequestParam;
import org.nl.response.WebResponse;
import org.nl.task.entity.Task;
@@ -21,6 +22,8 @@ import org.nl.task.service.TaskService;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @author dsh
@@ -119,4 +122,33 @@ public class TaskAPIProvider implements TaskAPI {
public WebResponse queryNotFinishTaskInfos() {
return WebResponse.requestParamOk(taskService.queryCurrentTaskInfo());
}
@Override
public WebResponse queryAllRoomStatus() {
List<Task> taskList = taskService.queryCurrentTaskInfo();
// 以 destinations(房间号) 为 key，任务信息为 value，构建房间状态 Map
// 同一个房间有多个任务时，优先取执行中(EXECUTING)的任务，否则取第一个
Map<String, Task> roomStatusMap = taskList.stream()
.filter(task -> StrUtil.isNotBlank(task.getDestinations()))
.collect(Collectors.toMap(
Task::getDestinations,
task -> task,
(existing, replacement) -> {
// 已有执行中的任务则保留，否则用新的替换
if (TaskStatusEnum.EXECUTING.getCode().equals(existing.getStatus())) {
return existing;
}
if (TaskStatusEnum.EXECUTING.getCode().equals(replacement.getStatus())) {
return replacement;
}
return existing;
}
));
return WebResponse.requestParamOk(roomStatusMap);
}
@Override
public WebResponse oneClickOperation(OneClickOperationRequestParam param, String source) {
return taskService.oneClickOperation(param, source);
}
}

3
nl-business-task/src/main/java/org/nl/task/service/TaskService.java
View File

@@ -1,6 +1,7 @@
package org.nl.task.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.api.task.core.OneClickOperationRequestParam;
import org.nl.response.WebResponse;
import org.nl.task.entity.Task;
import org.nl.task.param.*;
@@ -66,7 +67,7 @@ public interface TaskService extends IService<Task>{
* @param oneClickOperationRequestParam
* @return WebResponse
*/
WebResponse oneClickOperation(OneClickOperationRequestParam oneClickOperationRequestParam,String taskSource);
WebResponse oneClickOperation(OneClickOperationRequestParam oneClickOperationRequestParam, String taskSource);
/**
* 查询当前任务信息

9
nl-business-task/src/main/java/org/nl/task/service/impl/TaskServiceImpl.java
View File

@@ -5,8 +5,6 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpResponse;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -19,6 +17,7 @@ import org.nl.api.schedule.task.api.ScheduleTaskAPI;
import org.nl.api.schedule.task.core.ScheduleAPICreateCruiseTaskParam;
import org.nl.api.schedule.task.core.ScheduleAPICreateOneClickTaskParam;
import org.nl.api.schedule.task.core.ScheduleAPICreateTaskParam;
import org.nl.api.task.core.OneClickOperationRequestParam;
import org.nl.config.language.LangProcess;
import org.nl.enums.ScheduleTaskReportStatusEnum;
import org.nl.enums.TaskSourceEnum;
@@ -39,9 +38,7 @@ import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.stream.Collectors;
@@ -73,7 +70,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper,Task> implements Tas
/**
* 定时查询车辆任务状态（每秒执行）
*/
@Scheduled(fixedRate = 1000) // 每秒执行一次
@Scheduled(fixedRate = 500) // 每秒执行一次
public void queryScheduleTaskStatus() {
try {
List<Task> taskList = taskMapper.selectList(new LambdaQueryWrapper<>(Task.class)
@@ -294,7 +291,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper,Task> implements Tas
@Override
@Transactional(rollbackFor = Exception.class)
public WebResponse oneClickOperation(OneClickOperationRequestParam oneClickOperationRequestParam,String taskSource) {
public WebResponse oneClickOperation(OneClickOperationRequestParam oneClickOperationRequestParam, String taskSource) {
try {
log.info("一键任务操作参数:{}",oneClickOperationRequestParam);
Task task = BeanUtil.copyProperties(oneClickOperationRequestParam, Task.class);