fix 修改å接口

ywt-platform-outpatient-batch/pom.xml

@@ -74,8 +74,10 @@
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
         </dependency>
-
-
+        <dependency>
+            <groupId>com.ywt</groupId>
+            <artifactId>ywt-biz-common</artifactId>
+        </dependency>
     </dependencies>
 
     <profiles>

ywt-platform-outpatient-batch/src/main/java/com/ywt/outpatient/batch/jobhandler/OutpatientJob.java

@@ -1,6 +1,7 @@
 package com.ywt.outpatient.batch.jobhandler;
 
 import com.xxl.job.core.handler.annotation.XxlJob;
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.util.Checker;
 import com.ywt.biz.common.util.DateUtil;
 import com.ywt.biz.common.util.serializers.JsonSerializer;
@@ -48,7 +49,7 @@ public class OutpatientJob {
     @DubboReference
     MedEquipService medEquipServiceBlockingStub;
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private TaiheService taiheServiceBlockingStub;
 
     @Autowired
@@ -102,8 +103,15 @@ public class OutpatientJob {
         } catch (Exception e) {
             logger.error("invoiceNotifyReturnEquipJobHandler.execute(): {}", e.getMessage(), e);
         }
+    }
 
-        logger.info("In invoiceNotifyReturnEquipJobHandler -- two - executing its JOB at " + new Date());
+    /**
+     * 每5秒钟执行一次
+     * 推送最近30分钟失败的订单 体检订单
+     */
+    @XxlJob("checkUpOrderPushFailureJobHandler")
+    public void checkUpOrderPushFailureJobHandle() throws Exception {
+        logger.info("In CheckUpOrderPushFailureJob - executing its JOB at " + new Date());
         try {
             // 推送体检缴费订单信息给太和（推送失败的订单）
             List<CheckUpOrder> checkUpOrderList = getPushFilureList();
@@ -134,10 +142,11 @@ public class OutpatientJob {
                 });
             }
         } catch (Exception e) {
-            logger.error("invoiceNotifyReturnEquipJobHandler.execute(): {}", e.getMessage(), e);
+            logger.error("CheckUpOrderPushFailureJob.execute(): {}", e.getMessage(), e);
         }
     }
 
