diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyTaskController.java index 2609ddb..1f298cd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyTaskController.java @@ -7,6 +7,8 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.ZhyTask; +import com.ruoyi.system.mapper.ZhyArticleMapper; +import com.ruoyi.system.mapper.ZhyTaskMapper; import com.ruoyi.system.service.IZhyTaskService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -27,6 +29,8 @@ public class ZhyTaskController extends BaseController { @Autowired private IZhyTaskService zhyTaskService; + @Autowired + private ZhyTaskMapper zhyTaskMapper; /** * 查询任务列表 @@ -63,6 +67,14 @@ public class ZhyTaskController extends BaseController return success(zhyTaskService.selectZhyTaskById(id)); } + @PreAuthorize("@ss.hasPermi('system:task:query')") + @GetMapping( "/getIsTask") + public int getIsTask() + { + int num=zhyTaskMapper.selectZhyTaskListByStatus().size(); + return num; + } + /** * 新增任务 */ diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/controller/DocApiController.java b/ruoyi-api/src/main/java/com/ruoyi/api/controller/DocApiController.java index 218ba95..0cd87e2 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/controller/DocApiController.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/controller/DocApiController.java @@ -1261,7 +1261,11 @@ public class DocApiController extends BaseController { List taskInfos=zhyTaskInfoMapper.selectZhyTaskInfoByTaskId(task.getId()); for(int i=0;i>(){}.getType(); Map data = gson.fromJson(task.getUserCommand(), typeData); // 存储结果:group -> type -> List(ID 列表) @@ -1400,7 +1404,10 @@ public class DocApiController extends BaseController { List taskInfos1=zhyTaskInfoMapper.selectZhyTaskInfoByTaskIdAndStatus(taskId,0); for(int i=0;i>(){}.getType(); Map data = gson.fromJson(task.getUserCommand(), typeData); List> searchItems = new ArrayList<>(); @@ -1442,17 +1451,27 @@ public class DocApiController extends BaseController { List taskInfos1=zhyTaskInfoMapper.selectZhyTaskInfoByTaskIdAndStatus(taskId,0); for(int i=0;i> searchItems) } int maxRetries = 3; // 最大重试次数,避免无限重试 int retryCount = 0; - + Gson gson = new Gson(); while (retryCount <= maxRetries) { try { // 构建请求数据 @@ -1855,9 +1884,15 @@ public void goPython(ZhyTaskInfo info, List> searchItems) if ("build".equals(functionName)) { System.out.println("执行 build 逻辑..."); if(info.getName2()!=null){ - webSocketService.sendToUser("123","正在构建‘"+info.getName1()+"-"+info.getName2()+"’图谱"); + Map map1=new HashMap(); + map1.put("type","message"); + map1.put("msg","正在构建'"+info.getName1()+"-"+info.getName2()+"'图谱"); + webSocketService.sendToUser("123",gson.toJson(map1)); }else{ - webSocketService.sendToUser("123","正在构建‘"+info.getName1()+"图谱"); + Map map1=new HashMap(); + map1.put("type","message"); + map1.put("msg","正在构建'"+info.getName1()+"'图谱"); + webSocketService.sendToUser("123",gson.toJson(map1)); } staticBuildService.create(objMap); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ZhyTaskMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ZhyTaskMapper.java index 1af384e..6e2b9ea 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ZhyTaskMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ZhyTaskMapper.java @@ -27,6 +27,8 @@ public interface ZhyTaskMapper */ public List selectZhyTaskList(ZhyTask zhyTask); + public List selectZhyTaskListByStatus(); + /** * 新增任务 * diff --git a/ruoyi-system/src/main/resources/mapper/system/ZhyTaskMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ZhyTaskMapper.xml index 4dd4bb0..a030104 100644 --- a/ruoyi-system/src/main/resources/mapper/system/ZhyTaskMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/ZhyTaskMapper.xml @@ -29,6 +29,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + insert into zhy_task diff --git a/ruoyi-ui/src/api/system/task.js b/ruoyi-ui/src/api/system/task.js index 1f581f7..4afa714 100644 --- a/ruoyi-ui/src/api/system/task.js +++ b/ruoyi-ui/src/api/system/task.js @@ -16,6 +16,12 @@ export function getTask(id) { method: 'get' }) } +export function getIsTask() { + return request({ + url: '/system/task/getIsTask', + method: 'get' + }) +} // 新增任务 export function addTask(data) { diff --git a/ruoyi-ui/src/views/system/create/index.vue b/ruoyi-ui/src/views/system/create/index.vue index bf3a1b4..c2756f7 100644 --- a/ruoyi-ui/src/views/system/create/index.vue +++ b/ruoyi-ui/src/views/system/create/index.vue @@ -1,5 +1,8 @@