Merge branch 'dyf-device' into 6170

fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBizService.java

@@ -126,7 +126,7 @@ public class DeviceBizService {
         List<WebDeviceVo> records = result.getRecords();
         if(records != null && !records.isEmpty()){
             records.forEach(item -> {
-                if(item.getCommunicationMode()!=null && item.getCommunicationMode() == 0){
+                if(item.getCommunicationMode()!=null && (item.getCommunicationMode() == 0 || item.getCommunicationMode() == 2)){
 
                     //设备在线状态
                     String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ item.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);

fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml

@@ -251,6 +251,7 @@
         dt.pc_model_dictionary detailPageUrl,
         ap.name personnelBy,
         d.device_status,
+        d.online_status,
         c.binding_time
         from device d
         inner join device_type dt on d.device_type = dt.id