sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

故障录波文件修改

Browse Source
This commit is contained in:
huguanghan 2024-11-14 17:05:43 +08:00
parent 86e9fb1efc
commit 9e8405a20a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java
View File

@ -111,7 +111,7 @@ public class FaultRecorderServiceImpl implements FaultRecorderService {
throw new ServerException("请添加设备文件解析配置"); throw new ServerException("请添加设备文件解析配置");
} }
FileParseConfig fileParseConfig = JSON.parseObject(sysEquipment.getOptions(), FileParseConfig.class); FileParseConfig fileParseConfig = JSON.parseObject(sysEquipment.getOptions(), FileParseConfig.class);
FdrFormatVo fdrFormatVo = fileParseConfig.getFdrFormatVo(); FdrFormatVo fdrFormatVo = fileParseConfig.getFdrFormat();
if (fdrFormatVo == null){ if (fdrFormatVo == null){
throw new ServerException("请添加故障录波配置"); throw new ServerException("请添加故障录波配置");
} }
@ -132,7 +132,7 @@ public class FaultRecorderServiceImpl implements FaultRecorderService {
//合并配置 //合并配置
if (StringUtils.isNotEmpty(equipment.getOptions())){ if (StringUtils.isNotEmpty(equipment.getOptions())){
FileParseConfig allConfig = JSON.parseObject(equipment.getOptions(), FileParseConfig.class); FileParseConfig allConfig = JSON.parseObject(equipment.getOptions(), FileParseConfig.class);
allConfig.setFdrFormatVo(fdrConfig.getFdrFormatVo()); allConfig.setFdrFormat(fdrConfig.getFdrFormat());
sysEquipment.setOptions(JSON.toJSONString(allConfig)); sysEquipment.setOptions(JSON.toJSONString(allConfig));
} }
sysEquipmentMapper.updateById(sysEquipment); sysEquipmentMapper.updateById(sysEquipment);