暂存

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

@@ -31,9 +31,10 @@ public class HKConstant {
      * <p>请将地址配置正确.</p>
      * <p>默认情况下是127.0.0.1:80 ，如果地址不通请根据实际情况修改IP端口</p>
      */
-//    public static final String OPENAPI_IP_PORT_HTTP = "http://192.168.0.122";
-    // public static final String OPENAPI_IP_PORT_HTTP = "http://192.168.0.122";
-    public static final String OPENAPI_IP_PORT_HTTP = "http://huiju.ngrok.xiaomiqiu.cn";
+   //public static final String OPENAPI_IP_PORT_HTTP = "http://192.168.0.122";
+    //  public static final String OPENAPI_IP_PORT_HTTPS = "http://192.168.0.122";
+    //public static final String OPENAPI_IP_PORT_HTTP = "http://huiju.ngrok.xiaomiqiu.cn";
+    public static final String OPENAPI_IP_PORT_HTTP = "http://6wnrrtr3.wkdl.ltd";
 
     /**
      * <p>操作用户UUID，即用户UUID，首次使用操作用户UUID可以通过接口 [获取默认用户UUID]来获取</p>

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

@@ -61,20 +61,17 @@ public class FaceServicelimpl implements FaceServiceI {
         taFace.setUpdateUser(id);
         taFace.setCreateDate(new Date());
         taFace.setUpdateDate(new Date());
-
         //判断身份是否为业主且状态为已停用
         TaSysRole sysRole = taSysRoleMapper.findRoleByUserId(userid);
         TaUser taUser = taUserMapper.selectByPrimaryKey(userid);
         if (null!=taUser && null!=sysRole
                 && Constant.INVALID.equals(taUser.getStatus())&& Constant.OWNER.equals(sysRole.getRoleName())) {
-
             response.addError("9996", "您的身份已停用，请联系物业");
             return response;
         }
         //身份为家属租客，状态为已停用
         if (null!=taUser && null!=sysRole){
                 if (Constant.INVALID.equals(taUser.getStatus()) && (Constant.RELATION.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName())){
-
                 response.addError("9996", "您的身份已停用，请联系物业");
                 return response;
             }
@@ -88,7 +85,6 @@ public class FaceServicelimpl implements FaceServiceI {
                 if (resps.getCode().equals("0")) {
                     taUser.setFaceStatus("1");
                     taUserMapper.updateByPrimaryKeySelective(taUser);
-
                     resps.addSuccess("图片录入成功");
                 } else {
                     resps.addError(resps.getMessage());
@@ -101,7 +97,6 @@ public class FaceServicelimpl implements FaceServiceI {
                 if (resps.getCode().equals("0")) {
                     taUser.setFaceStatus("1");
                     taUserMapper.updateByPrimaryKeySelective(taUser);
-
                     resps.addSuccess("图片录入成功");
                 } else {
                     resps.addError(resps.getMessage());
@@ -131,17 +126,15 @@ public class FaceServicelimpl implements FaceServiceI {
         }
         ResponseBean responseBean=getTaFaceParentId(userId,otherUserID);
         if ("1".equals(responseBean.getCode())){
-            responseBean.getMessage();
-            return responseBean;
+                responseBean.getMessage();
+                return responseBean;
         }
-        Integer id = otherUserID == null?userId:otherUserID;
-        TaFace taFace = new TaFace();
-        taFace.setUpdateUser(userId);
-        taFace.setUpdateDate(new Date());
-        ResponseBean resps = checKout(faceImg, taFace, isA, uploadFile, id);
+            Integer id = otherUserID == null?userId:otherUserID;
+            TaFace taFace = new TaFace();
+            taFace.setUpdateUser(userId);
+            taFace.setUpdateDate(new Date());
+            ResponseBean resps = checKout(faceImg, taFace, isA, uploadFile, id);
         if (resps.getCode().equals("0")) {
-
-
             resps.addSuccess("图片修改成功");
         } else {
             resps.addError(resps.getMessage());
@@ -157,30 +150,24 @@ public class FaceServicelimpl implements FaceServiceI {
             log.error("本地库人员ID：{}  的海康人员ID不存在", userId);
             return responseBean;
         }
-
         AESDecode aesd = new AESDecode();
         String body = "{\"type\": \"0\", \"image_url\":\"" + faceImg + "\"}";
         try {
-            responseBean = aesd.send(body);
-            JSONObject jsonObject = JSONObject.parseObject(responseBean.getMessage());
-            Integer type = (Integer) jsonObject.get("errno");
-            Integer faceNum = (Integer) jsonObject.get("face_num");
-
+                responseBean = aesd.send(body);
+                JSONObject jsonObject = JSONObject.parseObject(responseBean.getMessage());
+                Integer type = (Integer) jsonObject.get("errno");
+                Integer faceNum = (Integer) jsonObject.get("face_num");
             /*boolean isA为true进行添加，为false进行修改*/
             if (0 == type && 1 == faceNum && isA) {
-
-                    /*推送海康*/
+                /*推送海康*/
                 HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getId(), user.getUserName(), user.getHkCardNo());
-
                 taFace.setFaceImg(faceImg);
                 taFaceMapper.insertSelective(taFace);
                 responseBean.addSuccess("操作成功");
                 HKOpenApi.downloadFaceAndFingerInfos(String.valueOf(user.getHkUserId()));
                 return responseBean;
             } else if (0 == type && 1 == faceNum && isA == false) {
-
                 HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getId(), user.getUserName(), user.getHkCardNo());
-
                 taFace.setFaceImg(faceImg);
                 taFaceMapper.updateByPrimaryKeySelective(taFace);
                 responseBean.addSuccess("操作成功");