diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
index 05ecd7e59..cfeaf51db 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
@@ -1861,7 +1861,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                     temp = assembleLine(substationName, LineBaseEnum.SUB_LEVEL.getCode(), pids.get(LineBaseEnum.GD_LEVEL.getCode()), pids);
                     this.baseMapper.insert(temp);
                     //处理电压等级字典表
-                    DictData substationScale = dicDataFeignClient.getDicDataByName(oracleTerminalExcel.getSubStationScale()).getData();
+                    DictData substationScale = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.DEV_VOLTAGE_STAND.getName(),oracleTerminalExcel.getSubStationScale()).getData();
                     if (Objects.isNull(substationScale)) {
                         //在电压等级内新增一条记录
                         substationScale = dicDataFeignClient.addDicData(DicDataTypeEnum.DEV_VOLTAGE.getName(), oracleTerminalExcel.getSubStationScale()).getData();
@@ -1919,7 +1919,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                             }
                         }
                         //处理终端厂家
-                        DictData manufacturer = dicDataFeignClient.getDicDataByName(oracleTerminalExcel.getManufacturer()).getData();
+                        DictData manufacturer = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.DEV_MANUFACTURER.getName(),oracleTerminalExcel.getManufacturer()).getData();
                         if (Objects.isNull(manufacturer)) {
                             //在终端厂家字典内新增一条记录
                             manufacturer = dicDataFeignClient.addDicData(DicDataTypeEnum.DEV_MANUFACTURER.getName(), oracleTerminalExcel.getManufacturer()).getData();
@@ -1955,7 +1955,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                         device.setFrontType(frontTypeDicData.getId());
                         String devType = oracleDevType.replace("_" + frontType, "");
                         //处理终端类型
-                        DictData devTypeDicData = dicDataFeignClient.getDicDataByName(devType).getData();
+                        DictData devTypeDicData = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.DEV_TYPE.getName(),devType).getData();
                         if (Objects.isNull(devTypeDicData)) {
                             //在终端类型字典内新增一条记录
                             devTypeDicData = dicDataFeignClient.addDicData(DicDataTypeEnum.DEV_TYPE.getName(), devType).getData();
@@ -2015,7 +2015,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                     voltage.setId(temp.getId());
                     voltage.setModel(oracleTerminalExcel.getSubvModel());
                     //处理电压等级字典表
-                    DictData subvScale = dicDataFeignClient.getDicDataByName(oracleTerminalExcel.getSubvScale()).getData();
+                    DictData subvScale = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.DEV_VOLTAGE_STAND.getName(),oracleTerminalExcel.getSubvScale()).getData();
                     if (Objects.isNull(subvScale)) {
                         //在电压等级内新增一条记录
                         subvScale = dicDataFeignClient.addDicData(DicDataTypeEnum.DEV_VOLTAGE.getName(), oracleTerminalExcel.getSubvScale()).getData();
@@ -2080,14 +2080,14 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
 //                    }
                         lineDetail.setNum(oracleTerminalExcel.getLineNum());
                         //干扰源类型
-                        DictData loadTypeDicData = dicDataFeignClient.getDicDataByName(oracleTerminalExcel.getLoadType()).getData();
+                        DictData loadTypeDicData = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.INTERFERENCE_SOURCE_TYPE.getName(),oracleTerminalExcel.getLoadType()).getData();
                         if (Objects.isNull(loadTypeDicData)) {
                             //在电压等级内新增一条记录
                             loadTypeDicData = dicDataFeignClient.addDicData(DicDataTypeEnum.INTERFERENCE_SOURCE_TYPE.getName(), oracleTerminalExcel.getLoadType()).getData();
                         }
                         lineDetail.setLoadType(loadTypeDicData.getId());
                         //行业类型
-                        DictData businessDicData = dicDataFeignClient.getDicDataByName(oracleTerminalExcel.getBusinessType()).getData();
+                        DictData businessDicData = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.BUSINESS_TYPE.getName(),oracleTerminalExcel.getBusinessType()).getData();
                         if (Objects.isNull(businessDicData)) {
                             //在电压等级内新增一条记录
                             businessDicData = dicDataFeignClient.addDicData(DicDataTypeEnum.BUSINESS_TYPE.getName(), oracleTerminalExcel.getBusinessType()).getData();
@@ -2100,7 +2100,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                         }
                         //终端等级,为空不处理，可以为空
                         if (StringUtils.isNotBlank(oracleTerminalExcel.getLineGrade())) {
-                            DictData lineGradeDicData = dicDataFeignClient.getDicDataByName(oracleTerminalExcel.getLineGrade()).getData();
+                            DictData lineGradeDicData = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.DEV_LEVEL.getName(),oracleTerminalExcel.getLineGrade()).getData();
                             if (Objects.isNull(lineGradeDicData)) {
                                 //在电压等级内新增一条记录
                                 lineGradeDicData = dicDataFeignClient.addDicData(DicDataTypeEnum.DEV_LEVEL.getName(), oracleTerminalExcel.getLineGrade()).getData();