暂存

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKOpenApi.java

@@ -450,13 +450,17 @@ public class HKOpenApi {
         map.put("facePhoto", img);
         map.put("cardNo", cardNo);
         String params = JSON.toJSONString(map);
+        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/app-api/src/main/java/com/community/huiju/service/impl/FaceServicelimpl.java

@@ -41,26 +41,29 @@ public class FaceServicelimpl implements FaceServiceI {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean addFace(Integer userid, MultipartFile uploadFile,Integer otherUserID) {
-        String faceImg =img(uploadFile);
-        /**判断是业主，还是结束或租客*/
-        ResponseBean responseBean = getTaFaceParentId(userid,otherUserID);
-        if ("1".equals(responseBean.getCode())){
-            responseBean.getMessage();
-            return responseBean;
+        ResponseBean responseBean= new ResponseBean();
+         String faceImg =img(uploadFile);
+        /**当otherUserID不为空时判断它是否是业主下的租客或者家属*/
+        if (null!= otherUserID && !userid.equals(otherUserID)) {
+                 responseBean = getTaFaceParentId(userid, otherUserID);
+            if ("1".equals(responseBean.getCode())){
+                responseBean.getMessage();
+                return responseBean;
+            }
         }
-            Integer id = otherUserID == null?userid:otherUserID;
-            TaUser user = taUserMapper.selectByPrimaryKey(id);
+            Integer activeUser = otherUserID == null?userid:otherUserID;
+            TaUser user = taUserMapper.selectByPrimaryKey(activeUser);
             TaFace taFace = new TaFace();
             taFace.setFaceImg(faceImg);
             taFace.setCommunityId(user.getCommunityId());
-            taFace.setTaUserId(id);
+            taFace.setTaUserId(activeUser);
             taFace.setCreateUser(userid);
-            taFace.setUpdateUser(id);
+            taFace.setUpdateUser(activeUser);
             taFace.setCreateDate(new Date());
             taFace.setUpdateDate(new Date());
 
         /*验证身份*/
-        responseBean=addVerify( id,  uploadFile, otherUserID, faceImg, taFace) ;
+        responseBean=addVerify( activeUser,  uploadFile, otherUserID, faceImg, taFace) ;
         return responseBean;
     }
 
@@ -75,25 +78,28 @@ public class FaceServicelimpl implements FaceServiceI {
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean upDateFace(Integer userId, MultipartFile uploadFile,Integer otherUserID) {
         boolean isA = false;
+      ResponseBean responseBean= new ResponseBean();
         String faceImg =img(uploadFile);
-        ResponseBean responseBean=getTaFaceParentId(userId,otherUserID);
-        if ("1".equals(responseBean.getCode())){
+        if (null!= otherUserID && !userId.equals(otherUserID)) {
+                 responseBean = getTaFaceParentId(userId, otherUserID);
+            if ("1".equals(responseBean.getCode())) {
                 responseBean.getMessage();
                 return responseBean;
-             }
-            Integer id = otherUserID == null?userId:otherUserID;
+               }}
+            Integer activeUser = otherUserID == null?userId:otherUserID;
             //当前修改的id否存在
-             TaFace User = taFaceMapper.getByUserId(id);
-             if (null == User){
+             TaFace face = taFaceMapper.getByUserId(activeUser);
+             if (null == face){
                  responseBean.addError("您的信息不存在，请录入人脸");
                  return responseBean;
              }
+           TaUser user = taUserMapper.selectByPrimaryKey(activeUser);
             TaFace taFace = new TaFace();
-            taFace.setTaUserId(id);
+            taFace.setTaUserId(activeUser);
             taFace.setFaceImg(faceImg);
             taFace.setUpdateUser(userId);
             taFace.setUpdateDate(new Date());
-            ResponseBean resps = checKout(faceImg, taFace, isA, uploadFile, id);
+            ResponseBean resps = checKout(faceImg, taFace, isA, uploadFile, activeUser);
         if (resps.getCode().equals("0")) {
             resps.addSuccess("图片修改成功");
         } else {
@@ -155,10 +161,13 @@ public class FaceServicelimpl implements FaceServiceI {
     @Override
     public ResponseBean getTaFaceByUserId(Integer userId,Integer otherUserID) {
         ResponseBean responseBean= new ResponseBean();
-         responseBean=getTaFaceParentId(userId,otherUserID);
-        if ("1".equals(responseBean.getCode())){
-            responseBean.getMessage();
-            return responseBean;
+        /**当otherUserID不为空时判断它是否是业主下的租客或者家属*/
+        if (null!= otherUserID && !userId.equals(otherUserID)) {
+            responseBean = getTaFaceParentId(userId, otherUserID);
+            if ("1".equals(responseBean.getCode())) {
+                responseBean.getMessage();
+                return responseBean;
+            }
         }
         Integer id = otherUserID == null?userId:otherUserID;
         TaFace face = taFaceMapper.getByUserId(id);
@@ -176,8 +185,9 @@ public class FaceServicelimpl implements FaceServiceI {
      */
     public ResponseBean getTaFaceParentId(Integer userId,Integer otherUserID){
        ResponseBean  responseBean= new ResponseBean();
-         TaUser user = taUserMapper.selectTaFaceParentId(userId,otherUserID);
-        if (null == user){
+/*         TaUser user = taUserMapper.selectTaFaceParentId(userId,otherUserID);*/
+        TaUser  users= taUserMapper.selectByPrimaryKey(otherUserID);
+        if (null!= users && !users.getParentId().equals(userId)){
             responseBean.addError("您输入的家属或租户ID有误");
             return responseBean;
         }