diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
index 592ebfd..85bba52 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
@@ -67,7 +67,8 @@
     <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusObserpoiInfo">
         SELECT
         <include refid="Base_Column_List"/>,
-        bm.DEVICE_IP as ip
+        bm.DEVICE_IP as ip,
+        bm.TYPE AS deviceType
         FROM
         bus_obserpoi_info bo
         LEFT JOIN bus_monipoi_info bm ON bo.MONITOR_ID = bm.ID

diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
index 592ebfd..85bba52 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
@@ -67,7 +67,8 @@
     <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusObserpoiInfo">
         SELECT
         <include refid="Base_Column_List"/>,
-        bm.DEVICE_IP as ip
+        bm.DEVICE_IP as ip,
+        bm.TYPE AS deviceType
         FROM
         bus_obserpoi_info bo
         LEFT JOIN bus_monipoi_info bm ON bo.MONITOR_ID = bm.ID
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java
index 7ad3868..27fe879 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java
@@ -93,6 +93,12 @@
     @TableField(exist = false)
     private String  ip;
 
+    @TableField(exist = false)
+    private String  deviceType;
+
+    @TableField(exist = false)
+    private String  deviceTypeName;
+
     public BusObserpoiInfo() {
     }
 

diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
index 592ebfd..85bba52 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
@@ -67,7 +67,8 @@
     <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusObserpoiInfo">
         SELECT
         <include refid="Base_Column_List"/>,
-        bm.DEVICE_IP as ip
+        bm.DEVICE_IP as ip,
+        bm.TYPE AS deviceType
         FROM
         bus_obserpoi_info bo
         LEFT JOIN bus_monipoi_info bm ON bo.MONITOR_ID = bm.ID
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java
index 7ad3868..27fe879 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java
@@ -93,6 +93,12 @@
     @TableField(exist = false)
     private String  ip;
 
+    @TableField(exist = false)
+    private String  deviceType;
+
+    @TableField(exist = false)
+    private String  deviceTypeName;
+
     public BusObserpoiInfo() {
     }
 
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusObserpoiInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusObserpoiInfoServiceImpl.java
index c900f35..9523538 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusObserpoiInfoServiceImpl.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusObserpoiInfoServiceImpl.java
@@ -5,7 +5,9 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.ObserveCfgCacheEnum;
 import com.casic.missiles.modular.system.dao.BusObserpoiInfoMapper;
 import com.casic.missiles.modular.system.dto.BusObserpoiRequest;
@@ -38,6 +40,9 @@
     @Autowired
     private AbstractPermissionContext permissionContext;
 
+    @Autowired
+    private AbstractDictService dictService;
+
     @Override
     @Cacheable(value = {observeCfgDetail},
             key = "'observe_detail_'+#monitorId+'-'+#serialNum+'-'+#lineNum"
@@ -110,7 +115,7 @@
     }
 
     @Override
-    @CacheEvict(value =  {observeCfgDetail,observeCfgList}, allEntries = true, beforeInvocation=true)
+    @CacheEvict(value = {observeCfgDetail, observeCfgList}, allEntries = true, beforeInvocation = true)
     public boolean addPresetByIp(String deviceIp, int presetIndex, int lineNum,
                                  double direction, double pitch, int stopTime,
                                  int alarmValue, int speed, String presetName,
@@ -156,7 +161,7 @@
 
 
     @Override
-    @CacheEvict(value =  {observeCfgDetail,observeCfgList}, allEntries = true, beforeInvocation=true)
+    @CacheEvict(value = {observeCfgDetail, observeCfgList}, allEntries = true, beforeInvocation = true)
     public boolean deletePresetByIp(String deviceIp, int presetIndex, int lineNum) {
         MonitorBaseInfo baseInfo = monipoiInfoService.selectInfoByDeviceIp(deviceIp);
         if (ObjectUtil.isNotEmpty(baseInfo)) {
@@ -171,7 +176,7 @@
 
 
     @Override
-    @CacheEvict(value =  {observeCfgDetail,observeCfgList}, allEntries = true, beforeInvocation=true)
+    @CacheEvict(value = {observeCfgDetail, observeCfgList}, allEntries = true, beforeInvocation = true)
     public boolean deletePresetBySerials(String deviceIp, int presetIndex, int lineNum) {
         MonitorBaseInfo baseInfo = monipoiInfoService.selectInfoByDeviceIp(deviceIp);
         if (ObjectUtil.isNotEmpty(baseInfo)) {
@@ -187,7 +192,7 @@
 
     //根据全局变量设置属性值
     @Override
-    @CacheEvict(value =  {observeCfgDetail,observeCfgList}, allEntries = true, beforeInvocation=true)
+    @CacheEvict(value = {observeCfgDetail, observeCfgList}, allEntries = true, beforeInvocation = true)
     public boolean updateGlobalValues(String deviceIp, Integer stopTime,
                                       Integer alarmValue, Integer speed) {
 
@@ -210,7 +215,7 @@
     }
 
     @Override
-    @CacheEvict(value =  {observeCfgDetail,observeCfgList}, allEntries = true, beforeInvocation=true)
+    @CacheEvict(value = {observeCfgDetail, observeCfgList}, allEntries = true, beforeInvocation = true)
     public boolean updateCruise(Long monitorId, String cruiseName, int cruiseRoute) {
 
         return this.baseMapper.updateCruise(monitorId, cruiseName, cruiseRoute);
@@ -241,7 +246,7 @@
 
 
     @Override
-    @CacheEvict(value =  {observeCfgDetail,observeCfgList}, allEntries = true, beforeInvocation=true)
+    @CacheEvict(value = {observeCfgDetail, observeCfgList}, allEntries = true, beforeInvocation = true)
     public boolean deleteCruise(String deviceIp, String cruiseName, int cruiseRoute) {
         MonitorBaseInfo baseInfo = monipoiInfoService.selectInfoByDeviceIp(deviceIp);
         if (ObjectUtil.isNotEmpty(baseInfo)) {
@@ -253,7 +258,7 @@
         return false;
     }
 
-//    @Override
+    //    @Override
 //    @Cacheable(value = {observeCfgList},
 //            key = "'observe_list_'+#obserpoiRequest.getStationId()+'-'+#obserpoiRequest.getMonitorId()+'-'+#obserpoiRequest.getLineNum()"
 //    )
@@ -265,7 +270,12 @@
     public List<BusObserpoiInfo> pageList(Page<BusObserpoiInfo> page, BusObserpoiRequest obserpoiRequest) {
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         dataScope.setScopeName("DEPT_ID");
-        return this.baseMapper.pageList(page, obserpoiRequest, dataScope);
+        List<BusObserpoiInfo> busObserpoiInfoList = this.baseMapper.pageList(page, obserpoiRequest, dataScope);
+        busObserpoiInfoList.forEach(busObserpoiInfo -> {
+            busObserpoiInfo.setDeviceTypeName(ObjectUtil.isNotEmpty(busObserpoiInfo.getDeviceType()) ?
+                    dictService.getDictNameByCode(DictEnum.DEVICE_TYPE, busObserpoiInfo.getDeviceType()) : "");
+        });
+        return busObserpoiInfoList;
     }
 
     @Override