httpclient调用结果处理方式变化

epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java

@@ -162,13 +162,16 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
         CheckPaUserFormDTO dto = new CheckPaUserFormDTO();
         dto.setPhone(formDTO.getPhone());
         dto.setSource(formDTO.getSource());
-        String url = ThirdApiConstant.THIRD_PAUSER_CHECKPAUSER;
-        Result<String> result = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(dto));
+        String data = HttpClientManager.getInstance().sendPostByJSON(ThirdApiConstant.THIRD_PAUSER_CHECKPAUSER, JSON.toJSONString(dto)).getData();
+        JSONObject toResult = JSON.parseObject(data);
+        Result result = ConvertUtils.mapToEntity(toResult, Result.class);
         if (!result.success()) {
             logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getPhone(), result.getCode(), result.getMsg()));
             throw new RenException(result.getCode());
         }
-        CustomerUserResultDTO resultDTO = JSONObject.parseObject(result.getData(), CustomerUserResultDTO.class);
+        Object RegisterResult = result.getData();
+        JSONObject jsonObject = JSON.parseObject(RegisterResult.toString());
+        CustomerUserResultDTO resultDTO = ConvertUtils.mapToEntity(jsonObject, CustomerUserResultDTO.class);
         //登陆
         if (formDTO.getIsLogon() && null == resultDTO.getPaUserResult()) {
             throw new RenException(EpmetErrorCode.PUBLIC_NOT_EXISTS.getCode());
@@ -204,13 +207,16 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
         CheckPaUserFormDTO dto = new CheckPaUserFormDTO();
         dto.setPhone(formDTO.getPhone());
         dto.setSource(formDTO.getSource());
-        String url = ThirdApiConstant.THIRD_PAUSER_CHECKPAUSER;
-        Result<String> result = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(dto));
+        String data = HttpClientManager.getInstance().sendPostByJSON(ThirdApiConstant.THIRD_PAUSER_CHECKPAUSER, JSON.toJSONString(dto)).getData();
+        JSONObject toResult = JSON.parseObject(data);
+        Result result = ConvertUtils.mapToEntity(toResult, Result.class);
         if (!result.success()) {
             logger.error(String.format("手机验证码登录异常,手机号[%s],code[%s],msg[%s]", formDTO.getPhone(), result.getCode(), result.getMsg()));
             throw new RenException(result.getCode());
         }
-        CustomerUserResultDTO resultDTO = JSONObject.parseObject(result.getData(), CustomerUserResultDTO.class);
+        Object RegisterResult = result.getData();
+        JSONObject jsonObject = JSON.parseObject(RegisterResult.toString());
+        CustomerUserResultDTO resultDTO = ConvertUtils.mapToEntity(jsonObject, CustomerUserResultDTO.class);
 
         //2.用户不存在时不允许登陆
         PaUserDTO userDTO = resultDTO.getPaUserResult();
@@ -247,8 +253,9 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
         visited.setLogonUserId(tokenDTO.getUserId());
         visited.setPhone(formDTO.getPhone());
         visited.setSource(formDTO.getSource());
-        String saveUserVisitedUrl = ThirdApiConstant.THIRD_PAUSERVISITED_SAVEUSERVISITED;
-        Result<String> visitedResult = HttpClientManager.getInstance().sendPostByJSON(saveUserVisitedUrl, JSON.toJSONString(visited));
+        String data1 = HttpClientManager.getInstance().sendPostByJSON(ThirdApiConstant.THIRD_PAUSERVISITED_SAVEUSERVISITED, JSON.toJSONString(visited)).getData();
+        JSONObject json = JSON.parseObject(data1);
+        Result visitedResult = ConvertUtils.mapToEntity(json, Result.class);
         if (!visitedResult.success()) {
             logger.error(PublicUserLoginConstant.SAVE_VISITED_EXCEPTION);
         }

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java

@@ -406,11 +406,16 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
     public void init(CustomerInitFormDTO formDTO) {
         //1.调用epmet-third服务，根据客户Id查询第三方服务中的客户、组织、管理员等信息
         String url = "https://epmet-cloud.elinkservice.cn/api/third/pacustomer/getcustomeragencyuser/" + formDTO.getCustomerId();
-        Result<String> thirdResult = HttpClientManager.getInstance().sendPostByJSON(url, null);
+        String data = HttpClientManager.getInstance().sendPostByJSON(url, null).getData();
+        JSONObject toResult = JSON.parseObject(data);
+        Result thirdResult = ConvertUtils.mapToEntity(toResult, Result.class);
         if (!thirdResult.success()) {
             throw new RenException(thirdResult.getCode(), thirdResult.getInternalMsg());
         }
-        InitCustomerResultDTO initCustomer = JSONObject.parseObject(thirdResult.getData(), InitCustomerResultDTO.class);
+        Object RegisterResult = thirdResult.getData();
+        JSONObject jsonObject = JSON.parseObject(RegisterResult.toString());
+        InitCustomerResultDTO initCustomer = ConvertUtils.mapToEntity(jsonObject, InitCustomerResultDTO.class);
+
         PaCustomerDTO paCustomer = initCustomer.getPaCustomer();
         PaCustomerAgencyDTO paAgency = initCustomer.getPaAgency();
         PaUserDTO paUser = initCustomer.getPaUser();
@@ -491,11 +496,14 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
 
         //6.更新第三方数据库中客户数据状态为已初始化
         String customerUrl = "https://epmet-cloud.elinkservice.cn/api/third/pacustomer/updatecustomer/" + formDTO.getCustomerId();
-        Result<String> customerResult = HttpClientManager.getInstance().sendPostByJSON(customerUrl, null);
+        String data1 = HttpClientManager.getInstance().sendPostByJSON(customerUrl, null).getData();
+        JSONObject json = JSON.parseObject(data1);
+        Result customerResult = ConvertUtils.mapToEntity(json, Result.class);
         if (!customerResult.success()) {
             throw new RenException(customerResult.getCode(), customerResult.getInternalMsg());
         }
 
+
     }
 
 }