完成

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/FaceServicelimpl.java

@@ -240,8 +240,14 @@ public class FaceServicelimpl implements FaceServiceI {
                 userIdList.add(user.getHkUserId());
                 //临时设备编号
                 // TODO 根据期楼栋号，来查询出门口机
-                List<String> visualList = new ArrayList<>();
-                visualList.add("10010100000");
+
+                // 单元门口机
+                List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 3);
+                List<String> visualList = visualEquipments.stream()
+                        .map(e-> tpConfigurationMapper.selectByPrimaryKey(e.getUuidId()).getConfigurationValue())
+                        .collect(Collectors.toList());
+//                List<String> visualList = new ArrayList<>();
+//                visualList.add("10010100000");
                 HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
             } else {
                 responseBean.addError("请录入正确图片");

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/HKServiceImpl.java

@@ -13,6 +13,7 @@ import com.community.huiju.service.IHKService;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -131,8 +132,14 @@ public class HKServiceImpl implements IHKService {
         addOutDoorAuthMap.put("personIds", Arrays.asList(user.getHkUserId()));
         addOutDoorAuthMap.put("secret", tpEquipmentTree.getSecret());
         addOutDoorAuthMap.put("appkey", tpEquipmentTree.getAppkey());
-        List<String> visualList = new ArrayList<>();
-        visualList.add("10010100000");
+
+        // 单元门口机
+        List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 3);
+        List<String> visualList = visualEquipments.stream()
+                .map(e-> tpConfigurationMapper.selectByPrimaryKey(e.getUuidId()).getConfigurationValue())
+                .collect(Collectors.toList());
+//        List<String> visualList = new ArrayList<>();
+//        visualList.add("10010100000");
         addOutDoorAuthMap.put("longNums", visualList);
         // 可视对讲下发 权限
         visualIntercomPermissions(addOutDoorAuthMap);
@@ -319,12 +326,28 @@ public class HKServiceImpl implements IHKService {
         // 查询当前的房产
         TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
         TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
+        // 单元门口机
+        List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 3);
+
+         if (CollectionUtils.isEmpty(tpEquipments)) {
+             responseBean.addError("无设备信息!");
+             return responseBean;
+         }
+
+         String str = "";
+         for (TpEquipment e : tpEquipments) {
+             TpConfiguration tpConfiguration = tpConfigurationMapper.selectByPrimaryKey(e.getUuidId());
+             str += tpConfiguration.getConfigurationValue();
+             str += ",";
+         }
 
-        // TODO 查询设备编号
+        // 查询设备编号
 
         Map<String,Object> parMap = com.beust.jcommander.internal.Maps.newHashMap();
-        parMap.put("longNums", "10010100000");
+        parMap.put("longNums", str);
         parMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        parMap.put("secret", tpEquipmentTree.getSecret());
+        parMap.put("appkey", tpEquipmentTree.getAppkey());
         String data = HKOpenApi.syncControl(parMap);
         JSONObject jsonObject = JSONObject.parseObject(data);
         int errorCode = jsonObject.getInteger("errorCode");