|
|
@@ -258,6 +258,9 @@ public class ProtectionServiceImpl extends ServiceImpl<ProtectionMapper, IotAlar
|
|
|
} else {
|
|
|
r.setStatusText("未上报");
|
|
|
}
|
|
|
+ if (r.getStatusUpdateTime() != null && ObjectUtil.isEmpty(r.getStatusUpdatorName())) {
|
|
|
+ r.setStatusUpdatorName("自动获取");
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
response.setContentType("application/vnd.ms-excel");
|
|
|
@@ -270,12 +273,12 @@ public class ProtectionServiceImpl extends ServiceImpl<ProtectionMapper, IotAlar
|
|
|
public SubsystemSimpleVo getSubsystemSimpleVo(Long id) {
|
|
|
IotAlarmSubsystem subsystem = get(id);
|
|
|
SubsystemSimpleVo simpleVo = new SubsystemSimpleVo();
|
|
|
- if (ObjectUtil.isEmpty(subsystem)){
|
|
|
+ if (ObjectUtil.isEmpty(subsystem)) {
|
|
|
return simpleVo;
|
|
|
}
|
|
|
- BeanHelper.copyProperties(simpleVo,subsystem);
|
|
|
+ BeanHelper.copyProperties(simpleVo, subsystem);
|
|
|
String orgName = orgService.concatOrgName(subsystem.getOrgId(), SecurityConstants.INNER);
|
|
|
- if (ObjectUtil.isNotEmpty(orgName)){
|
|
|
+ if (ObjectUtil.isNotEmpty(orgName)) {
|
|
|
simpleVo.setOrgName(orgName);
|
|
|
}
|
|
|
return simpleVo;
|