+
     /**
      * 每小时执行一次
      * 0 0 1 * * ?

ywt-platform-outpatient-batch/src/main/java/com/ywt/outpatient/batch/service/TaiheServiceSrv.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.batch.service;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.gapi.ResultCode;
 import com.ywt.gapi.third.taihe.GetScheduleListRequest;
 import com.ywt.gapi.third.taihe.GetScheduleListResponse;
@@ -23,7 +24,7 @@ public class TaiheServiceSrv {
 
     private final Logger logger = LoggerFactory.getLogger(TaiheServiceSrv.class);
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private TaiheService taiheServiceBlockingStub;
 
     /**

ywt-platform-outpatient-batch/src/main/resources/application.yml

@@ -65,7 +65,3 @@ xxl:
       logretentiondays: 30
     accessToken: default_token
 
-
-
-
-

ywt-platform-outpatient-sdk/src/main/java/com/ywt/outpatient/service/batch/TaiheServiceSrv.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.service.batch;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.gapi.ResultCode;
 import com.ywt.gapi.third.taihe.GetScheduleListRequest;
 import com.ywt.gapi.third.taihe.GetScheduleListResponse;
@@ -24,7 +25,7 @@ public class TaiheServiceSrv {
 
     private final Logger logger = LoggerFactory.getLogger(TaiheServiceSrv.class);
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private TaiheService taiheServiceBlockingStub;
 
     /**

ywt-platform-outpatient-sdk/src/main/java/com/ywt/outpatient/service/common/TaiheProvider.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.service.common;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.util.Checker;
 import com.ywt.biz.common.util.DateUtil;
 import com.ywt.gapi.ResultCode;
@@ -17,7 +18,7 @@ import java.util.*;
 public class TaiheProvider {
     private static Logger logger = LoggerFactory.getLogger(TaiheProvider.class);
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private TaiheService taiheServiceBlockingStub;
 
     /**

ywt-platform-outpatient-sdk/src/main/java/com/ywt/outpatient/service/rpc/DataService.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.service.rpc;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.util.Checker;
 import com.ywt.biz.common.util.DateUtil;
 import com.ywt.biz.common.util.StringHelper;
@@ -84,7 +85,7 @@ public class DataService {
     @Autowired
     private SqlHelper sqlHelper;
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private TaiheService taiheServiceBlockingStub;
 
     @Autowired

ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/OutpatientController.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.controllers;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.constant.YwtCommonRespCode;
 import com.ywt.biz.common.enums.SexEnum;
 import com.ywt.biz.common.exception.YwtCommonException;
@@ -77,7 +78,7 @@ public class OutpatientController {
     @DubboReference
     private SystemService systemServiceBlockingStub;
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private TaiheService taiheServiceBlockingStub;
 
     @DubboReference

ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/RegisterController.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.controllers;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.enums.PaymentChannelEnum;
 import com.ywt.biz.common.enums.TerminalEnum;
 import com.ywt.biz.common.util.Checker;
@@ -84,7 +85,7 @@ public class RegisterController {
     @DubboReference
     private TaiheOutpatientService taiheOutpatientServiceBlockingStub;
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private TaiheService taiheServiceBlockingStub;
 
     @DubboReference

ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/baiyun/NfyyByfyCheckUpOrderController.java

@@ -1,6 +1,7 @@
 package com.ywt.outpatient.controllers.baiyun;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.util.Checker;
 import com.ywt.biz.common.util.HttpUtil;
 import com.ywt.biz.common.util.serializers.JsonSerializer;
@@ -38,7 +39,7 @@ import java.util.Map;
 public class NfyyByfyCheckUpOrderController {
     private static Logger logger = LoggerFactory.getLogger(NfyyByfyCheckUpOrderController.class);
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private TaiheService taiheServiceBlockingStub;
 
     @Autowired

ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/baiyun/NfyyByfyRegisterController.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.controllers.baiyun;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.constant.YwtCommonRespCode;
 import com.ywt.biz.common.exception.YwtCommonException;
 import com.ywt.biz.common.util.Checker;
@@ -47,7 +48,7 @@ public class NfyyByfyRegisterController {
     private static Logger logger = LoggerFactory.getLogger(NfyyByfyRegisterController.class);
 
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private TaiheService taiheServiceBlockingStub;
 
     @Autowired

ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/patient/RegisterController.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.controllers.patient;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.util.Checker;
 import com.ywt.biz.common.util.DateUtil;
 import com.ywt.gapi.Result;
@@ -39,7 +40,7 @@ import java.util.*;
 public class RegisterController {
     private static Logger logger = LoggerFactory.getLogger(RegisterController.class);
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private TaiheService taiheServiceBlockingStub;
 
     @DubboReference

ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/patient/TaiheRegisterController.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.controllers.patient;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.enums.PaymentChannelEnum;
 import com.ywt.biz.common.enums.TerminalEnum;
 import com.ywt.biz.common.util.Checker;
@@ -39,7 +40,7 @@ import java.util.*;
 public class TaiheRegisterController {
     private static Logger logger = LoggerFactory.getLogger(TaiheRegisterController.class);
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private TaiheService taiheServiceBlockingStub;
 
     @DubboReference

ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/taihe/CheckUpOrderController.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.controllers.taihe;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.util.Checker;
 import com.ywt.gapi.ResultCode;
 import com.ywt.gapi.order.CreateCheckUpOrderRequest;
@@ -36,7 +37,7 @@ import java.util.Map;
 @RequestMapping(value = {"/taihe/checkUp"},method = RequestMethod.POST)
 public class CheckUpOrderController {
     private static Logger logger = LoggerFactory.getLogger(CheckUpOrderController.class);
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private TaiheService taiheServiceBlockingStub;
 
     @DubboReference

ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/taihe/DHInspectionController.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.controllers.taihe;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.util.Checker;
 import com.ywt.biz.common.util.DateUtil;
 import com.ywt.biz.common.util.StringHelper;
@@ -44,7 +45,7 @@ import java.util.*;
 public class DHInspectionController {
     private final Logger logger = LoggerFactory.getLogger(getClass().getName());
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private TaiheService taiheServiceBlockingStub;
     @DubboReference
     private TaiheOutpatientService taiheOutpatientServiceBlockingStub;

ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/taihe/DHOutpatientController.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.controllers.taihe;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.constant.YwtCommonRespCode;
 import com.ywt.biz.common.enums.OrderTypeEnum;
 import com.ywt.biz.common.enums.PaymentStatusEnum;
@@ -61,7 +62,7 @@ import java.util.stream.Collectors;
 public class DHOutpatientController {
     private final Logger logger = LoggerFactory.getLogger(getClass().getName());
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private TaiheService taiheServiceBlockingStub;
 
     @DubboReference

ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/taihe/MainRegisterController.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.controllers.taihe;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.util.Checker;
 import com.ywt.biz.common.util.DateUtil;
 import com.ywt.gapi.Result;
@@ -39,7 +40,7 @@ import java.util.*;
 public class MainRegisterController {
     private static Logger logger = LoggerFactory.getLogger(MainRegisterController.class);
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private TaiheService taiheServiceBlockingStub;
 
     @DubboReference

ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/taihe/MedicalRecordController.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.controllers.taihe;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.enums.SexEnum;
 import com.ywt.biz.common.util.Checker;
 import com.ywt.biz.common.util.DateUtil;
@@ -34,7 +35,7 @@ public class MedicalRecordController {
     @DubboReference
     private UserService userServiceBlockingStub;
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private TaiheService taiheServiceBlockingStub;
 
     @Autowired

ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/taihe/OutpatientController.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.controllers.taihe;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.enums.SexEnum;
 import com.ywt.biz.common.util.DateUtil;
 import com.ywt.biz.common.util.StringHelper;
@@ -37,7 +38,7 @@ public class OutpatientController {
     @DubboReference
     private OrderService orderServiceBlockingStub;
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private TaiheService taiheServiceBlockingStub;
 
     @DubboReference

ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/taihe/RegisterController.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.controllers.taihe;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.constant.YwtCommonRespCode;
 import com.ywt.biz.common.enums.PaymentChannelEnum;
 import com.ywt.biz.common.enums.PaymentStatusEnum;
@@ -73,7 +74,7 @@ import java.util.stream.IntStream;
 public class RegisterController {
     private static Logger logger = LoggerFactory.getLogger(RegisterController.class);
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private TaiheService taiheServiceBlockingStub;
 
     @DubboReference