FanXiaoyu 6 năm trước cách đây
mục cha
commit
675eae2f3e

+ 6 - 0
src/main/java/com/sagacloud/pojos/venderDetail/AllVender.java

@@ -1,14 +1,20 @@
 package com.sagacloud.pojos.venderDetail;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 import java.util.List;
 
 /**
  * Created by Xiaoyu on 2018/7/13
  */
 public class AllVender {
+    @JSONField(name = "manufacturer")
     private List<Manu> manuList;
+    @JSONField(name = "maintainance")
     private List<Maintn> maintnList;
+    @JSONField(name = "insurance")
     private List<Insure> insureList;
+    @JSONField(name = "supplier")
     private List<Supp> suppList;
 
     public List<Manu> getManuList() {

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

@@ -142,12 +142,13 @@ public class Route extends ExceptionHandlerBaseRoute {
                 .consumes(MediaType.APPLICATION_JSON)
                 .produces(MediaType.APPLICATION_JSON)
                 .route()
-                .to("direct:getPropertiesByPj");
+                .to("direct:buildVenderMap");
 
         from("direct:buildVenderMap")
                 .process(exchange -> {
                     Object temp = exchange.getIn().getBody();
                     exchange.setProperty("tempBody",temp);
+                    exchange.getIn().setHeader(Exchange.HTTP_URI, Const.venders+"/auxiliary/vender/query_detail?method=POST");
                 })
                 .to(Const.venders+"/auxiliary/vender/query_detail")
                 .process(new VenderMapProcessor())

+ 1 - 1
src/main/java/com/sagacloud/route/processors/VenderMapProcessor.java

@@ -129,7 +129,7 @@ public class VenderMapProcessor implements Processor {
         } else if (!map.containsKey(key)) {
             map.put(key, value);
         } else {
-            if (map.get(key).equals(value)) {
+            if (!map.get(key).equals(value)) {
                 conflict.add(key);
                 map.remove(key);
             }