From 672ee48f9409e5f4dae2fc845a8a75434e82a949 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 23 Apr 2024 17:58:27 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zcloud/controller/dw/DwController.java  | 14 ++++++++++++++
 .../zcloud/controller/map/MapController.java    | 16 +++++++++-------
 .../java/com/zcloud/service/dw/DwService.java   | 17 +++++++++++++++--
 .../zcloud/service/dw/dto/GetLastPropDto.java   | 11 +++++++++++
 .../zcloud/service/dw/impl/DwServiceImpl.java   | 10 ++++++++++
 5 files changed, 59 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/com/zcloud/service/dw/dto/GetLastPropDto.java

diff --git a/src/main/java/com/zcloud/controller/dw/DwController.java b/src/main/java/com/zcloud/controller/dw/DwController.java
index d722fb43..7217f8d6 100644
--- a/src/main/java/com/zcloud/controller/dw/DwController.java
+++ b/src/main/java/com/zcloud/controller/dw/DwController.java
@@ -81,4 +81,18 @@ public class DwController extends BaseController {
         return dwService.getDictionary();
     }
 
+    @RequestMapping(value = "getLastProp")
+    public Object getLastProp() throws Exception {
+        PageData pd = this.getPageData();
+        GetLastPropDto mapGet = JSONObject.parseObject(JSONObject.toJSONString(pd), GetLastPropDto.class);
+        return dwService.getLastProp(mapGet);
+    }
+
+    @RequestMapping(value = "getAllMessage")
+    public Object getAllMessage() throws Exception {
+        PageData pd = this.getPageData();
+        return dwService.getAllMessage();
+    }
+
+
 }
diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java
index 4998f895..61111842 100644
--- a/src/main/java/com/zcloud/controller/map/MapController.java
+++ b/src/main/java/com/zcloud/controller/map/MapController.java
@@ -885,13 +885,15 @@ public class MapController extends BaseController {
                 return map;
             } else {
                 MapInfo info = JSONObject.parseObject(JSONObject.toJSONString(map.get("info")), MapInfo.class);
-                PageData condition = new PageData();
-                condition.put("USER_ID", info.getRequired().getUserId());
-                PageData userInfo = usersService.findById(condition);
-                HashMap<String, String> otherInfo = new HashMap<>();
-                otherInfo.put("postName", userInfo.getString("postName"));
-                otherInfo.put("personType", userInfo.getString("PERSON_TYPE"));
-                map.put("otherInfo", otherInfo);
+                if (org.apache.commons.lang3.StringUtils.isNotBlank(info.getRequired().getUserId())){
+                    PageData condition = new PageData();
+                    condition.put("USER_ID", info.getRequired().getUserId());
+                    PageData userInfo = usersService.findById(condition);
+                    HashMap<String, String> otherInfo = new HashMap<>();
+                    otherInfo.put("postName", userInfo.getString("postName"));
+                    otherInfo.put("personType", userInfo.getString("PERSON_TYPE"));
+                    map.put("otherInfo", otherInfo);
+                }
                 return map;
             }
         } else {
diff --git a/src/main/java/com/zcloud/service/dw/DwService.java b/src/main/java/com/zcloud/service/dw/DwService.java
index ca17590f..ed08a8d8 100644
--- a/src/main/java/com/zcloud/service/dw/DwService.java
+++ b/src/main/java/com/zcloud/service/dw/DwService.java
@@ -3,14 +3,27 @@ package com.zcloud.service.dw;
 import com.zcloud.service.dw.dto.*;
 
 public interface DwService {
-
+    // 第一版定位接口
+    // 废弃
+    @Deprecated
     Object getMapInfo(MapGet param) throws Exception;
+    // 废弃
+    @Deprecated
     Object getMapList(MapGet param) throws Exception;
+    // 废弃
+    @Deprecated
     Object saveOrUpdateMap(MapInfo param) throws Exception;
     Object getTrace(TraceGet param) throws Exception;
     Object getAlarmList(AlarmGet param) throws Exception;
     Object manageAlarm(AlarmManageDto param) throws Exception;
+    // 废弃
+    @Deprecated
     Object getDictionary() throws Exception;
-
+    // 废弃
+    @Deprecated
     Object deleteMap(DeleteDto deleteDto);
+    // 第二版定位接口
+    Object getLastProp(GetLastPropDto dto) throws Exception;
+    Object getAllMessage() throws Exception;
+
 }
diff --git a/src/main/java/com/zcloud/service/dw/dto/GetLastPropDto.java b/src/main/java/com/zcloud/service/dw/dto/GetLastPropDto.java
new file mode 100644
index 00000000..9fabc761
--- /dev/null
+++ b/src/main/java/com/zcloud/service/dw/dto/GetLastPropDto.java
@@ -0,0 +1,11 @@
+package com.zcloud.service.dw.dto;
+
+import lombok.Data;
+
+@Data
+public class GetLastPropDto {
+    // 设备编号
+    private String deviceCode;
+    //属性identifier,多个属性时逗号隔开，不传或为null时，查设备全部属性最新值
+    private String prop;
+}
diff --git a/src/main/java/com/zcloud/service/dw/impl/DwServiceImpl.java b/src/main/java/com/zcloud/service/dw/impl/DwServiceImpl.java
index edf9433c..29c609eb 100644
--- a/src/main/java/com/zcloud/service/dw/impl/DwServiceImpl.java
+++ b/src/main/java/com/zcloud/service/dw/impl/DwServiceImpl.java
@@ -67,4 +67,14 @@ public class DwServiceImpl implements DwService {
     public Object deleteMap(DeleteDto deleteDto) {
         return HttpUtil.post(url + "dw/deleteMap", deleteDto);
     }
+
+    @Override
+    public Object getLastProp(GetLastPropDto dto) throws Exception {
+        return HttpUtil.post(url + "dw/getLastProp", dto);
+    }
+
+    @Override
+    public Object getAllMessage() throws Exception {
+        return HttpUtil.post(url + "dw/getAllMessage",null);
+    }
 }