Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature-789][admin,web] One click online and offline operation #788

Merged
merged 16 commits into from
Jul 28, 2022
Merged
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ public static <T> T getBean(String name, Class<T> requiredType) {
return applicationContext.getBean(name, requiredType);
}

public static <T> T getBeanByClass(Class<T> tClass) {
return applicationContext.getBean(tClass);
}

public static boolean containsBean(String name) {
return applicationContext.containsBean(name);
}
Expand Down
76 changes: 76 additions & 0 deletions dlink-admin/src/main/java/com/dlink/controller/TaskController.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,21 @@
import com.dlink.common.result.Result;
import com.dlink.dto.TaskRollbackVersionDTO;
import com.dlink.job.JobResult;
import com.dlink.model.JobLifeCycle;
import com.dlink.model.JobStatus;
import com.dlink.model.Task;
import com.dlink.model.TaskOperatingSavepointSelect;
import com.dlink.service.TaskService;
import com.dlink.utils.TaskOneClickOperatingUtil;
import com.fasterxml.jackson.databind.JsonNode;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

/**
Expand Down Expand Up @@ -254,5 +260,75 @@ public Result uploadTaskJson(@RequestParam("file") MultipartFile file) throws Ex
return taskService.uploadTaskJson(file);
}

/**
* 查询所有目录
*
* @return
*/
@GetMapping("/queryAllCatalogue")
public Result queryAllCatalogue() {
return taskService.queryAllCatalogue();
}

/**
* 查询对应操作的任务列表
*
* @param operating
* @return
*/
@GetMapping("/queryOnClickOperatingTask")
public Result<List<Task>> queryOnClickOperatingTask(@RequestParam("operating") Integer operating
, @RequestParam("catalogueId") Integer catalogueId) {
if (operating == null) {
return Result.failed("操作不正确");
}
switch (operating) {
case 1:
return taskService.queryOnLineTaskByDoneStatus(Arrays.asList(JobLifeCycle.RELEASE)
, JobStatus.getAllDoneStatus(), true, catalogueId);
case 2:
return taskService.queryOnLineTaskByDoneStatus(Arrays.asList(JobLifeCycle.ONLINE)
, Collections.singletonList(JobStatus.RUNNING), false, catalogueId);
default:
return Result.failed("操作不正确");
}
}


/**
* 一键操作任务
*
* @param operating
* @return
*/
@PostMapping("/onClickOperatingTask")
public Result onClickOperatingTask(@RequestBody JsonNode operating) {
if (operating == null || operating.get("operating") == null) {
return Result.failed("操作不正确");
}
switch (operating.get("operating").asInt()) {
case 1:
final JsonNode savepointSelect = operating.get("taskOperatingSavepointSelect");
return TaskOneClickOperatingUtil.oneClickOnline(TaskOneClickOperatingUtil.parseJsonNode(operating)
, TaskOperatingSavepointSelect.valueByCode(savepointSelect == null ? 0 : savepointSelect.asInt()));
case 2:
return TaskOneClickOperatingUtil.onClickOffline(TaskOneClickOperatingUtil.parseJsonNode(operating));
default:
return Result.failed("操作不正确");
}
}


/**
* 查询一键操作任务状态
*
* @return
*/
@GetMapping("/queryOneClickOperatingTaskStatus")
public Result queryOneClickOperatingTaskStatus() {
return TaskOneClickOperatingUtil.queryOneClickOperatingTaskStatus();
}


}

7 changes: 7 additions & 0 deletions dlink-admin/src/main/java/com/dlink/mapper/TaskMapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
import com.dlink.db.mapper.SuperMapper;
import com.dlink.model.Task;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
* 作业 Mapper 接口
Expand All @@ -34,4 +37,8 @@
public interface TaskMapper extends SuperMapper<Task> {

Integer queryAllSizeByName(String name);

List<Task> queryOnLineTaskByDoneStatus(@Param("parentIds") List<Integer> parentIds
, @Param("stepIds") List<Integer> stepIds, @Param("includeNull") boolean includeNull
, @Param("jobStatuses") List<String> jobStatuses);
}
2 changes: 2 additions & 0 deletions dlink-admin/src/main/java/com/dlink/model/CodeEnum.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
public enum CodeEnum {
SUCCESS(0),
ERROR(1),

EXCEPTION(5),
NOTLOGIN(401);

private Integer code;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
/*
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/

package com.dlink.result;

import com.dlink.common.result.Result;
import com.dlink.model.CodeEnum;
import com.dlink.model.Task;
import com.dlink.model.TaskOperatingSavepointSelect;
import com.dlink.model.TaskOperatingStatus;
import lombok.Data;

/**
* @author mydq
* @version 1.0
* @date 2022/7/16 21:09
**/
@Data
public class TaskOperatingResult {

private Task task;

private TaskOperatingStatus status;

private Integer code;

private String message;

private TaskOperatingSavepointSelect taskOperatingSavepointSelect;

public TaskOperatingResult(Task task) {
this.task = task;
this.status = TaskOperatingStatus.INIT;
this.taskOperatingSavepointSelect = TaskOperatingSavepointSelect.DEFAULT_CONFIG;
}

public TaskOperatingResult(Task task, TaskOperatingSavepointSelect taskOperatingSavepointSelect) {
this.task = task;
this.status = TaskOperatingStatus.INIT;
this.taskOperatingSavepointSelect = taskOperatingSavepointSelect;
}

public void parseResult(Result result) {
if (result == null) {
return;
}
if (CodeEnum.SUCCESS.getCode().equals(result.getCode())) {
this.status = TaskOperatingStatus.SUCCESS;
} else if (CodeEnum.ERROR.getCode().equals(result.getCode())) {
this.status = TaskOperatingStatus.FAIL;
}
this.code = result.getCode();
this.message = result.getMsg();
}
}
13 changes: 13 additions & 0 deletions dlink-admin/src/main/java/com/dlink/service/TaskService.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@
import com.dlink.job.JobResult;
import com.dlink.model.JobInfoDetail;
import com.dlink.model.JobInstance;
import com.dlink.model.JobLifeCycle;
import com.dlink.model.JobStatus;
import com.dlink.model.Task;
import com.dlink.result.SqlExplainResult;
import com.fasterxml.jackson.databind.JsonNode;
import org.springframework.web.multipart.MultipartFile;
import com.dlink.result.TaskOperatingResult;

import java.util.List;

Expand Down Expand Up @@ -93,4 +96,14 @@ public interface TaskService extends ISuperService<Task> {
String exportJsonByTaskIds(JsonNode para);

Result uploadTaskJson(MultipartFile file) throws Exception;

Result queryAllCatalogue();

Result<List<Task>> queryOnLineTaskByDoneStatus(List<JobLifeCycle> jobLifeCycle
, List<JobStatus> jobStatuses, boolean includeNull, Integer catalogueId);

void selectSavepointOnLineTask(TaskOperatingResult taskOperatingResult);

void selectSavepointOffLineTask(TaskOperatingResult taskOperatingResult);

}
Loading