修复 bug

CODE/foreign-service/src/main/java/com/community/huiju/controller/TaUserController.java

@@ -74,10 +74,10 @@ public class TaUserController extends BaseController {
     @ApiOperation(value = "根据用户ID查询", notes = "根据用户ID查询")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "path", name = "userId", value = "用户id"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
     })
     public ResponseBean updateUser(@PathVariable(value = "userId") Integer userId){
         ResponseBean responseBean = iTaUserService.getTaUser(userId);

CODE/foreign-service/src/main/java/com/community/huiju/dao/TaFaceMapper.java

@@ -2,7 +2,13 @@ package com.community.huiju.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.community.huiju.model.TaFace;
+import com.community.huiju.model.TpEquipment;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>

CODE/foreign-service/src/main/java/com/community/huiju/dao/TpEquipmentMapper.java

@@ -50,4 +50,22 @@ public interface TpEquipmentMapper extends BaseMapper<TpEquipment> {
             "on trne.equipment_id = te.id " +
             "where trne.community_id=#{communityId} and trne.unit_id=#{unitId} and te.equipment_type=#{equipmentType}")
     List<TpEquipment> selectByCommunityIdAndUnitId(Integer communityId, Integer unitId, Integer equipmentType);
+
+
+    /**
+     * 根据小区 和 单元号 查询所有人脸设备
+     * @param communityId
+     * @param unitId
+     * @return
+     */
+    @ResultType(TpEquipment.class)
+    @Select("select " +
+            "te.* " +
+            "from tp_unit_equipment trne left join tp_equipment te " +
+            "on trne.equipment_id = te.id " +
+            "LEFT JOIN tp_configuration tc ON te.uuid_id = tc.id " +
+            "where trne.community_id=#{communityId} and trne.unit_id=#{unitId} and te.equipment_type=#{equipmentType} " +
+            "AND tc.device_type = 1")
+    List<TpEquipment> selectByCommunityIdAndUnitIdAndFace(@Param("communityId") Integer communityId, @Param("unitId") Integer unitId, @Param("equipmentType") Integer equipmentType);
+
 }

CODE/foreign-service/src/main/java/com/community/huiju/service/impl/FaceServicelimpl.java

@@ -201,39 +201,45 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
                 // 设备树
                 TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(communityId);
                 // 所有设备
-                List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 4);
-                List<Map<String, Object>> equipmentUUID = getEquipmentUUID(tpEquipments);
-                StringBuilder doorUuids = new StringBuilder();
-                StringBuilder deviceUuids = new StringBuilder();
-                equipmentUUID.forEach(e-> {
-                    doorUuids.append(e.get("doorUuid"));
-                    doorUuids.append(",");
-                    deviceUuids.append(e.get("deviceUuid"));
-                    deviceUuids.append(",");
-                });
-                Map<String,Object> map = Maps.newHashMap();
-                map.put("appkey", tpEquipmentTree.getAppkey());
-                map.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
-                map.put("personIds", String.valueOf(user.getHkUserId()));
-                map.put("deviceUuids", deviceUuids.substring(0, deviceUuids.lastIndexOf(",")));
-                map.put("type", 1);
-                map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
-                HKOpenApi.downloadFaceAndFingerInfos(map);
-
-                //可视对讲时 指定人员人脸权限下载
-                List<Integer> userIdList = new ArrayList<>();
-                userIdList.add(user.getHkUserId());
-                //临时设备编号
-                // TODO 根据期楼栋号，来查询出门口机
+                //List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 4);
+                List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitIdAndFace(communityId, unitId, 4);
+                if (CollectionUtils.isNotEmpty(tpEquipments)) {
+                    List<Map<String, Object>> equipmentUUID = getEquipmentUUID(tpEquipments);
+                    StringBuilder doorUuids = new StringBuilder();
+                    StringBuilder deviceUuids = new StringBuilder();
+                    equipmentUUID.forEach(e-> {
+                        doorUuids.append(e.get("doorUuid"));
+                        doorUuids.append(",");
+                        deviceUuids.append(e.get("deviceUuid"));
+                        deviceUuids.append(",");
+                    });
+                    Map<String,Object> map = Maps.newHashMap();
+                    map.put("appkey", tpEquipmentTree.getAppkey());
+                    map.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+                    map.put("personIds", String.valueOf(user.getHkUserId()));
+                    map.put("deviceUuids", deviceUuids.substring(0, deviceUuids.lastIndexOf(",")));
+                    map.put("type", 1);
+                    map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+                    HKOpenApi.downloadFaceAndFingerInfos(map);
+                }
 
                 // 单元门口机
                 List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 3);
-                List<String> visualList = visualEquipments.stream()
-                        .map(e-> tpConfigurationMapper.selectById(e.getUuidId()).getConfigurationValue())
-                        .collect(Collectors.toList());
+                if (CollectionUtils.isNotEmpty(visualEquipments)) {
+                    List<String> visualList = visualEquipments.stream()
+                            .map(e-> tpConfigurationMapper.selectById(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());
+
+                    //可视对讲时 指定人员人脸权限下载
+                    List<Integer> userIdList = new ArrayList<>();
+                    userIdList.add(user.getHkUserId());
+                    //临时设备编号
+                    // TODO 根据期楼栋号，来查询出门口机
+                    HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
+                }
+
             } else {
                 responseBean.addError(ResponseErrorsMessages.FACE_ERROR.getCode(), ResponseErrorsMessages.FACE_ERROR.getMsg());
             }

CODE/foreign-service/src/main/resources/mapper/TaFaceMapper.xml

@@ -4,7 +4,14 @@
 
     <select id="getByUserVerifyId" resultType="com.community.huiju.model.TaFace" parameterType="java.lang.Integer">
         select
-        *
+        `id` as faceId,
+        `community_id`,
+        `ta_user_verify_id`,
+        `face_img`,
+        `create_user`,
+        `create_date`,
+        `update_user`,
+        `update_date`
         from ta_face
         where ta_user_verify_id = #{userVerifyId,jdbcType=INTEGER}
     </select>

CODE/foreign-service/src/main/resources/mapper/TaUserVerifyMapper.xml

@@ -4,7 +4,24 @@
 
     <select id="selectCommunityAndAddressAndVerifyStatus" resultType="com.community.huiju.model.TaUserVerify">
         select
-        *
+        `id` as userVerifyId,
+        `user_id`,
+        `community_id`,
+        `role_id`,
+        `phase_id`,
+        `phase_name`,
+        `building_id`,
+        `building_name`,
+        `unit_id`,
+        `unit_name`,
+        `level_id`,
+        `level_name`,
+        `room_no_id`,
+        `room_no_name`,
+        `verify_status`,
+        `create_date`,
+        `verify_name`,
+        `remark`
         from ta_user_verify
         where community_id = #{communityId,jdbcType=INTEGER}
         and user_id = #{userId,jdbcType=INTEGER}