Browse Source

修改可是对讲接口;连接

weiximei 6 years ago
parent
commit
fb39fb3214

+ 1
- 1
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/MonitoringServiceImpl.java View File

@@ -271,7 +271,7 @@ public class MonitoringServiceImpl implements IMonitoringService {
271 271
         TpConfiguration tpConfiguration = tpConfigurationMapper.selectByPrimaryKey(tpEquipment.getUuidId());
272 272
 
273 273
         // 判断视频流地址,是否过期
274
-        if (System.currentTimeMillis() >= Long.valueOf(tpEquipment.getUnitUuids())) {
274
+        if (StringUtils.isBlank(tpEquipment.getOpUserUuid()) || System.currentTimeMillis() >= Long.valueOf(tpEquipment.getUnitUuids())) {
275 275
             // 开始更新视频Token
276 276
             Map<String,Object> queryMap = new HashMap<>();
277 277
             queryMap.put("appKey", tpEquipment.getAppkey());

+ 4
- 0
CODE/smart-community/community-common/src/main/java/com/community/commom/hk/HKConstant.java View File

@@ -212,4 +212,8 @@ public class HKConstant {
212 212
      */
213 213
     public static final String OPEN_CARD = "/openapi/service/base/card/openCard";
214 214
 
215
+    /**
216
+     * 可是对讲,分页获取
217
+     */
218
+    public static final String GETDOORDEVICES = "/openapi/service/vis/res/getDoorDevices";
215 219
 }

+ 1
- 1
CODE/smart-community/community-common/src/main/java/com/community/commom/hk/HKOpenApi.java View File

@@ -707,7 +707,7 @@ public class HKOpenApi {
707 707
      */
708 708
     public static String getDoorDevices(Map<String, Object> map){
709 709
 
710
-        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.GETDOORDEVICESBYUNITUUIDS;
710
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.GETDOORDEVICES;
711 711
         Map<String, Object> parMap = new HashMap<>();
712 712
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
713 713
         parMap.put("time", System.currentTimeMillis());