From dfdd41e39e400d92dfa9c82c9e13707b1dfb644c Mon Sep 17 00:00:00 2001
From: hanrenchun <hanrenchun>
Date: Mon, 8 Jan 2024 09:34:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=84=9F=E7=9F=A5=E8=AE=BE=E5=A4=87=E4=B8=8E?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E8=AE=BE=E5=A4=87=E6=8E=A5=E5=8F=A3=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DevopsDeviceInfoController.java           | 23 +++++++-----------
 .../controller/DevopsVideoInfoController.java | 24 +++++++------------
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/gather-app/src/main/java/com/ruoyi/database/controller/DevopsDeviceInfoController.java b/gather-app/src/main/java/com/ruoyi/database/controller/DevopsDeviceInfoController.java
index 43bff07..fc10cf4 100644
--- a/gather-app/src/main/java/com/ruoyi/database/controller/DevopsDeviceInfoController.java
+++ b/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)
diff --git a/gather-app/src/main/java/com/ruoyi/database/controller/DevopsVideoInfoController.java b/gather-app/src/main/java/com/ruoyi/database/controller/DevopsVideoInfoController.java
index c48c30f..5ae1ab6 100644
--- a/gather-app/src/main/java/com/ruoyi/database/controller/DevopsVideoInfoController.java
+++ b/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)