third_codes/PowerJob
1
0
Fork 1
mirror of https://github.com/PowerJob/PowerJob.git synced 2025-07-17 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

[dev] suit front-end's develop, I think my Javascript level is good now~

Browse Source
This commit is contained in:
tjq 2020-06-06 00:07:29 +08:00
parent 6faff7d6fe
commit 0e32fbeeef
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/workflow/WorkflowInstanceService.java
View File

@ -73,7 +73,7 @@ public class WorkflowInstanceService {
return dto;
}
private WorkflowInstanceInfoDO fetchWfInstance(Long wfInstanceId, Long appId) {
public WorkflowInstanceInfoDO fetchWfInstance(Long wfInstanceId, Long appId) {
WorkflowInstanceInfoDO wfInstance = wfInstanceInfoRepository.findByWfInstanceId(wfInstanceId).orElseThrow(() -> new IllegalArgumentException("can't find workflow instance by wfInstanceId: " + wfInstanceId));
if (!Objects.equals(appId, wfInstance.getAppId())) {
throw new OmsException("Permission Denied!");

19
oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/AppInfoController.java
View File

@ -35,15 +35,20 @@ public class AppInfoController {
private static final int MAX_APP_NUM = 50;
@PostMapping("/save")
public ResultDTO<Void> saveAppInfo(@RequestBody ModifyAppInfoRequest appInfoRequest) {
public ResultDTO<Void> saveAppInfo(@RequestBody ModifyAppInfoRequest req) {
AppInfoDO appInfoDO = new AppInfoDO();
BeanUtils.copyProperties(appInfoRequest, appInfoDO);
Date now = new Date();
if (appInfoRequest.getId() == null) {
appInfoDO.setGmtCreate(now);
AppInfoDO appInfoDO;
Long id = req.getId();
if (id == null) {
appInfoDO = new AppInfoDO();
appInfoDO.setGmtCreate(new Date());
}else {
appInfoDO = appInfoRepository.findById(id).orElseThrow(() -> new IllegalArgumentException("can't find appInfo by id:" + id));
}
appInfoDO.setGmtModified(now);
BeanUtils.copyProperties(req, appInfoDO);
appInfoDO.setGmtModified(new Date());
appInfoRepository.saveAndFlush(appInfoDO);
return ResultDTO.success(null);
}

6
oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/WorkflowInstanceController.java
View File

@ -39,6 +39,12 @@ public class WorkflowInstanceController {
return ResultDTO.success(null);
}
@GetMapping("/info")
public ResultDTO<WorkflowInstanceInfoVO> getInfo(Long wfInstanceId, Long appId) {
WorkflowInstanceInfoDO wfInstanceDO = workflowInstanceService.fetchWfInstance(wfInstanceId, appId);
return ResultDTO.success(WorkflowInstanceInfoVO.from(wfInstanceDO, cacheService.getWorkflowName(wfInstanceDO.getWorkflowId())));
}
@PostMapping("/list")
public ResultDTO<PageResult<WorkflowInstanceInfoVO>> listWfInstance(@RequestBody QueryWorkflowInstanceRequest req) {
Sort sort = Sort.by(Sort.Direction.DESC, "gmtModified");