From 82a173a6f31fe10c328db912f0051153d3c2c574 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Thu, 13 Jun 2024 15:01:53 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=BE=B9=E7=95=8C=E5=85=A5=E4=BE=B5?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=9B=B4=E6=96=B0=202=E3=80=81=E8=BE=B9?=
 =?UTF-8?q?=E7=95=8C=E5=85=A5=E4=BE=B5=E6=91=84=E5=83=8F=E5=A4=B4=E6=A0=87?=
 =?UTF-8?q?=E7=82=B9=E4=B8=8D=E6=98=BE=E7=A4=BAbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../map/MapPlatFormElectronicController.java  | 19 +++++++++++++++----
 .../com/zcloud/service/dw/dto/AlarmGet.java   |  2 ++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java b/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java
index c26eb59c..050c6ff0 100644
--- a/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java
+++ b/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java
@@ -2,6 +2,7 @@ package com.zcloud.controller.map;
 
 import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.PageData;
+import com.zcloud.service.keyProjects.PlatformvideomanagementService;
 import com.zcloud.service.map.util.HKPostUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -19,6 +20,9 @@ public class MapPlatFormElectronicController extends BaseController {
     @Autowired
     private PlatformelectronicService platformelectronicService;
 
+    @Autowired
+    private PlatformvideomanagementService platformvideomanagementService;
+
     /**总摄像头数
      * @throws Exception
      */
@@ -27,8 +31,7 @@ public class MapPlatFormElectronicController extends BaseController {
     public Object listAll() throws Exception{
         Map<String,Object> map = new HashMap<String,Object>();
         String errInfo = "success";
-        PageData pd = new PageData();
-        pd = this.getPageData();
+        PageData pd = this.getPageData();
         Integer allForMap = platformelectronicService.countAllForMap(pd);	//列出Platformelectronic列表
         map.put("allForMap", allForMap);
         map.put("result", errInfo);
@@ -61,8 +64,16 @@ public class MapPlatFormElectronicController extends BaseController {
     public Object listAllLocation() throws Exception{
         Map<String,Object> map = new HashMap<String,Object>();
         String errInfo = "success";
-        PageData pd = new PageData();
-        pd = this.getPageData();
+        PageData pd = this.getPageData();
+        if ("bianjieruqin".equals(pd.getString("TYPE"))){
+            List<PageData>	varList = platformvideomanagementService.listAll(pd);	//列出Platformvideomanagement列表
+            for (PageData data : varList) {
+                data.put("MAP_POINT_NAME", data.getString("NAME"));
+            }
+            map.put("varList", varList);
+            map.put("result", errInfo);
+            return map;
+        }
         pd.put("forMap","1");
         List<PageData> varList = platformelectronicService.listAll(pd);	//列出Platformelectronic列表
         for (PageData data : varList) {
diff --git a/src/main/java/com/zcloud/service/dw/dto/AlarmGet.java b/src/main/java/com/zcloud/service/dw/dto/AlarmGet.java
index e4c5044a..07eca741 100644
--- a/src/main/java/com/zcloud/service/dw/dto/AlarmGet.java
+++ b/src/main/java/com/zcloud/service/dw/dto/AlarmGet.java
@@ -10,5 +10,7 @@ public class AlarmGet {
     private String status;
     private String corpId;
     private Page page;
+    // 告警来源
+    private String sourceNum;
 
 }