Parcourir la source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/sagacloud/route/Route.java
Jxing il y a 6 ans
Parent
commit
29332b188e

+ 15 - 2
src/main/java/com/sagacloud/route/Route.java

@@ -4,6 +4,8 @@ import com.github.rjeschke.txtmark.Processor;
 import com.sagacloud.Exceptions.InvalidPostException;
 import com.sagacloud.route.processors.GetInsuranceNoListProcessor;
 import com.sagacloud.route.processors.handleWarrantyFromVenderProcessor;
+import com.sagacloud.route.processors.GetPropByPjProcessor;
+import com.sagacloud.utils.Const;
 import com.sagacloud.utils.VendersUtil;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
@@ -47,7 +49,7 @@ public class Route extends RouteBuilder {
                 .route()
                 .process(new GetInsuranceNoListProcessor())
                 .to(String.join("", InitEnvRoute.venders, "/insurance/contract/query"))
-                .process(new handleWarrantyFromVenderProcessor())
+                .process(new GetInsuranceNoListProcessor())
                 .to(String.join("", InitEnvRoute.dataPlatform, "/property/relation_query"))
                 .process(new GetInsuranceNoListProcessor());
         // 获取所有保单列表
@@ -69,7 +71,18 @@ public class Route extends RouteBuilder {
                 .route()
                 .process();
 
-//        from("direct:getPropertiesByPj")
+        //body位JSONObject,含有projectId字段
+        from("direct:getPropertiesByPj")
+                .process(new GetPropByPjProcessor())
+                .to(Const.dataPlatform+"/property/relation_query")
+                .process(exchange -> {
+                    System.out.println(exchange.getIn().getBody(String.class));
+                });
+        rest("/test").post()
+                .consumes(MediaType.APPLICATION_JSON)
+                .produces(MediaType.APPLICATION_JSON)
+                .route()
+                .to("direct:getPropertiesByPj");
 
     }
 

+ 26 - 0
src/main/java/com/sagacloud/route/processors/GetPropByPjProcessor.java

@@ -0,0 +1,26 @@
+package com.sagacloud.route.processors;
+
+import com.alibaba.fastjson.JSONObject;
+import com.sagacloud.cache.ProPasCache;
+import com.sagacloud.route.InitEnvRoute;
+import com.sagacloud.utils.Const;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+
+/**
+ * Created by Xiaoyu on 2018/7/12
+ */
+public class GetPropByPjProcessor implements Processor {
+    @Override
+    public void process(Exchange exchange) throws Exception {
+        String jsonStr = exchange.getIn().getBody(String.class);
+        JSONObject json = JSONObject.parseObject(jsonStr);
+        String projectId = json.getString(Const.HEADER_PROJECT);
+        String secret = ProPasCache.getPjSecret(projectId);
+
+        exchange.getIn().setBody("{\"criteria\":{\"family\":[]}}");
+        exchange.getIn().setHeader(Exchange.HTTP_URI, Const.dataPlatform+"/property/relation_query?method=POST");
+        exchange.getIn().setHeader(Exchange.HTTP_QUERY,Const.HEADER_PROJECT + "=" + projectId + "&"+ Const.HEADER_SECRET+ "="+ secret);
+
+    }
+}

+ 2 - 0
src/main/java/com/sagacloud/utils/Const.java

@@ -5,6 +5,8 @@ package com.sagacloud.utils;
  * 数据平台信息点
  */
 public class Const {
+    public static String dataPlatform = PropUtil.getProperty("dataPlatform.baseUrl");
+    public static String venders = PropUtil.getProperty("venders.baseUrl");
     public static final String HEADER_PROJECT = "projectId";
     public static final String HEADER_SECRET = "secret";
     public static final String MANU_ID = "DPManufacturerID";//自定义生产商id