Commit 60b325e5 authored by 刘林's avatar 刘林

fix(jg):record添加跳转链接

parent a96fd127
......@@ -62,4 +62,7 @@ public class JgCertificateChangeRecordDto extends BaseModel {
@ApiModelProperty(value = "设备类别")
private String equCategory;
@ApiModelProperty(value = "跳转路径")
private String routePath;
}
......@@ -106,4 +106,10 @@ public class JgCertificateChangeRecord extends BaseEntity {
@TableField("EQU_CATEGORY")
private String equCategory;
/**
* 跳转路径
*/
@TableField("route_path")
private String routePath;
}
......@@ -292,6 +292,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
if (Objects.isNull(noticeDto) || StringUtils.isEmpty(submitType)) {
throw new IllegalArgumentException("参数不能为空");
}
try {
// 字段转换
this.convertField(noticeDto);
JgInstallationNotice notice = this.getById(noticeDto.getSequenceNbr());
......@@ -397,6 +398,17 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
this.updateById(bean);
}
return noticeDto;
} catch (BadRequest | LocalBadRequest e) {
log.error(e.getMessage(), e);
this.rollBackForDelRedisData();
throw e;
} catch (Exception e) {
log.error(e.getMessage(), e);
this.rollBackForDelRedisData();
throw new BadRequest("安装告知保存失败!");
} finally {
FlowingEquipRedisContext.clean();
}
}
private void checkRepeatUsed(String submitType, JgInstallationNotice jgInstallationNotice) {
......@@ -455,7 +467,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
for (Long sequenceNbr : sequenceNbrs) {
// 删除待办 + 中止流程
JgInstallationNotice jgInstallationNotice = this.baseMapper.selectById(sequenceNbr);
commonService.deleteTaskModel(String.valueOf(sequenceNbr),jgInstallationNotice.getInstanceId());
commonService.deleteTaskModel(String.valueOf(sequenceNbr), jgInstallationNotice.getInstanceId());
// 删除业务单
jgInstallationNotice.setIsDelete(true);
this.getBaseMapper().deleteById(sequenceNbr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment