合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/FaceController.java

@@ -26,23 +26,25 @@ public class FaceController extends BaseController {
     @ApiOperation(value = "添加人脸图片", notes = "添加人脸图片")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "家属或租户ID,不填为本人")
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "家属或租户ID,不填为本人"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "verifyID",value = "审核id")
     })
-    
+
     @RequestMapping(value = "/addFace",method = RequestMethod.POST)
     public Object getTaFace(HttpSession session,
                             @ApiParam(value = "file" ,required = true) MultipartFile uploadFile,
-                            @RequestParam(required = false) Integer otherUserId){
+                            @RequestParam(required = false) Integer otherUserId,
+                            @RequestParam(required = false) Integer verifyID){
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = getUserElement(session);
-        responseBean = faceServicel.addFace(userElement ,uploadFile,otherUserId);
+        responseBean = faceServicel.addFace(userElement ,uploadFile,otherUserId,verifyID);
         return responseBean;
     }
 
     @ApiOperation(value = "修改人脸图片", notes = "修改人脸图片")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "家属或租户ID,不填为本人")
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "家属或租户ID,不填为本人"),
     })
     @RequestMapping(value = "/upDateFace",method = RequestMethod.POST)
     public Object upDateTaFace(HttpSession session,
@@ -58,7 +60,7 @@ public class FaceController extends BaseController {
     @ApiOperation(value = "获取当前已录入人脸信息", notes = "获取当前已录入人脸信息")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "家属或租户ID,不填为本人")
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "家属或租户ID,不填为本人"),
     })
     @RequestMapping(value = "/getUserIdFace",method = RequestMethod.GET)
     public Object getTaFaceByUserId(HttpSession session, @RequestParam(required = false) Integer otherUserId){
@@ -66,5 +68,18 @@ public class FaceController extends BaseController {
         ResponseBean responseBean = faceServicel.getTaFaceByUserId(userElement,otherUserId);
         return responseBean;
     }
+    @ApiOperation(value = "删除当前人脸信息", notes = "删除当前人脸信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "家属或租户ID,不填为本人"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "verifyID",value = "审核id")
+    })
+    @RequestMapping(value = "/deleteFace",method = RequestMethod.GET)
+    public Object deleteFace(HttpSession session, @RequestParam(required = false) Integer otherUserId,
+                             @RequestParam(required = false) Integer verifyID){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = faceServicel.deleteFace(userElement,otherUserId,verifyID);
+        return responseBean;
+    }
 
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaUserVerifyMapper.java

@@ -95,4 +95,5 @@ public interface TaUserVerifyMapper {
                                            @Param("unitId") Integer unitId,
                                            @Param("levelId") Integer levelId,
                                            @Param("roomNoId") Integer roomNoId);
+
 }

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

@@ -14,7 +14,7 @@ public interface FaceServiceI {
      *  @param otherUserId 关联家属或者租客ID
      * @return
      */
-    ResponseBean addFace(UserElement userElement, MultipartFile uploadFile,Integer otherUserId);
+    ResponseBean addFace(UserElement userElement, MultipartFile uploadFile,Integer otherUserId,Integer verifyID);
 
     /**
      * 更新当前人脸
@@ -41,4 +41,11 @@ public interface FaceServiceI {
      */
     ResponseBean addWelcomeFace(MultipartFile uploadFile, TaUser user);
 
+    /**
+     * 删除人脸
+     * @param userElement
+     * @param otherUserId
+     * @return
+     */
+    ResponseBean deleteFace(UserElement userElement, Integer otherUserId,Integer verifyID);
 }

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

