提交

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/HKConstant.java

@@ -124,6 +124,11 @@ public class HKConstant {
      */
     public static final String ITF_SELECT_USER ="/openapi/service/acs/auth/getAuthoritiesByPersonIds";
 
+    /**
+     * 人员异动
+     */
+    public static final String ITF_SELECT_USER_SDH="/openapi/service/acs/auth/downloadAuthorityByDeviceUuids";
+
     /**
      * 删除人员设备
      */

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();
         }
@@ -979,7 +981,7 @@ public class HKOpenApi {
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
         parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
-        parMap.put("personIds",2301+"");
+        parMap.put("personIds",opUserUuid+"");
         parMap.put("doorUuids","91b8ce635b634d468cde925af6e4274c,d40b23e316364bb5a276b99bb6327181,7f866e918ab8452f9eb1d8a25e481530,8b8256fc605d428c9dc797451e3dc432,84d619c5e84942f68047f0bca93fc041");
         String params =  JSON.toJSONString(parMap);
         log.info("删除人脸 请求参数：{}", params);
@@ -989,12 +991,12 @@ public class HKOpenApi {
             log.info("删除人脸 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("删除加人脸失败!",e);
-            throw new RuntimeException("删除加人脸失败!");
+            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>();
@@ -1002,8 +1004,8 @@ public class HKOpenApi {
         parMap.put("appkey", HKConstant.APPKEY);
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
-        parMap.put("pageNo","1");
-        parMap.put("pageSize","100");
+        parMap.put("pageNo",1);
+        parMap.put("pageSize",100);
         parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
         parMap.put("personIds",opUserUuid+"");
         String params =  JSON.toJSONString(parMap);
@@ -1020,4 +1022,31 @@ public class HKOpenApi {
         return data;
     }
 
+    /**
+     * 人员异动（同步硬件）
+     * @return
+     */
+    public static String selectUserSynchronization() {
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_SELECT_USER_SDH;
+        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("deviceUuids","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;
+    }
+
 }

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

@@ -49,11 +49,11 @@ public class BuildingTreeController extends BaseController {
 	@GetMapping(value = "/trees")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
-			@ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "id", value = "当前节点id(查期时ID为空)")
+			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "id", value = "当前节点id(查期时ID为空)"),
+			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "treeType", value = "phase:(期)，building:(栋),unit:(单元),level:(楼层),roomNo:(房间号)")
 	})
 	public ResponseBean getTreeList(@RequestParam(value = "id", required = false) Integer id,@RequestParam("treeType") String treeType,HttpSession session){
-		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
+		ResponseBean responseBean = new ResponseBean();UserElement userElement = getUserElement(session);
 
 		responseBean = buildingTreeService.getTreeList(userElement.getCommunityId(),id,treeType);
 		return responseBean;
@@ -62,7 +62,7 @@ public class BuildingTreeController extends BaseController {
 	@ApiOperation(value = "添加当前节点", notes = "添加当前节点")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "id:当前节点;" +
-					"name:节点名称;type：类型，nodeNumber:输入的节点")
+					"name:节点名称;type：(phase:(期)，building:(栋),unit:(单元),level:(楼层),roomNo:(房间号)), roomNonodeNumber:输入的节点")
 	})
 	@RequestMapping(value = "/addnode",method = RequestMethod.POST)
 	public ResponseBean addNode(@RequestBody String parameter, HttpSession session){
@@ -73,8 +73,7 @@ public class BuildingTreeController extends BaseController {
 
 	@ApiOperation(value = "删除当前节点", notes = "删除当前节点")
 	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "id:当前节点;" +
-					"name:节点名称;type：类型，nodeNumber:输入的节点")
+			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "id:当前节点;type:(end:(房间)，roomNo:(楼层),level:(单元)，unit:(楼栋),building:(期))")
 	})
 	@RequestMapping(value = "/deletenode",method = RequestMethod.POST)
 	public ResponseBean deletenode(@RequestBody String parameter, HttpSession session){

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/BuildingTreeServiceImpl.java

@@ -294,7 +294,6 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		 //当前输入的节点内容
 		 String nodeNumber= object.getString("nodeNumber");
 
-		//楼栋
 		/*查询出期*/
 		if(type.equals("phase")) {
 			//是否存在同样的名字
@@ -333,7 +332,6 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 						 .setCreateDate(LocalDateTime.now());
 			tpBuildingMapper.insert(tpBuilding);
 		}
-		//单元
 		//查询栋，维护单元
 		 TpBuilding selectTpBuilding= tpBuildingMapper.selectById(id);
 		if (type.equals("unit")){
@@ -359,7 +357,6 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		 	 tpUnitMapper.insert(tpUnit);
 		 }
 
-		//楼层
 		//查询单元，维护楼层
 		 TpUnit selectTpUnit= tpUnitMapper.selectById(id);
 		if(type.equals("level")){

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

@@ -13,6 +13,7 @@ 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;
@@ -59,6 +60,9 @@ public class FaceServicelimpl implements FaceServiceI {
     @Autowired
     private TaUserVerifyMapper taUserVerifyMapper;
 
+    @Autowired
+    private TaUserFeignService taUserFeignService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean addFace(UserElement userElement, MultipartFile uploadFile, Integer otherUserId,String phaseName,String buildingName,String unitName,String levelName,String roomNoName) {
@@ -201,12 +205,26 @@ public class FaceServicelimpl implements FaceServiceI {
 
     @Override
     public ResponseBean deleteFace(Integer otherUserId, String phaseName, String buildingName, String unitName, String levelName, String roomNoName) {
+        ResponseBean responseBean= new ResponseBean();
         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;
+        // 修改人脸(图片为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();
+        taUserFeignService.downloadAuthorityByDeviceUuids();
+        return responseBean;
     }
 
     /**
@@ -246,6 +264,7 @@ public class FaceServicelimpl implements FaceServiceI {
         TaUserVerify taUserVerify= taUserVerifyMapper.selectOne(queryTaUserVerify);
         return taUserVerify;
     }
+
 }