Browse Source

云燕2次提供最新代码

15810770710@163.com 4 years ago
parent
commit
d65f4dd2db

+ 23 - 3
src/main/java/info/aspirecn/iov/yysj/product/check/common/ZuulHelper.java

@@ -42,7 +42,7 @@ public class ZuulHelper {
 	@Autowired
 	@Autowired
 	private ZuulHelper helper;
 	private ZuulHelper helper;
 	public Boolean hasProcessFlag(RequestContext requestContext) {
 	public Boolean hasProcessFlag(RequestContext requestContext) {
-        
+
         Boolean ret = (Boolean)requestContext.get("process");
         Boolean ret = (Boolean)requestContext.get("process");
         if( ret != null )
         if( ret != null )
         {
         {
@@ -53,7 +53,7 @@ public class ZuulHelper {
             return Boolean.FALSE;
             return Boolean.FALSE;
         }
         }
     }
     }
-	
+
 	public void responseHandle(BillItemResult responseObject, RequestContext requestContext) throws JsonProcessingException{
 	public void responseHandle(BillItemResult responseObject, RequestContext requestContext) throws JsonProcessingException{
 		String json = mapper.writeValueAsString(responseObject);
 		String json = mapper.writeValueAsString(responseObject);
 		 requestContext.set("process", Boolean.TRUE);
 		 requestContext.set("process", Boolean.TRUE);
@@ -106,6 +106,7 @@ public class ZuulHelper {
 				return ;
 				return ;
 			}
 			}
 			Map<String, String> productMap = property.getProductMap();
 			Map<String, String> productMap = property.getProductMap();
+			// todo 在这个地方加一个product简称,再进行业务判断
 			if (productMap.get("clxszyz").equals(productId)) {//行驶证
 			if (productMap.get("clxszyz").equals(productId)) {//行驶证
 
 
 				if ("128".equals(responseObject.getResultCode())||"1000".equals(responseObject.getResultCode())) {
 				if ("128".equals(responseObject.getResultCode())||"1000".equals(responseObject.getResultCode())) {
@@ -238,7 +239,26 @@ public class ZuulHelper {
 					errorResponse.setCode(Constants.ErrorCode.INCONSISTENT_DETAIL.getErrorCode());
 					errorResponse.setCode(Constants.ErrorCode.INCONSISTENT_DETAIL.getErrorCode());
 					errorResponse.setResultList(inconsistentList);
 					errorResponse.setResultList(inconsistentList);
 				}
 				}
-			}else {
+			} else if (productMap.get("zxhdwyz").equals(productId)) {
+				if (responseObject.getResultCode().equals("1")) {
+					// 一致,返回结果
+					result = Constants.consistent_code;
+					billItemResult.setResultMessage(resultBody);
+				} else if (responseObject.getResultCode().equals("2")) {
+					// 不一致
+					result = Constants.inconsistent_code;
+				} else if (responseObject.getResultCode().equals("4")) {
+					// 查无
+					// 查询错误
+					errorResponse.setCode(Constants.ErrorCode.DATA_NULL.getErrorCode());
+					billItemResult.setResult(Constants.inconsistent_code);
+				} else {
+					// 查询错误
+					errorResponse.setCode(Constants.ErrorCode.Exception.getErrorCode());
+					billItemResult.setResult(Constants.inconsistent_code);
+				}
+			}
+			else {
 				if (!"1".equals(responseObject.getResultCode())) {
 				if (!"1".equals(responseObject.getResultCode())) {
 					/*if("3".equals(responseObject.getResultCode())){
 					/*if("3".equals(responseObject.getResultCode())){
 						errorResponse.setCode(Constants.ErrorCode.Exception.getErrorCode());
 						errorResponse.setCode(Constants.ErrorCode.Exception.getErrorCode());

+ 2 - 2
src/main/resources/config/cloud-yysj-product-check.yaml

@@ -2,7 +2,7 @@
   connetTimeOut: 3000
   connetTimeOut: 3000
   readTimeOut: 4000
   readTimeOut: 4000
   gateWayUrl: http://iov-sjjh-gateway.iov-sjjh:8080/gateway-ct/route/route.do
   gateWayUrl: http://iov-sjjh-gateway.iov-sjjh:8080/gateway-ct/route/route.do
-  productMap: {clxszyz: 30000074,ryjszyz: 30000075,rycyzgyz: 30000078,clyyyz: 30000079,qyyyxkyz_jyxkzh: 30000080,qyyyxkyz_tyshdm: 30000082,clrwyz: 30000081,tyrsfyz_person: 30000077,tyrsfyz_enterprise: 30000082,zhdwyz: 30000085,xhdwyz: 30000085,czyz: 30000086,sfzyz: 30000077}
+  productMap: {clxszyz: 30000074,ryjszyz: 30000075,rycyzgyz: 30000078,clyyyz: 30000079,qyyyxkyz_jyxkzh: 30000080,qyyyxkyz_tyshdm: 30000082,clrwyz: 30000081,tyrsfyz_person: 30000077,tyrsfyz_enterprise: 30000082,zhdwyz: 30000085,xhdwyz: 30000085,czyz: 30000086,sfzyz: 30000077,zxhdwyz: 300000123}
   products: {clxszyz: 30000074,ryjszyz: 30000075,qyyyxkyz_jyxkzh: 30000080,qyyyxkyz_tyshdm: 30000082}
   products: {clxszyz: 30000074,ryjszyz: 30000075,qyyyxkyz_jyxkzh: 30000080,qyyyxkyz_tyshdm: 30000082}
   errorCode: 501,502,503,504,505,506,507,510,530,531,532,535,534,536,511,-1003,533,537,538,3
   errorCode: 501,502,503,504,505,506,507,510,530,531,532,535,534,536,511,-1003,533,537,538,3
 spring:
 spring:
@@ -61,4 +61,4 @@ cloud-yysj-servicenode-paramtransfer:
 iov-sjjh-gateway:
 iov-sjjh-gateway:
   ribbon:
   ribbon:
     ConnetTimeout: 250
     ConnetTimeout: 250
-    ReadTimeout: 3000
+    ReadTimeout: 3000