zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ server ] [ status ]- update some code - 1

Browse Source
This commit is contained in:
zeaslity
2023-02-03 11:30:20 +08:00
parent 0bd0c9da53
commit fd5f2607b9
12 changed files with 362 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/src/main/java/io/wdd/rpc/controller/SchedulerController.java
View File

@@ -15,8 +15,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static io.wdd.rpc.scheduler.service.status.MonitorAllAgentStatus.ALL_AGENT_TOPIC_NAME_SET;
@RestController
@Api(value = "定时任务控制中心的Controller")
@RequestMapping(value = "/octopus/server/scheduler")
@@ -38,18 +36,27 @@ public class SchedulerController {
@ApiParam(name = "scheduleScript") @RequestBody() ScriptSchedulerVO scriptSchedulerVO
) {
ALL_AGENT_TOPIC_NAME_SET.add("Chengdu-amd64-98-98066f");
HashMap<String, String> map = octopusQuartzService.createScriptScheduledMission(scriptSchedulerVO);
return R.ok(map);
}
@ApiOperation(value = "查询所有的定时脚本任务")
@GetMapping(value = "/script/getAll")
public R<HashMap<String, String>> getAllScriptScheduler(
) {
return R.ok(null);
}
/**
* --------------------------------------------------------------
* 普通的定时任务查询功能
* */
*/
@ApiOperation(value = "查询所有mission")
@GetMapping(value = "/queryAllMission")
@@ -68,7 +75,6 @@ public class SchedulerController {
}
@ApiOperation(value = "删除一个mission")
@PostMapping(value = "/deleteMission/")
public R<String> deleteMission(

13
server/src/main/java/io/wdd/rpc/controller/StatusController.java
View File

@@ -10,8 +10,9 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
import static io.wdd.rpc.scheduler.service.status.MonitorAllAgentStatus.ALL_AGENT_HEALTHY_STATUS_MAP;
import static io.wdd.rpc.scheduler.service.status.MonitorAllAgentStatus.HEALTHY_STATUS_AGENT_LIST_MAP;
import static io.wdd.rpc.init.ServerBootUpEnvironment.ALL_AGENT_STATUS_MAP;
import static io.wdd.rpc.init.ServerBootUpEnvironment.STATUS_AGENT_LIST_MAP;
@RestController
@Api("Agent运行状态Controller")
@@ -21,16 +22,16 @@ public class StatusController {
@ApiOperation("获取所有Agent的运行状态")
@GetMapping("/agentStatus")
public R<Map> GetAllAgentHealthyStatus(){
public R<Map> GetAllAgentHealthyStatus() {
return R.ok(ALL_AGENT_HEALTHY_STATUS_MAP);
return R.ok(ALL_AGENT_STATUS_MAP);
}
@ApiOperation("获取 状态-Agent Map")
@GetMapping("/statusAgent")
public R<Map> GetHealthyStatusAgentList(){
public R<Map> GetHealthyStatusAgentList() {
return R.ok(HEALTHY_STATUS_AGENT_LIST_MAP);
return R.ok(STATUS_AGENT_LIST_MAP);
}
}