感知设备与视频设备接口更新,

gather-app/src/main/java/com/ruoyi/database/controller/DevopsDeviceInfoController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.database.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.database.domain.DevopsDeviceInfo;
 import com.ruoyi.database.domain.DevopsDeviceStatus;
@@ -48,14 +49,25 @@ public class DevopsDeviceInfoController extends BaseController {
         for (DevopsDeviceStatus devopsDeviceStatus : list1) {
             strings.add(devopsDeviceStatus.getGbsChannelNo());
         }
-        QueryWrapper<DevopsDeviceInfo> devopsDeviceInfoQueryWrapper = new QueryWrapper<>(devopsDeviceInfo);
+
-        devopsDeviceInfoQueryWrapper.in("gbs_channel_no",strings);
+//        LambdaQueryWrapper<DevopsDeviceInfo> devopsDeviceInfoQueryWrapper = new LambdaQueryWrapper<>(devopsDeviceInfo);
-        List<DevopsDeviceInfo> list = devopsDeviceInfoService.list(devopsDeviceInfoQueryWrapper);
+//        devopsDeviceInfoQueryWrapper.in(DevopsDeviceInfo::getGbsChannelNo,strings);
-//        List<DevopsDeviceInfo> list = devopsDeviceInfoService.lambdaQuery().in(DevopsDeviceInfo::getGbsChannelNo,strings).list();
+//        List<DevopsDeviceInfo> list = devopsDeviceInfoService.list(devopsDeviceInfoQueryWrapper);
+        List<DevopsDeviceInfo> list = devopsDeviceInfoService.lambdaQuery().in(DevopsDeviceInfo::getGbsChannelNo,strings).list();
         ArrayList<DevopsDeviceInfo> devopsDeviceInfos = new ArrayList<>();
         for (DevopsDeviceInfo deviceInfo : list){
-            deviceInfo.setIsOnline(1);
+            if (devopsDeviceInfo.getIsDoorwayVideo() == null) {
-            devopsDeviceInfos.add(deviceInfo);
+                deviceInfo.setIsOnline(1);
+                devopsDeviceInfos.add(deviceInfo);
+            }
+            if (devopsDeviceInfo.getIsDoorwayVideo() == 1 && deviceInfo.getIsDoorwayVideo() == 1){
+                deviceInfo.setIsOnline(1);
+                devopsDeviceInfos.add(deviceInfo);
+            }
+            if (devopsDeviceInfo.getIsDoorwayVideo() == 3 && deviceInfo.getIsDoorwayVideo() == 3){
+                deviceInfo.setIsOnline(1);
+                devopsDeviceInfos.add(deviceInfo);
+            }
         }
         return getDataTable(devopsDeviceInfos);
     }

gather-app/src/main/java/com/ruoyi/database/controller/DevopsVideoInfoController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.database.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.business.domain.dto.DevopsVideoInfoDto;
 import com.ruoyi.common.utils.StringKit;
@@ -49,14 +50,25 @@ public class DevopsVideoInfoController extends BaseController {
         for (DevopsVideoStatus devopsVideoStatus : list1) {
             strings.add(devopsVideoStatus.getGbsChannelNo());
         }
-        QueryWrapper<DevopsVideoInfo> devopsVideoInfoQueryWrapper = new QueryWrapper<>(devopsVideoInfo);
+
-        devopsVideoInfoQueryWrapper.in("gbs_channel_no",strings);
+//        LambdaQueryWrapper<DevopsVideoInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>(devopsVideoInfo);
-        List<DevopsVideoInfo> list = devopsVideoInfoService.list(devopsVideoInfoQueryWrapper);
+//        lambdaQueryWrapper.in(DevopsVideoInfo::getGbsChannelNo,strings);
-//        List<DevopsVideoInfo> list = devopsVideoInfoService.lambdaQuery().in(DevopsVideoInfo::getGbsChannelNo,strings).list();
+//        List<DevopsVideoInfo> list = devopsVideoInfoService.list(lambdaQueryWrapper);
+        List<DevopsVideoInfo> list = devopsVideoInfoService.lambdaQuery().in(DevopsVideoInfo::getGbsChannelNo,strings).list();
         ArrayList<DevopsVideoInfo> devopsVideoInfos = new ArrayList<>();
         for (DevopsVideoInfo devopsVideoInfo1 : list){
-            devopsVideoInfo1.setIsOnline(1);
+            if (devopsVideoInfo.getMonitoringType() == null){
-            devopsVideoInfos.add(devopsVideoInfo1);
+                devopsVideoInfo1.setIsOnline(1);
+                devopsVideoInfos.add(devopsVideoInfo1);
+            }
+            if (devopsVideoInfo.getMonitoringType() == 8 && devopsVideoInfo1.getMonitoringType() == 8){
+                devopsVideoInfo1.setIsOnline(1);
+                devopsVideoInfos.add(devopsVideoInfo1);
+            }
+            if (devopsVideoInfo.getMonitoringType() == 9 && devopsVideoInfo1.getMonitoringType() == 9){
+                devopsVideoInfo1.setIsOnline(1);
+                devopsVideoInfos.add(devopsVideoInfo1);
+            }
         }
         return getDataTable(devopsVideoInfos);
     }