Browse Source

fix å‚ä¹习 ä¿处理dubbo直连

daiyihua 1 year ago
parent
commit
2f16cb48ea
20 changed files with 36 additions and 21 deletions
  1. 2 1
      ywt-platform-outpatient-rpc/src/main/java/com/ywt/outpatient/rpc/provider/CheckupBookingProvider.java
  2. 2 1
      ywt-platform-outpatient-rpc/src/main/java/com/ywt/outpatient/rpc/provider/MedEquipProvider.java
  3. 2 1
      ywt-platform-outpatient-sdk/src/main/java/com/ywt/outpatient/service/rpc/ConsultingService.java
  4. 1 1
      ywt-platform-outpatient-sdk/src/main/java/com/ywt/outpatient/service/rpc/DataService.java
  5. 3 1
      ywt-platform-outpatient-sdk/src/main/java/com/ywt/outpatient/service/rpc/NfyyServiceProvider.java
  6. 2 1
      ywt-platform-outpatient-sdk/src/main/java/com/ywt/outpatient/service/rpc/OfflineConsultationService.java
  7. 2 1
      ywt-platform-outpatient-sdk/src/main/java/com/ywt/outpatient/service/rpc/OrderService.java
  8. 2 1
      ywt-platform-outpatient-sdk/src/main/java/com/ywt/outpatient/service/rpc/PushServiceProvider.java
  9. 2 1
      ywt-platform-outpatient-sdk/src/main/java/com/ywt/outpatient/service/rpc/common/NfyyProvider.java
  10. 2 1
      ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/CheckupBookingController.java
  11. 2 1
      ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/MedEquipController.java
  12. 2 1
      ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/MedicalRecordController.java
  13. 1 1
      ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/OutpatientController.java
  14. 1 1
      ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/RegisterController.java
  15. 3 2
      ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/YiDaController.java
  16. 1 1
      ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/patient/RegisterController.java
  17. 1 1
      ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/taihe/DHOutpatientController.java
  18. 1 1
      ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/taihe/MainRegisterController.java
  19. 2 1
      ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/taihe/NfyyAddRegisterController.java
  20. 2 1
      ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/taihe/NfyyRegisterController.java

+ 2 - 1
ywt-platform-outpatient-rpc/src/main/java/com/ywt/outpatient/rpc/provider/CheckupBookingProvider.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.rpc.provider;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.gapi.ResultCode;
 import com.ywt.gapi.checkup_booking.*;
 import com.ywt.outpatient.core.BaseResponse;
@@ -18,7 +19,7 @@ public class CheckupBookingProvider extends DubboCheckupBookingRpcServiceTriple.
     @Autowired
     private CheckupBookingService checkupBookingService;
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private com.ywt.gapi.checkup_booking.CheckupBookingService bookingServiceBlockingStub;
 
     @Override

+ 2 - 1
ywt-platform-outpatient-rpc/src/main/java/com/ywt/outpatient/rpc/provider/MedEquipProvider.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.rpc.provider;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.constant.YwtCommonRespCode;
 import com.ywt.biz.common.enums.PaymentStatusEnum;
 import com.ywt.biz.common.enums.RefundStatusEnum;
@@ -53,7 +54,7 @@ public class MedEquipProvider extends DubboMedEquipServiceTriple.MedEquipService
     ChecklistOrdersDetailRepository checklistOrdersDetailRepository;
     @DubboReference
     OrderCenterService orderCenterServiceBlockingStub;
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     LepuService lepuServiceBlockingStub;
     @Autowired
     SqlHelper sqlHelper;

+ 2 - 1
ywt-platform-outpatient-sdk/src/main/java/com/ywt/outpatient/service/rpc/ConsultingService.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.service.rpc;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.enums.*;
 import com.ywt.biz.common.util.Checker;
 import com.ywt.biz.common.util.DateUtil;
