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

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

@@ -49,29 +49,24 @@ public class DevopsDeviceInfoController extends BaseController {
         for (DevopsDeviceStatus devopsDeviceStatus : list1) {
             strings.add(devopsDeviceStatus.getGbsChannelNo());
         }
-
-//        LambdaQueryWrapper<DevopsDeviceInfo> devopsDeviceInfoQueryWrapper = new LambdaQueryWrapper<>(devopsDeviceInfo);
-//        devopsDeviceInfoQueryWrapper.in(DevopsDeviceInfo::getGbsChannelNo,strings);
-//        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){
-            if (devopsDeviceInfo.getIsDoorwayVideo() == null) {
-                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);
     }
 
+
+    @GetMapping("/type")
+    @ApiOperation("查询智能设备沿海与海堤线")
+    public TableDataInfo<DevopsDeviceInfo> levelList(DevopsDeviceInfo devopsDeviceInfo){
+        startPage();
+        List<DevopsDeviceInfo> list = devopsDeviceInfoService.list(new QueryWrapper<>(devopsDeviceInfo));
+        return getDataTable(list);
+    }
+
     @PostMapping
     @ApiOperation("新增智能设备信息表")
     @Log(title = "智能设备信息表", businessType = BusinessType.INSERT)

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

@@ -50,29 +50,23 @@ public class DevopsVideoInfoController extends BaseController {
         for (DevopsVideoStatus devopsVideoStatus : list1) {
             strings.add(devopsVideoStatus.getGbsChannelNo());
         }
-
-//        LambdaQueryWrapper<DevopsVideoInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>(devopsVideoInfo);
-//        lambdaQueryWrapper.in(DevopsVideoInfo::getGbsChannelNo,strings);
-//        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){
-            if (devopsVideoInfo.getMonitoringType() == null){
-                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);
     }
 
+    @GetMapping("/type")
+    @ApiOperation("查询视频设备沿海与海堤线")
+    public TableDataInfo<DevopsVideoInfo> levelList(DevopsVideoInfo devopsVideoInfo){
+        startPage();
+        List<DevopsVideoInfo> list = devopsVideoInfoService.list(new QueryWrapper<>(devopsVideoInfo));
+        return getDataTable(list);
+    }
+
     @PostMapping
     @ApiOperation("新增视频监控设备表")
     @Log(title = "视频监控设备表", businessType = BusinessType.INSERT)