From 17e7d8662ccdfe4944b854dc3af31e92d28ac550 Mon Sep 17 00:00:00 2001
From: hanrenchun <hanrenchun>
Date: Tue, 16 Apr 2024 10:58:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E8=BD=A8=E8=BF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DevopsVideoInfoController.java | 19 +++++++++++++++
 .../domain/vo/DevopsVideoInfoVo0.java         | 24 +++++++++++++++++++
 .../database/mapper/MetaAlarmInfoMapper.java  |  4 ++--
 3 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 gather-app/src/main/java/com/ruoyi/database/domain/vo/DevopsVideoInfoVo0.java

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 c282165..075a768 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
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.business.domain.dto.DevopsVideoInfoDto;
+import com.ruoyi.business.domain.vo.DevopsVideoInfoVo;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -14,8 +15,10 @@ import com.ruoyi.common.utils.StringKit;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.database.domain.DevopsVideoInfo;
 import com.ruoyi.database.domain.DevopsVideoStatus;
+import com.ruoyi.database.domain.vo.DevopsVideoInfoVo0;
 import com.ruoyi.database.service.DevopsVideoInfoService;
 import com.ruoyi.database.service.DevopsVideoStatusService;
+import com.sun.org.apache.bcel.internal.generic.NEW;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -61,6 +64,22 @@ public class DevopsVideoInfoController extends BaseController {
         return getDataTable(list);
     }
 
+
+    @GetMapping("/all")
+    @ApiOperation("查询视频监控设备表")
+    public TableDataInfo<DevopsVideoInfoVo0> alllist() {
+        List<DevopsVideoInfo> list1 = devopsVideoInfoService.list();
+        ArrayList<DevopsVideoInfoVo0> devopsVideoInfos = new ArrayList<>();
+        for (DevopsVideoInfo devopsVideoInfo1 : list1){
+            DevopsVideoInfoVo0 devopsVideoInfoVo0 = new DevopsVideoInfoVo0();
+            devopsVideoInfoVo0.setDeviceName(devopsVideoInfo1.getDeviceName());
+            devopsVideoInfoVo0.setLongitude(devopsVideoInfo1.getLongitude()+"");
+            devopsVideoInfoVo0.setLatitude(devopsVideoInfo1.getLatitude()+"");
+            devopsVideoInfos.add(devopsVideoInfoVo0);
+        }
+        return getDataTable(devopsVideoInfos);
+    }
+
     @PostMapping("/boundary")
     @ApiOperation("边界列表")
     public TableDataInfo<DevopsVideoInfo> list(
diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/vo/DevopsVideoInfoVo0.java b/gather-app/src/main/java/com/ruoyi/database/domain/vo/DevopsVideoInfoVo0.java
new file mode 100644
index 0000000..71bc15f
--- /dev/null
+++ b/gather-app/src/main/java/com/ruoyi/database/domain/vo/DevopsVideoInfoVo0.java
@@ -0,0 +1,24 @@
+package com.ruoyi.database.domain.vo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 视频监控设备表(DevopsVideoInfo)Domain
+ *
+ * @author makejava
+ * @since 2023-12-01 20:06:03
+ */
+@Data
+public class DevopsVideoInfoVo0 {
+
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    private String longitude;
+
+    private String latitude;
+}
diff --git a/gather-app/src/main/java/com/ruoyi/database/mapper/MetaAlarmInfoMapper.java b/gather-app/src/main/java/com/ruoyi/database/mapper/MetaAlarmInfoMapper.java
index 0c5c0a5..d57f0df 100644
--- a/gather-app/src/main/java/com/ruoyi/database/mapper/MetaAlarmInfoMapper.java
+++ b/gather-app/src/main/java/com/ruoyi/database/mapper/MetaAlarmInfoMapper.java
@@ -85,12 +85,12 @@ public interface MetaAlarmInfoMapper extends BaseMapper<MetaAlarmInfo> {
             " alarm_response_unit LIKE '射阳县公安局临港派出所第一警务区' OR " +
             " alarm_response_unit LIKE '射阳县公安局扁担港边防派出所' OR " +
             " alarm_response_unit LIKE '射阳县公安局扁担港边防派出所第一警务区' OR " +
-            " alarm_response_unit LIKE '射阳县公安局黄沙河边防派出所' OR " +
+                " alarm_response_unit LIKE '射阳县公安局黄沙河边防派出所' OR " +
             " alarm_response_unit LIKE '射阳县公安局黄沙河边防派出所第一警务区' OR " +
             "alarm_response_unit LIKE '射阳县公安局交通警察大队临海中队' OR " +
             " alarm_response_unit LIKE '射阳县公安局黄沙河边防派出所第三警务区' " +
             ") " +
-            "   AND DATE(informant_time) = CURDATE() " +
+//            "   AND DATE(informant_time) = CURDATE() " +
             "   ORDER BY informant_time DESC LIMIT 100) a")
     public List<MetaAlarmInfoAndHandleAlarmVo> listAlarmAndHandleAlarm();