故障录波文件修改
This commit is contained in:
parent
86e9fb1efc
commit
9e8405a20a
@ -111,7 +111,7 @@ public class FaultRecorderServiceImpl implements FaultRecorderService {
|
||||
throw new ServerException("请添加设备文件解析配置");
|
||||
}
|
||||
FileParseConfig fileParseConfig = JSON.parseObject(sysEquipment.getOptions(), FileParseConfig.class);
|
||||
FdrFormatVo fdrFormatVo = fileParseConfig.getFdrFormatVo();
|
||||
FdrFormatVo fdrFormatVo = fileParseConfig.getFdrFormat();
|
||||
if (fdrFormatVo == null){
|
||||
throw new ServerException("请添加故障录波配置");
|
||||
}
|
||||
@ -132,7 +132,7 @@ public class FaultRecorderServiceImpl implements FaultRecorderService {
|
||||
//合并配置
|
||||
if (StringUtils.isNotEmpty(equipment.getOptions())){
|
||||
FileParseConfig allConfig = JSON.parseObject(equipment.getOptions(), FileParseConfig.class);
|
||||
allConfig.setFdrFormatVo(fdrConfig.getFdrFormatVo());
|
||||
allConfig.setFdrFormat(fdrConfig.getFdrFormat());
|
||||
sysEquipment.setOptions(JSON.toJSONString(allConfig));
|
||||
}
|
||||
sysEquipmentMapper.updateById(sysEquipment);
|
||||
|
Loading…
Reference in New Issue
Block a user