fix(hippo4j-server): 超时时间配置修复NPE

pull/538/head
oreoft 3 years ago
parent b4bd545a5f
commit 96fd96c38a

@ -83,8 +83,11 @@ public class ThreadPoolServiceImpl implements ThreadPoolService {
@Override @Override
public void saveOrUpdateThreadPoolConfig(String identify, ThreadPoolSaveOrUpdateReqDTO reqDTO) { public void saveOrUpdateThreadPoolConfig(String identify, ThreadPoolSaveOrUpdateReqDTO reqDTO) {
ConfigAllInfo configAllInfo = BeanUtil.convert(reqDTO, ConfigAllInfo.class); ConfigAllInfo configAllInfo = BeanUtil.convert(reqDTO, ConfigAllInfo.class);
Long executeTimeOut = configAllInfo.getExecuteTimeOut() == 0 ? null : configAllInfo.getExecuteTimeOut(); // 若有超时时间
configAllInfo.setExecuteTimeOut(executeTimeOut); Optional.ofNullable(configAllInfo.getExecuteTimeOut())
// 且不为空
.filter(executeTimeOut -> !Objects.equals(executeTimeOut, 0L))
.ifPresent(configAllInfo::setExecuteTimeOut);
configService.insertOrUpdate(identify, false, configAllInfo); configService.insertOrUpdate(identify, false, configAllInfo);
} }
@ -102,7 +105,7 @@ public class ThreadPoolServiceImpl implements ThreadPoolService {
LogRecordInfo logRecordInfo = LogRecordInfo.builder() LogRecordInfo logRecordInfo = LogRecordInfo.builder()
.bizKey(requestParam.getItemId() + "_" + requestParam.getTpId()) .bizKey(requestParam.getItemId() + "_" + requestParam.getTpId())
.bizNo(requestParam.getItemId() + "_" + requestParam.getTpId()) .bizNo(requestParam.getItemId() + "_" + requestParam.getTpId())
.operator(Optional.ofNullable(UserContext.getUserName()).orElse("-")) .operator(UserContext.getUserName())
.action("删除线程池: " + requestParam.getTpId()) .action("删除线程池: " + requestParam.getTpId())
.category("THREAD_POOL_DELETE") .category("THREAD_POOL_DELETE")
.detail(JSONUtil.toJSONString(requestParam)) .detail(JSONUtil.toJSONString(requestParam))

Loading…
Cancel
Save