From 1054f21702c8c1ef22c31766e553c7e202863e23 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 23 Apr 2024 19:24:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E6=AD=A5=E5=8A=9F=E8=83=BD=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zcloud/controller/map/MapController.java  | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java
index 4fd206c1..a7a1c064 100644
--- a/src/main/java/com/zcloud/controller/map/MapController.java
+++ b/src/main/java/com/zcloud/controller/map/MapController.java
@@ -7,10 +7,7 @@ import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 import com.zcloud.service.bus.CorpInfoService;
 import com.zcloud.service.dw.DwService;
-import com.zcloud.service.dw.dto.AlarmGet;
-import com.zcloud.service.dw.dto.MapGet;
-import com.zcloud.service.dw.dto.MapInfo;
-import com.zcloud.service.dw.dto.TraceGet;
+import com.zcloud.service.dw.dto.*;
 import com.zcloud.service.keyProjects.VideoManagerService;
 import com.zcloud.service.map.*;
 import com.zcloud.service.map.util.ReturnMap;
@@ -924,7 +921,7 @@ public class MapController extends BaseController {
 
     @RequestMapping(value = "/getAllDwMessage")
     @ResponseBody
-    public Object getAlarmList() throws Exception {
+    public Object getAllDwMessage() throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
         PageData pd = this.getPageData();
         // TODO 判断是否是公司人员定位
@@ -946,6 +943,28 @@ public class MapController extends BaseController {
         }
     }
 
+    /**
+     * 获取最新状态
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/getLastProp")
+    @ResponseBody
+    public Object getLastProp() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        PageData pd = this.getPageData();
+        // TODO 判断是否是公司人员定位
+        if (pd.get("corpId") != null && "035958e685cf4850bc40151c5e0617a6".equals(pd.getString("corpId"))) {
+            GetLastPropDto dto = new GetLastPropDto();
+            dto.setDeviceCode(pd.getString("CARDNO"));
+            return dwService.getLastProp(dto);
+        }else {
+            // TODO 其他系统有待开发
+            return null;
+        }
+    }
+
+
 
 
     /**