diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/controller/ZhyTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyTaskController.java similarity index 84% rename from ruoyi-api/src/main/java/com/ruoyi/api/controller/ZhyTaskController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyTaskController.java index 36c1279..2609ddb 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/controller/ZhyTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyTaskController.java @@ -1,25 +1,19 @@ -package com.ruoyi.api.controller; +package com.ruoyi.web.controller.system; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +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.service.IZhyTaskService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 任务Controller diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/controller/ZhyTaskInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyTaskInfoController.java similarity index 85% rename from ruoyi-api/src/main/java/com/ruoyi/api/controller/ZhyTaskInfoController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyTaskInfoController.java index 6c8e68a..04e1fa8 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/controller/ZhyTaskInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyTaskInfoController.java @@ -1,25 +1,19 @@ -package com.ruoyi.api.controller; +package com.ruoyi.web.controller.system; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +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.ZhyTaskInfo; import com.ruoyi.system.service.IZhyTaskInfoService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 任务信息Controller 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 b3a8d47..218ba95 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 @@ -1264,7 +1264,8 @@ public class DocApiController extends BaseController { webSocketService.sendToUser("123","正在抓取‘"+info.getName1()+"数据"); goPython(info,searchItems); } - + task.setStatus(1); + zhyTaskService.updateZhyTask(task); } @PostMapping("/buildOne") public void buildOne(HttpServletRequest request,@RequestBody Map data) { @@ -1450,6 +1451,8 @@ public class DocApiController extends BaseController { goPython(info,searchItems); } } + task.setStatus(1); + zhyTaskService.updateZhyTask(task); } } @@ -1743,6 +1746,8 @@ public class DocApiController extends BaseController { } } + task.setStatus(1); + zhyTaskService.updateZhyTask(task); //构建定时图谱 //定时去跑这个脚本 //获取所有的节点信息,包括名称、group分组 diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/BuildService.java b/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/BuildService.java index 52f049d..cac9dca 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/BuildService.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/BuildService.java @@ -211,7 +211,8 @@ public class BuildService { ZhyArticle article = new ZhyArticle(); article.setName(data.get("title")); // article.setOpenUrl(data.get("urls")); - File file = new File("D:\\project\\gyx\\tupudata\\html", article.getName()+".txt"); +// File file = new File("D:\\project\\gyx\\tupudata\\html", article.getName()+".txt"); + File file = new File("D:\\project\\gyx\\tupudata\\article", article.getName()+".pdf"); System.out.println("文件路径: " + file.getAbsolutePath()); article.setLocalUrl(file.getAbsolutePath()); article.setAuthors(data.get("authors"));