@@ -77,7 +78,7 @@ public class ConsultingService {
     @Autowired
     private SmsProvider smsProvider;
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.IM_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private IMService imServiceBlockingStub;
 
     @Autowired

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

@@ -73,7 +73,7 @@ public class DataService {
     private LaboratoryDetailRepository laboratoryDetailRepository;
 
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private NfyyService nfyyServiceBlockingStub;
 
     @Autowired

+ 3 - 1
ywt-platform-outpatient-sdk/src/main/java/com/ywt/outpatient/service/rpc/NfyyServiceProvider.java

@@ -1,7 +1,9 @@
 package com.ywt.outpatient.service.rpc;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.gapi.nfyy.*;
 import com.ywt.outpatient.service.rpc.common.ServiceResult;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +16,7 @@ import java.util.Map;
 public class NfyyServiceProvider {
     private static Logger logger = LoggerFactory.getLogger(NfyyService.class);
 
-    @Autowired
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private NfyyService nfyyServiceBlockingStub;
 
     public void getDoctorList() {

+ 2 - 1
ywt-platform-outpatient-sdk/src/main/java/com/ywt/outpatient/service/rpc/OfflineConsultationService.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.service.rpc;
 
+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;
@@ -61,7 +62,7 @@ public class OfflineConsultationService {
     @Autowired
     private SmsProvider smsProvider;
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.IM_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private IMService imServiceBlockingStub;
 
     @Autowired

+ 2 - 1
ywt-platform-outpatient-sdk/src/main/java/com/ywt/outpatient/service/rpc/OrderService.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.service.rpc;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.constant.YwtCommonRespCode;
 import com.ywt.biz.common.enums.*;
 import com.ywt.biz.common.exception.YwtCommonException;
@@ -234,7 +235,7 @@ public class OrderService {
     @DubboReference
     private WeChatMessageService weChatMessageServiceBlockingStub;
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.IM_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private IMService imServiceBlockingStub;
 
     @Autowired

+ 2 - 1
ywt-platform-outpatient-sdk/src/main/java/com/ywt/outpatient/service/rpc/PushServiceProvider.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.service.rpc;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.enums.OrderTypeEnum;
 import com.ywt.biz.common.util.serializers.JsonSerializer;
 import com.ywt.gapi.im.IMService;
@@ -12,7 +13,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class PushServiceProvider {
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.IM_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private IMService imServiceBlockingStub;
 
     /**

+ 2 - 1
ywt-platform-outpatient-sdk/src/main/java/com/ywt/outpatient/service/rpc/common/NfyyProvider.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.service.rpc.common;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.util.Checker;
 import com.ywt.gapi.ResultCode;
 import com.ywt.gapi.nfyy.*;
@@ -17,7 +18,7 @@ import java.util.List;
 public class NfyyProvider {
     private static Logger logger = LoggerFactory.getLogger(NfyyProvider.class);
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private NfyyService nfyyServiceBlockingStub;
 
     public GetDoctorListNoGroupResponse getDoctorListNoGroup(String doctorName, String deptCode) {

+ 2 - 1
ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/CheckupBookingController.java

@@ -1,6 +1,7 @@
 package com.ywt.outpatient.controllers;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.exception.YwtCommonException;
 import com.ywt.biz.common.util.Checker;
 import com.ywt.biz.common.util.DateUtil;
@@ -50,7 +51,7 @@ public class CheckupBookingController {
 
     @Autowired
     private UserSrv userSrv;
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private CheckupBookingService bookingServiceBlockingStub;
     @Autowired
     private RedisTemplate<String, Object> redisTemplate;

+ 2 - 1
ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/MedEquipController.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.exception.YwtCommonException;
 import com.ywt.biz.common.util.Checker;
@@ -45,7 +46,7 @@ public class MedEquipController {
 
     @DubboReference
     MedEquipService medEquipServiceBlockingStub;
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     LepuService lepuServiceBlockingStub;
     @DubboReference
     UserService userServiceBlockingStub;

+ 2 - 1
ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/MedicalRecordController.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.controllers;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.enums.OrderTypeEnum;
 import com.ywt.biz.common.enums.SexEnum;
 import com.ywt.biz.common.util.Checker;
@@ -72,7 +73,7 @@ public class MedicalRecordController {
     @DubboReference
     private MessageService messageServiceBlockingStub;
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.IM_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private IMService imServiceBlockingStub;
 
     @DubboReference

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

@@ -84,7 +84,7 @@ public class OutpatientController {
     @DubboReference
     private TaiheOutpatientService taiheOutpatientServiceBlockingStub;
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private SFService sfServiceBlockingStub;
 
     @DubboReference

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

@@ -61,7 +61,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 NfyyService nfyyServiceBlockingStub;
 
     @DubboReference

+ 3 - 2
ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/YiDaController.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.controllers;
 
+import com.ywt.biz.common.constant.GlobalConstants;
 import com.ywt.biz.common.enums.SexEnum;
 import com.ywt.biz.common.util.StringHelper;
 import com.ywt.gapi.Result;
@@ -28,13 +29,13 @@ import java.util.stream.Collectors;
 public class YiDaController {
     private static Logger logger = LoggerFactory.getLogger(YiDaController.class);
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private YiDaService yiDaServiceBlockingStub;
 
     @DubboReference
     private SystemService systemServiceBlockingStub;
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private NfyyService nfyyServiceBlockingStub;
 
     @RequestMapping({"/recommeTaiheRegisterControllernd"})

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

@@ -59,7 +59,7 @@ public class RegisterController {
     private DoctorService doctorServiceBlockingStub;
 
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private NfyyService nfyyServiceBlockingStub;
 
     @DubboReference

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

@@ -86,7 +86,7 @@ public class DHOutpatientController {
     @DubboReference
     private DrugService drugServiceBlockingStub;
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.WX_INS_PAY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private WxInsPayService wxInsPayServiceBlockingStub;
 
     @Autowired

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

@@ -58,7 +58,7 @@ public class MainRegisterController {
     @DubboReference
     private DoctorService doctorServiceBlockingStub;
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private NfyyService nfyyServiceBlockingStub;
 
     @DubboReference

+ 2 - 1
ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/taihe/NfyyAddRegisterController.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.controllers.taihe;
 
+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;
@@ -37,7 +38,7 @@ import java.util.*;
 public class NfyyAddRegisterController {
     private static Logger logger = LoggerFactory.getLogger(NfyyAddRegisterController.class);
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private NfyyService nfyyServiceBlockingStub;
 
     @DubboReference

+ 2 - 1
ywt-platform-outpatient-web/src/main/java/com/ywt/outpatient/controllers/taihe/NfyyRegisterController.java

@@ -1,5 +1,6 @@
 package com.ywt.outpatient.controllers.taihe;
 
+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;
@@ -41,7 +42,7 @@ import java.util.*;
 public class NfyyRegisterController {
     private static Logger logger = LoggerFactory.getLogger(NfyyRegisterController.class);
 
-    @DubboReference
+    @DubboReference(url = GlobalConstants.CENTRAL_CONTROL_SERVICE_NFYY_SERVICE_DUBBO_REFERENCE_URL, protocol = GlobalConstants.DUBBO_REFERENCE_PROTOCOL)
     private NfyyService nfyyServiceBlockingStub;
 
     @DubboReference