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

fix: front-end NPE #455

Browse Source
This commit is contained in:
tjq 2022-10-03 15:47:47 +08:00
parent 1301da0d7d
commit ce0290ea03
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/JobInfoVO.java
View File

@ -2,6 +2,7 @@ package tech.powerjob.server.web.response;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang3.StringUtils;
import tech.powerjob.common.enums.ExecuteType; import tech.powerjob.common.enums.ExecuteType;
import tech.powerjob.common.enums.ProcessorType; import tech.powerjob.common.enums.ProcessorType;
import tech.powerjob.common.enums.TimeExpressionType; import tech.powerjob.common.enums.TimeExpressionType;
@ -16,7 +17,6 @@ import tech.powerjob.server.persistence.remote.model.JobInfoDO;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import lombok.Data; import lombok.Data;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.util.StringUtils;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -180,6 +180,8 @@ public class JobInfoVO {
if (!StringUtils.isEmpty(jobInfoDO.getAlarmConfig())){ if (!StringUtils.isEmpty(jobInfoDO.getAlarmConfig())){
jobInfoVO.setAlarmConfig(JSON.parseObject(jobInfoDO.getAlarmConfig(),AlarmConfig.class)); jobInfoVO.setAlarmConfig(JSON.parseObject(jobInfoDO.getAlarmConfig(),AlarmConfig.class));
} else {
jobInfoVO.setAlarmConfig(new AlarmConfig());
} }
if (!StringUtils.isEmpty(jobInfoDO.getLifecycle())){ if (!StringUtils.isEmpty(jobInfoDO.getLifecycle())){
jobInfoVO.setLifeCycle(LifeCycle.parse(jobInfoDO.getLifecycle())); jobInfoVO.setLifeCycle(LifeCycle.parse(jobInfoDO.getLifecycle()));