@@ -64,9 +64,14 @@ public class FaceServicelimpl implements FaceServiceI {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean addFace(UserElement userElement, MultipartFile uploadFile, Integer otherUserId) {
+    public ResponseBean addFace(UserElement userElement, MultipartFile uploadFile, Integer otherUserId ,Integer verifyID) {
         ResponseBean responseBean = new ResponseBean();
-
+        /*审核房产是否通过*/
+        TaUserVerify taUserVerify= infoExist(verifyID);
+        if (null == taUserVerify) {
+            responseBean.addError("房产审核未通过");
+            return responseBean;
+        }
         // 判断是否是迎宾系统人员
         TaUser welcomeUser = taUserMapper.selectByPrimaryKey(otherUserId);
         if (null != welcomeUser && null != welcomeProperties.getCommunityId() && null != welcomeUser.getCommunityId() && welcomeUser.getCommunityId().intValue() == welcomeProperties.getCommunityId()) {
@@ -350,6 +355,46 @@ public class FaceServicelimpl implements FaceServiceI {
         responseBean.addSuccess("操作成功！");
         return responseBean;
     }
+
+    @Override
+    public ResponseBean deleteFace(UserElement userElement, Integer otherUserId,Integer verifyID) {
+        ResponseBean responseBean= new ResponseBean();
+        TaUserVerify taUserVerify= infoExist(verifyID);
+        if (null ==taUserVerify) {
+            responseBean.addError("房产审核未通过");
+            return responseBean;
+        }
+            TaUser taUser = taUserMapper.selectByPrimaryKey(taUserVerify.getUserId());
+        // TODO 删除人脸，是否删除海康
+        // 修改人脸(图片为null时。海康删除人脸)
+        HKOpenApi.HKpersonGroupId(null, taUser.getHkUserId(), taUser.getHkPersonNo(), taUser.getUserName(), taUser.getHkCardNo());
+        // 删除 权限
+        HKOpenApi.selectUserFace(taUser.getHkUserId());
+        String data= HKOpenApi.deleteUser(taUser.getHkUserId());
+        JSONObject object= JSONObject.parseObject(data);
+
+        if (object.get("errorCode").equals(1)){
+            String errorMessage=  object.getString("errorMessage");
+            responseBean.addError(errorMessage);
+            return responseBean;
+        }
+        // 异动同步到设备
+        // HKOpenApi.selectUserSynchronization();
+        ihkService.downloadAuthorityByDeviceUuids();
+        return responseBean;
+
+    }
+
+    /*校验房产是否审核通过*/
+    public TaUserVerify infoExist(Integer verifyID){
+        /*查询当前的房产ID*/
+      TaUserVerify taUserVerify = taUserVerifyMapper.selectByPrimaryKey(verifyID);
+
+      if (null!= taUserVerify && taUserVerify.getVerifyStatus().equals("1")) {
+          return taUserVerify;
+      }
+      return  null;
+    }
 }
 
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -228,10 +228,11 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         TaUser appUser = getByLoginName(tpBuildingOwnerInfo.getOwnerTel());
 
+        TaUser taUser =null;
         // 开始匹配 APP 端用户表
         if (null == appUser) {
             // 如果 APP端 没有这个用户，则自动注册一个
-            TaUser taUser = new TaUser();
+            taUser = new TaUser();
             taUser.setUserName(tpBuildingOwnerInfo.getOwnerName());
             taUser.setLoginName(tpBuildingOwnerInfo.getOwnerTel());
             taUser.setGender(tpBuildingOwnerInfo.getGender());
@@ -327,14 +328,13 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             message.setCreateDate(LocalDateTime.now());
             messageMapper.insert(message);
         }
-
-
+        // 对外返回人员信息
+        TaUser foreignTaUser= taUserMapper.selectById(taUser.getId());
         if (row <= 0) {
             throw new WisdomException("操作失败!");
         } else {
-            responseBean.addSuccess("操作成功!");
+            responseBean.addSuccess(foreignTaUser);
         }
-
         return responseBean;
     }
 

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

@@ -161,14 +161,14 @@ public class FaceServicelimpl implements FaceServiceI {
                 }
                 responseBean.addSuccess("操作成功");
                 HKOpenApi.downloadFaceAndFingerInfos(String.valueOf(user.getHkUserId()));
-//                //可视对讲时 指定人员人脸权限下载
-//                List<Integer> userIdList = new ArrayList<>();
-//                userIdList.add(user.getHkUserId());
-//                //临时设备编号
-//                // TODO 根据期楼栋号，来查询出门口机
-//                List<String> visualList = new ArrayList<>();
-//                visualList.add("10010100000");
-//                HKOpenApi.visualIntercom(null, 1, userIdList, visualList);
+                //可视对讲时 指定人员人脸权限下载
+                List<Integer> userIdList = new ArrayList<>();
+                userIdList.add(user.getHkUserId());
+                //临时设备编号
+                // TODO 根据期楼栋号，来查询出门口机
+                List<String> visualList = new ArrayList<>();
+                visualList.add("10010100000");
+                HKOpenApi.visualIntercom(null, 1, userIdList, visualList);
             } else {
                 responseBean.addError("请录入正确图片");
             }