合并

CODE/smart-community/community-common/src/main/java/com/community/commom/hk/HKConstant.java

@@ -119,6 +119,15 @@ public class HKConstant {
      * 修改人员
      */
     public static final String ITF_UPDATE_USER ="/openapi/service/base/person/modifyPersonInfo";
+    /**
+     * 查询人员设备
+     */
+    public static final String ITF_SELECT_USER ="/openapi/service/acs/auth/getAuthoritiesByPersonIds";
+
+    /**
+     * 删除人员设备
+     */
+    public static final String ITF_DELETE_USER ="/openapi/service/acs/auth/delPerAuthsByPerIdsAndDoorUuids";
 
 
     /**

CODE/smart-community/community-common/src/main/java/com/community/commom/hk/HKOpenApi.java

@@ -970,5 +970,54 @@ public class HKOpenApi {
         }
 
     }
+    // 删除当前人脸设备信息
+    public static String deleteUser(Integer opUserUuid) {
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_DELETE_USER;
+        Map<String, Object> parMap = new HashMap<String, Object>();
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("personIds",2301+"");
+        parMap.put("doorUuids","91b8ce635b634d468cde925af6e4274c,d40b23e316364bb5a276b99bb6327181,7f866e918ab8452f9eb1d8a25e481530,8b8256fc605d428c9dc797451e3dc432,84d619c5e84942f68047f0bca93fc041");
+        String params =  JSON.toJSONString(parMap);
+        log.info("删除人脸 请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("删除人脸 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("删除加人脸失败!",e);
+            throw new RuntimeException("删除加人脸失败!");
+        }
+        return data;
+    }
+        // 查询当前人脸设备信息---（没通）
+    public static String selectUserFace(Integer opUserUuid) {
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_SELECT_USER;
+        Map<String, Object> parMap = new HashMap<String, Object>();
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("pageNo","1");
+        parMap.put("pageSize","100");
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("personIds",opUserUuid+"");
+        String params =  JSON.toJSONString(parMap);
+        log.info("查询设备人脸 请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("查询设备人脸 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("查询设备人脸失败!",e);
+            throw new RuntimeException("查询设备人脸失败!");
+        }
+        return data;
+    }
 
 }

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

@@ -106,7 +106,7 @@ public class FaceController extends BaseController {
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "roomNoName",value = "户号"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "家属或租户ID,不填为本人")
     })
-    @RequestMapping(value = "/getUserIdFace",method = RequestMethod.GET)
+    @RequestMapping(value = "/deleteFace",method = RequestMethod.GET)
     public Object deleteFace(HttpSession session, @RequestParam(required = false) Integer otherUserId,
                                     @RequestParam(required = false) String phaseName,
                                     @RequestParam(required = false) String buildingName,
@@ -118,5 +118,3 @@ public class FaceController extends BaseController {
     }
 
 }
-
-}

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

@@ -202,7 +202,10 @@ public class FaceServicelimpl implements FaceServiceI {
     @Override
     public ResponseBean deleteFace(Integer otherUserId, String phaseName, String buildingName, String unitName, String levelName, String roomNoName) {
         TaUserVerify taUserVerify= infoExist(phaseName,buildingName,unitName,levelName, roomNoName,otherUserId);
+        TaUser taUser= taUserMapper.selectById(taUserVerify.getUserId());
         // TODO 删除人脸，是否删除海康
+//        HKOpenApi.selectUser(taUser.getHkUserId());
+        HKOpenApi.deleteUser(taUser.getHkUserId());
         return null;
     }