合并

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

@@ -70,11 +70,13 @@ public class FaceController extends BaseController {
     @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){
+    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);
+        ResponseBean responseBean = faceServicel.deleteFace(userElement,otherUserId,verifyId);
         return responseBean;
     }
 

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

@@ -30,4 +30,10 @@ public interface TaFaceMapper{
      * @return
      */
     TaFace getById(@Param("id")Integer id);
+
+    /**
+     * 根据审核ID删除人脸信息
+     * @param verifyId
+     */
+    void deleteFace(@Param("verifyId") Integer verifyId);
 }

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

@@ -47,5 +47,5 @@ public interface FaceServiceI {
      * @param otherUserId
      * @return
      */
-    ResponseBean deleteFace(UserElement userElement, Integer otherUserId);
+    ResponseBean deleteFace(UserElement userElement, Integer otherUserId,Integer verifyId);
 }

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

@@ -400,7 +400,7 @@ public class FaceServicelimpl implements FaceServiceI {
     }
 
     @Override
-    public ResponseBean deleteFace(UserElement userElement, Integer otherUserId) {
+    public ResponseBean deleteFace(UserElement userElement, Integer otherUserId,Integer verifyId) {
         ResponseBean responseBean= new ResponseBean();
         TaUserVerify taUserVerify= infoExist(userElement.getUserVerifyId());
         if (null ==taUserVerify) {
@@ -451,8 +451,8 @@ public class FaceServicelimpl implements FaceServiceI {
             responseBean.addError(errorMessage);
             return responseBean;
         }
-
-
+        Integer activeUser = otherUserId == null ? userElement.getUserVerifyId() : otherUserId;
+        taFaceMapper.deleteFace(activeUser);
         // 异动同步到设备
         Map<String,Object> appointJurisdictionMap = Maps.newHashMap();
         appointJurisdictionMap.put("appkey", tpEquipmentTree.getAppkey());

CODE/smart-community/app-api/src/main/resources/mapper/TaFaceMapper.xml

@@ -128,4 +128,9 @@
         where id = #{id,jdbcType=INTEGER}
     </select>
 
+    <delete id="deleteFace" >
+        delete from ta_face
+        where ta_user_verify_id = #{verifyId}
+    </delete>
+
 </mapper>

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

@@ -973,7 +973,6 @@ public class HKOpenApi {
         //    log.error("获取监控列表失败!",e);
         //    throw new RuntimeException("获取监控列表失败!");
         //}
-        getDoorsByRegionUuids();
     }
     /**
      *     删除当前人脸设备信息