Merge branch 'dev' into test

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);

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);

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 -> {