From 9f7a6237d17c050d9c476dc02111f8cebaa383d9 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 23 May 2022 18:00:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89token=E6=8B=BC=E6=8E=A5?=
 =?UTF-8?q?=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/hik/service/impl/HikCommunityInfoServiceImpl.java   | 2 +-
 .../modules/hik/service/impl/HikDeviceInfoServiceImpl.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikCommunityInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikCommunityInfoServiceImpl.java
index d10718e..2055525 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikCommunityInfoServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikCommunityInfoServiceImpl.java
@@ -111,7 +111,7 @@ public class HikCommunityInfoServiceImpl extends BaseServiceImpl<HikCommunityInf
 
         // token
         String token =hkDeviceUtil.getAccessToken();
-        token = "Bearer ".concat(token);
+//        token = "Bearer ".concat(token);
 
         Map<String, Object> headerMap = new HashMap<>(4);
         headerMap.put("Authorization",token);
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikDeviceInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikDeviceInfoServiceImpl.java
index fb05681..5933489 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikDeviceInfoServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikDeviceInfoServiceImpl.java
@@ -112,7 +112,7 @@ public class HikDeviceInfoServiceImpl extends BaseServiceImpl<HikDeviceInfoDao,
 
         // token
         String token =hkDeviceUtil.getAccessToken();
-        token = "Bearer ".concat(token);
+//        token = "Bearer ".concat(token);
 
         Map<String, String> headerMap = new HashMap<>(4);
         headerMap.put("Authorization",token);

From 760a00af69796796e6c65660a586afb49a7de646 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 23 May 2022 18:04:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=97=B6=E4=BD=BF=E7=94=A8=E7=A4=BE=E5=8C=BAID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/rent/service/impl/RentContractInfoServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
index 04c7366..9551e26 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
@@ -286,7 +286,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
                         authority.setCommunityId(community.getCommunityId());
 
                         Map<String, Object> deviceParams = new HashMap<>(4);
-                        deviceParams.put("communityName", dto.getVillageName());
+                        deviceParams.put("communityId", community.getCommunityId());
                         List<HikDeviceInfoDTO> deviceList = hikDeviceInfoService.list(deviceParams);
 
                         deviceList.forEach(device -> {