合并

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

@@ -642,7 +642,7 @@ public class HKOpenApi {
      * @param phoneNo 电话
      * @return
      */
-    public static String HKpersonPhone(Integer personId,Integer personNo,String personName,String phoneNo) {
+    public static String HKpersonPhone(Integer personId,Long personNo,String personName,String phoneNo) {
 
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_UPDATE_USER;
         Map<String, Object> map = new HashMap<String, Object>();

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

@@ -292,16 +292,13 @@ public class TaUserServiceImpl implements ITaUserService {
             response.addError("号码已占用");
             return response;
         }
-        String data=HKOpenApi.HKpersonPhone(user.getHkUserId(),user.getId(),user.getUserName(),phone);
-       try {
-             if (null == data) {
-            throw new RuntimeException("海康人脸推送失敗！");
-        }
-       }catch (Exception e){
-           e.printStackTrace();
-           log.error("海康修改电话失敗！ {}",e);
-           throw new RuntimeException("海康修改电话失敗！");
-       }
+        String data=HKOpenApi.HKpersonPhone(user.getHkUserId(),user.getHkPersonNo(),user.getUserName(),phone);
+        JSONObject jsonobject = JSONObject.parseObject(data);
+        int errorCode = jsonobject.getInteger("errorCode");
+        if (errorCode!=0){
+            response.addError("海康电话已存在,推送海康电话修改失败");
+            return response;
+        }
         if(null!=codes && codes.equals(code)){;
             TaUser taUser=new TaUser();
             taUser.setLoginName(phone);