Pārlūkot izejas kodu

中煤代码的提交

dongxin 1 gadu atpakaļ
vecāks
revīzija
9be02f0354

+ 20 - 6
tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quotation/zhongmei/crawler/component/ZmCrawlerRequestComponent.java

@@ -822,7 +822,6 @@ public class ZmCrawlerRequestComponent {
      * @return
      */
     public ZmCrawlerSubmitResponse submit(ZmCrawlerSubmitRequest submitRequest) {
-        System.out.println(JSON.toJSON(submitRequest));
         Mono<ZmCrawlerSubmitResponse> responseMono = requestComponent.postGbk(RequestUrl.SUBMIT.getRequestUrl(zmCrawlerProperties.getBaseUrl()),
                 Base64Tool.encode(JSONObject.toJSONString(submitRequest)), ZmCrawlerSubmitResponse.class,new HttpHeaders());
         ZmCrawlerSubmitResponse response = responseMono.block();
@@ -835,7 +834,10 @@ public class ZmCrawlerRequestComponent {
      * @return
      */
     public ZmCrawlerCheckPaymentResponse checkPayment(ZmCrawlerCheckPaymentRequest checkPaymentRequest) {
-        return request(RequestUrl.CHECK_PAYMENT, checkPaymentRequest, ZmCrawlerCheckPaymentResponse.class);
+        Mono<ZmCrawlerCheckPaymentResponse> responseMono = requestComponent.postGbk(RequestUrl.CHECK_PAYMENT.getRequestUrl(zmCrawlerProperties.getBaseUrl()),
+                Base64Tool.encode(JSONObject.toJSONString(checkPaymentRequest)), ZmCrawlerCheckPaymentResponse.class,new HttpHeaders());
+        ZmCrawlerCheckPaymentResponse response = responseMono.block();
+        return response;
     }
 
     /**
@@ -844,7 +846,10 @@ public class ZmCrawlerRequestComponent {
      * @return
      */
     public ZmCrawlerFindZfTaskResponse findZfTask(ZmCrawlerFindZfTaskRequest findZfTaskRequest) {
-        return request(RequestUrl.FIND_ZF_TASK, findZfTaskRequest, ZmCrawlerFindZfTaskResponse.class);
+        Mono<ZmCrawlerFindZfTaskResponse> responseMono = requestComponent.postGbk(RequestUrl.FIND_ZF_TASK.getRequestUrl(zmCrawlerProperties.getBaseUrl()),
+                Base64Tool.encode(JSONObject.toJSONString(findZfTaskRequest)), ZmCrawlerFindZfTaskResponse.class,new HttpHeaders());
+        ZmCrawlerFindZfTaskResponse response = responseMono.block();
+        return response;
     }
 
     /**
@@ -853,7 +858,10 @@ public class ZmCrawlerRequestComponent {
      * @return
      */
     public ZmCrawlerOrderApplyResponse orderApply(ZmCrawlerOrderApplyRequest orderApplyRequest) {
-        return request(RequestUrl.ORDER_APPLY, orderApplyRequest, ZmCrawlerOrderApplyResponse.class);
+        Mono<ZmCrawlerOrderApplyResponse> responseMono = requestComponent.postGbk(RequestUrl.ORDER_APPLY.getRequestUrl(zmCrawlerProperties.getBaseUrl()),
+                Base64Tool.encode(JSONObject.toJSONString(orderApplyRequest)), ZmCrawlerOrderApplyResponse.class,new HttpHeaders());
+        ZmCrawlerOrderApplyResponse response = responseMono.block();
+        return response;
     }
 
     /**
@@ -862,7 +870,10 @@ public class ZmCrawlerRequestComponent {
      * @return
      */
     public ZmCrawlerOrderUpdateResponse orderUpdate(ZmCrawlerOrderUpdateRequest orderApplyRequest) {
-        return request(RequestUrl.ORDER_UPDATE, orderApplyRequest, ZmCrawlerOrderUpdateResponse.class);
+        Mono<ZmCrawlerOrderUpdateResponse> responseMono = requestComponent.postGbk(RequestUrl.ORDER_UPDATE.getRequestUrl(zmCrawlerProperties.getBaseUrl()),
+                Base64Tool.encode(JSONObject.toJSONString(orderApplyRequest)), ZmCrawlerOrderUpdateResponse.class,new HttpHeaders());
+        ZmCrawlerOrderUpdateResponse response = responseMono.block();
+        return response;
     }
 
     /**
@@ -871,7 +882,10 @@ public class ZmCrawlerRequestComponent {
      * @return
      */
     public ZmCrawlerGetQrCodeResponse getQrCode(ZmCrawlerGetQrCodeRequest qrCodeRequest) {
-        return request(RequestUrl.ACHIEVE_QR_CODE, qrCodeRequest, ZmCrawlerGetQrCodeResponse.class );
+        Mono<ZmCrawlerGetQrCodeResponse> responseMono = requestComponent.postGbk(RequestUrl.ACHIEVE_QR_CODE.getRequestUrl(zmCrawlerProperties.getBaseUrl()),
+                Base64Tool.encode(JSONObject.toJSONString(qrCodeRequest)), ZmCrawlerGetQrCodeResponse.class,new HttpHeaders());
+        ZmCrawlerGetQrCodeResponse response = responseMono.block();
+        return response;
     }
 
     /**

+ 1 - 2
tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quotation/zhongmei/crawler/entity/Request/ZmCrawlerCheckPaymentRequest.java

@@ -25,8 +25,7 @@ public class ZmCrawlerCheckPaymentRequest extends BaseRequest {
         super.getHead().setTransCode(ZmCrawlerTransCode.CHECK_PAYMENT_PROCESS);
     }
 
-    public ZmCrawlerCheckPaymentRequest(String businessNo, BaseRequestHead head) {
+    public ZmCrawlerCheckPaymentRequest(String businessNo) {
         this.businessNo = businessNo;
-        this.setHead(head);
     }
 }

+ 2 - 1
tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quotation/zhongmei/crawler/service/Impl/ZhongMeiCrawlerRequestImpl.java

@@ -142,7 +142,8 @@ public class ZhongMeiCrawlerRequestImpl implements ZhongMeiCrawlerRequest {
         BaseRequestHead head = new BaseRequestHead(authorization, "2");
 
         //调用检查支付状态接口
-        ZmCrawlerCheckPaymentRequest checkPaymentRequest = new ZmCrawlerCheckPaymentRequest("businessNo", head);
+        ZmCrawlerCheckPaymentRequest checkPaymentRequest = new ZmCrawlerCheckPaymentRequest("businessNo");
+        checkPaymentRequest.setHead(head);
         ZmCrawlerCheckPaymentResponse checkPaymentResponse = zmCrawlerRequestComponent.checkPayment(checkPaymentRequest);
         //调用是否存在支付订单接口
         ZmCrawlerFindZfTaskRequest findZfTaskRequest = new ZmCrawlerFindZfTaskRequest(crawlerOrder.getProposalName(), zmCrawlerConfigureParameters.getComCode(), userCode);