From 4f2454d7dd36c881e273b2ad92e763c0ee540f9b Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Thu, 22 Aug 2024 11:01:08 +0800
Subject: [PATCH] =?UTF-8?q?iot=E8=AE=BE=E5=A4=87code=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/sgzb/largeScreen/domain/IotLocationVo.java  | 3 +++
 .../sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java  | 1 +
 .../src/main/java/com/bonus/sgzb/material/domain/IotDto.java   | 2 +-
 .../src/main/java/com/bonus/sgzb/material/domain/IotVo.java    | 2 +-
 .../sgzb/material/service/impl/IotMachineServiceImpl.java      | 2 +-
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/IotLocationVo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/IotLocationVo.java
index 2a321443..9a5c5e5d 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/IotLocationVo.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/IotLocationVo.java
@@ -40,4 +40,7 @@ public class IotLocationVo {
     /** 报警内容 */
     @ApiModelProperty(value = "报警内容")
     private String startAlarm;
+    /** 电量百分比 */
+    @ApiModelProperty(value = "电量百分比")
+    private Double voltagepercent;
 }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java
index 5f29b7c9..8cf04438 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java
@@ -413,6 +413,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
                 for (int i = 0; i < jsonArray.size(); i++) {
                     JSONObject jsonObject = JSONObject.from(jsonArray.getJSONObject(i));
                     iotLocationVo.setIotId(jsonObject.getString("deviceid"));
+                    iotLocationVo.setVoltagepercent(Double.valueOf(jsonObject.getString("voltagepercent")));
                     iotLocationVo.setCallat(StringHelper.conversionBigDecimal(jsonObject.getString("callat")));
                     iotLocationVo.setCallon(StringHelper.conversionBigDecimal(jsonObject.getString("callon")));
                 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/IotDto.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/IotDto.java
index fea8c85d..ca952517 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/IotDto.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/IotDto.java
@@ -19,7 +19,7 @@ public class IotDto {
 
     /** iot设备ID */
     @ApiModelProperty(value = "iot设备ID")
-    private Long iotId;
+    private String iotId;
 
     /** 类型id */
     @ApiModelProperty(value = "类型id")
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/IotVo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/IotVo.java
index db0af274..e1ca2e31 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/IotVo.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/IotVo.java
@@ -17,7 +17,7 @@ public class IotVo {
 
     /** iot设备ID */
     @ApiModelProperty(value = "iot设备ID")
-    private Long iotId;
+    private String iotId;
 
     /** iot设备类型 */
     @ApiModelProperty(value = "iot设备类型")
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/IotMachineServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/IotMachineServiceImpl.java
index fcec99c0..0882bc49 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/IotMachineServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/IotMachineServiceImpl.java
@@ -301,7 +301,7 @@ public class IotMachineServiceImpl implements IotMachineService {
             redisService.setCacheObject(TokenConstants.TOKEN_LOCATION,redisCode,23L, TimeUnit.HOURS);
         }
         map.clear();
-        list.add(iotDto.getIotId().toString());
+        list.add(iotDto.getIotId());
         map.put("deviceids",list);
         String param = JSON.toJSONString(map);
         String res = HttpHelper.doPost(HttpStatus.LAST_POSITION_URL+redisCode,param);