From 9e8405a20a17021f68faa4c6558b3f445adc7a53 Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Thu, 14 Nov 2024 17:05:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=85=E9=9A=9C=E5=BD=95=E6=B3=A2=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/fdr/service/impl/FaultRecorderServiceImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java b/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java
index 2188714f..a4195929 100644
--- a/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java
+++ b/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java
@@ -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);