版本升级

tran-service/src/main/java/com/diagbot/client/IcssServiceClient.java

@@ -1,12 +1,16 @@
 package com.diagbot.client;
 
+import java.util.List;
+
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import com.diagbot.client.hystrix.IcssServiceHystrix;
+import com.diagbot.dto.HisInquirysForDjDTO;
 import com.diagbot.dto.ReadInquiryDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.vo.HisInquirysForDjVO;
 import com.diagbot.vo.ReadInquiryVO;
 
 /**
@@ -19,5 +23,14 @@ public interface IcssServiceClient {
 	
 	@PostMapping("/inquiryInfo/readInquiry")
 	public RespDTO<ReadInquiryDTO> readInquiry(@RequestBody ReadInquiryVO readInquiryVO);
+	
+	/**
+     * 对接-历史病历列表
+     *
+     * @param hisInquirysForDjVO
+     * @return
+     */
+    @PostMapping("/inquiryInfo/hisInquirysForDj")
+    RespDTO<List<HisInquirysForDjDTO>> hisInquirysForDj(@RequestBody HisInquirysForDjVO hisInquirysForDjVO);
 
 }

tran-service/src/main/java/com/diagbot/client/InquiryInfoServiceClient.java

@@ -1,36 +0,0 @@
-package com.diagbot.client;
-
-import java.util.List;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import com.diagbot.client.hystrix.InquiryInfoServiceHystrix;
-import com.diagbot.dto.HisInquirysForDjDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.vo.HisInquirysForDjVO;
-
-
-/**
- * @Description: 调用问诊服务
- * @author: rengb
- * @time: 2019/3/19 9:52
- */
-@FeignClient(value = "icss-service", fallback = InquiryInfoServiceHystrix.class)
-public interface InquiryInfoServiceClient {
-
-	
-	/**
-     * 对接-历史病历列表
-     *
-     * @param hisInquirysForDjVO
-     * @return
-     */
-    @PostMapping("/inquiryInfo/hisInquirysForDj")
-    RespDTO<List<HisInquirysForDjDTO>> hisInquirysForDj(@RequestBody HisInquirysForDjVO hisInquirysForDjVO);
-
-}
-
-
-

tran-service/src/main/java/com/diagbot/client/UserServiceClient.java

@@ -1,12 +1,7 @@
 package com.diagbot.client;
 
 import com.diagbot.client.hystrix.UserServiceHystrix;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.User;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
 
 
 /**

tran-service/src/main/java/com/diagbot/client/hystrix/IcssServiceHystrix.java

@@ -1,12 +1,16 @@
 package com.diagbot.client.hystrix;
 
+import java.util.List;
+
 import javax.validation.Valid;
 
 import org.springframework.stereotype.Component;
 
 import com.diagbot.client.IcssServiceClient;
+import com.diagbot.dto.HisInquirysForDjDTO;
 import com.diagbot.dto.ReadInquiryDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.vo.HisInquirysForDjVO;
 import com.diagbot.vo.ReadInquiryVO;
 
 import lombok.extern.slf4j.Slf4j;
@@ -25,5 +29,11 @@ public class IcssServiceHystrix implements IcssServiceClient{
 		log.error("【hystrix】调用{}异常", "readInquiry");
         return null;
 	}
+	
+	@Override
+	public RespDTO<List<HisInquirysForDjDTO>> hisInquirysForDj(HisInquirysForDjVO hisInquirysForDjVO) {
+		log.error("【hystrix】调用{}异常", "hisInquirysForDj");
+		return null;
+	}
 
 }

tran-service/src/main/java/com/diagbot/client/hystrix/InquiryInfoServiceHystrix.java

@@ -1,33 +0,0 @@
-package com.diagbot.client.hystrix;
-
-import java.util.List;
-
-import org.springframework.stereotype.Component;
-
-import com.diagbot.client.InquiryInfoServiceClient;
-import com.diagbot.dto.HisInquirysForDjDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.vo.HisInquirysForDjVO;
-
-import lombok.extern.slf4j.Slf4j;
-
-
-/**
- * @Description: 调用问诊服务
- * @author: rengb
- * @time: 2019/3/19 9:52
- */
-@Component
-@Slf4j
-public class InquiryInfoServiceHystrix implements InquiryInfoServiceClient {
-
-	@Override
-	public RespDTO<List<HisInquirysForDjDTO>> hisInquirysForDj(HisInquirysForDjVO hisInquirysForDjVO) {
-		log.error("【hystrix】调用{}异常", "hisInquirysForDj");
-		return null;
-	}
-	
-	
-
-
-}

tran-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -6,7 +6,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.diagbot.client.IcssServiceClient;
-import com.diagbot.client.InquiryInfoServiceClient;
 import com.diagbot.dto.HisInquirysForDjDTO;
 import com.diagbot.dto.ReadInquiryDTO;
 import com.diagbot.dto.RespDTO;
@@ -23,8 +22,6 @@ public class InquiryInfoFacade {
 	
 	@Autowired
 	private IcssServiceClient icssServiceClient;
-	@Autowired
-	private InquiryInfoServiceClient inquiryInfoServiceClient;
 	
 	public RespDTO<ReadInquiryDTO> readInquiry(SaveInquiryVO saveInquiryVO) {
 		//return icssServiceClient.readInquiry(readInquiryVO);
@@ -32,7 +29,7 @@ public class InquiryInfoFacade {
 	}
 	
 	public Object hisInquirysForDj(HisInquirysForDjVO hisInquirysForDjVO){
-		RespDTO<List<HisInquirysForDjDTO>> list=inquiryInfoServiceClient.hisInquirysForDj(hisInquirysForDjVO);
+		RespDTO<List<HisInquirysForDjDTO>> list=icssServiceClient.hisInquirysForDj(hisInquirysForDjVO);
 		return list;
 	}
 }

tran-service/src/main/java/com/diagbot/web/InquiryInfoController.java

@@ -11,11 +11,9 @@ import com.diagbot.dto.ReadInquiryDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.InquiryInfoFacade;
 import com.diagbot.vo.HisInquirysForDjVO;
-import com.diagbot.vo.ReadInquiryVO;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import springfox.documentation.annotations.ApiIgnore;
 
 
 import javax.validation.Valid;