合并

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

@@ -49,4 +49,11 @@ public class HkController {
 		responseBean = ihkService.pushPerson(appUserId);
 		return responseBean;
 	}
+
+	@RequestMapping(value = "/downloadAuthorityByDeviceUuids", method = RequestMethod.POST)
+	public ResponseBean pushHKPerson() {
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = ihkService.downloadAuthorityByDeviceUuids();
+		return responseBean;
+	}
 }

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

@@ -15,4 +15,10 @@ public interface IHKService {
      */
     ResponseBean pushPerson(String appUserId);
 
+    /**
+     * 下发门禁权限
+     * @return
+     */
+    ResponseBean downloadAuthorityByDeviceUuids();
+
 }

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

@@ -241,9 +241,9 @@ public class FaceServicelimpl implements FaceServiceI {
         if (null == todUserVerify || todUserVerify.size() == 0) {
             throw new WisdomException("您输入的家属或租户ID有误或审核未通过！");
         }
-        if (!Constant.VERIFY_STATUS.equals(todUserVerify.get(0).getVerifyStatus())) {
-            throw new WisdomException("用户房产审核未通过！");
-        }
+//        if (!Constant.VERIFY_STATUS.equals(todUserVerify.get(0).getVerifyStatus())) {
+//            throw new WisdomException("用户房产审核未通过！");
+//        }
 
         return todUserVerify.get(0);
     }

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

@@ -65,7 +65,7 @@ public class HKServiceImpl implements IHKService {
         HKOpenApi.addAuthoritiesByPersonIds(String.valueOf(user.getHkUserId()));
 
         // 下发门禁权限
-        HKOpenApi.downloadAuthorityByDeviceUuids();
+        downloadAuthorityByDeviceUuids();
 
         //--------- 可视对讲 ----------
         visualIntercom(user);
@@ -76,6 +76,15 @@ public class HKServiceImpl implements IHKService {
         throw new WisdomException("操作失败!");
     }
 
+    @Override
+    public ResponseBean downloadAuthorityByDeviceUuids() {
+        ResponseBean responseBean = new ResponseBean();
+        // 下发门禁权限
+        HKOpenApi.downloadAuthorityByDeviceUuids();
+        responseBean.addSuccess("操作成功！");
+        return responseBean;
+    }
+
     /**
      * 公共方法
      * 添加人员, 开卡

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

@@ -498,7 +498,9 @@ public class HKOpenApi {
     public static String HKpersonGroupId(MultipartFile faceImg,Integer personId,Long personNo,String personName,String cardNo) {
         byte [] fileByte = new byte[0];
         try {
-            fileByte = faceImg.getBytes();
+            if (null!=faceImg) {
+                fileByte = faceImg.getBytes();
+            }
         } catch (IOException e) {
             e.printStackTrace();
         }

CODE/smart-community/property-api/src/main/java/com/community/huiju/feign/TaUserFeignService.java

@@ -30,4 +30,12 @@ public interface TaUserFeignService {
     @RequestMapping(value = "/pushHKPerson/{appUserId}", method = RequestMethod.POST)
     ResponseBean pushHKPerson(@PathVariable("appUserId") Integer appUserId);
 
+    /**
+     * 异动下载门禁权限
+     * @return
+     */
+    @RequestMapping(value = "/downloadAuthorityByDeviceUuids", method = RequestMethod.POST)
+    ResponseBean downloadAuthorityByDeviceUuids();
+
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/feign/impl/TaUserFeignFallBack.java

@@ -17,6 +17,11 @@ public class TaUserFeignFallBack implements TaUserFeignService {
         return back();
     }
 
+    @Override
+    public ResponseBean downloadAuthorityByDeviceUuids() {
+        return back();
+    }
+
     private ResponseBean back() {
         log.error("app-api 远端服务请求失败！");
         ResponseBean responseBean = new ResponseBean();

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

@@ -13,11 +13,11 @@ import com.community.huiju.dao.TaSysRoleMapper;
 import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.dao.TaUserVerifyMapper;
 import com.community.huiju.exception.WisdomException;
+import com.community.huiju.feign.TaUserFeignService;
 import com.community.huiju.model.TaFace;
 import com.community.huiju.model.TaUser;
 import com.community.huiju.model.TaUserVerify;
 import com.community.huiju.service.FaceServiceI;
-import com.community.huiju.service.IHKService;
 import com.community.huiju.service.ImageServiceI;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,7 +61,7 @@ public class FaceServicelimpl implements FaceServiceI {
     private TaUserVerifyMapper taUserVerifyMapper;
 
     @Autowired
-    private IHKService ihkService;
+    private TaUserFeignService taUserFeignService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -210,6 +210,9 @@ public class FaceServicelimpl implements FaceServiceI {
         TaUser taUser= taUserMapper.selectById(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);
@@ -218,8 +221,9 @@ public class FaceServicelimpl implements FaceServiceI {
             responseBean.addError(errorMessage);
             return responseBean;
         }
-           HKOpenApi.selectUserSynchronization();
-//        ihkService.pushPerson(taUserVerify.getUserId() + "");
+        // 异动同步到设备
+         // HKOpenApi.selectUserSynchronization();
+        taUserFeignService.downloadAuthorityByDeviceUuids();
         return responseBean;
     }