器件实体类修改

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/api/SearchApi.java

@@ -1,9 +1,7 @@
 package com.usoftchina.inquiry.api;
 
-import com.usoftchina.inquiry.po.*;
+import com.usoftchina.inquiry.po.search.SearchComponentResp;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.data.domain.Page;
-import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
 @FeignClient(url = "${Component.base-url}", name = "search-server")
@@ -12,11 +10,15 @@ public interface SearchApi {
 
     /**
      * 器件查询
-     * @param pageNumber
-     * @param pageSize
+     * @param keyword
+     * @param count
+     * @param sorting
+     * @param type
+     * @param page
+     * @param filter
      * @return
      */
     @GetMapping("/201819")
-    IPage<PurcInquiryItemInfo> getInquiry(@RequestParam("keyword") String keyword, @RequestParam("count") int count,@RequestParam("sorting") String sorting,
-                                          @RequestParam("type") String type, @RequestParam("page") int page, @RequestParam("filter") String filter);
+    SearchComponentResp getInquiry(@RequestParam("keyword") String keyword, @RequestParam("count") int count, @RequestParam("sorting") String sorting,
+                                   @RequestParam("type") String type, @RequestParam("page") int page, @RequestParam("filter") String filter);
 }

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/FuturesEntity.java

@@ -1,8 +1,8 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.search;
+
 
 import java.io.Serializable;
-import java.util.Date;
-import java.util.Objects;
+import java.util.List;
 
 /**
  * 特征信息
@@ -20,11 +20,8 @@ public class FuturesEntity implements Serializable {
 
     private Long size; // 分页大小
 
-    private ProductEntity content; // 期货物料列表
+    private List<ProductEntity> content; // 期货物料列表
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
 
     public Long getTotal() {
         return total;
@@ -50,11 +47,11 @@ public class FuturesEntity implements Serializable {
         this.size = size;
     }
 
-    public ProductEntity getContent() {
+    public List<ProductEntity> getContent() {
         return content;
     }
 
-    public void setContent(ProductEntity content) {
+    public void setContent(List<ProductEntity> content) {
         this.content = content;
     }
 }

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/GoodsEntity.java

@@ -1,7 +1,8 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.search;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -52,11 +53,7 @@ public class GoodsEntity implements Serializable {
 
     private String attach; // 商品规格书，如果有
 
-    private QtyPrice prices; // 分段价格
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
+    private List<QtyPrice> prices; // 分段价格
 
     public Long getId() {
         return id;
@@ -210,11 +207,11 @@ public class GoodsEntity implements Serializable {
         this.attach = attach;
     }
 
-    public QtyPrice getPrices() {
+    public List<QtyPrice> getPrices() {
         return prices;
     }
 
-    public void setPrices(QtyPrice prices) {
+    public void setPrices(List<QtyPrice> prices) {
         this.prices = prices;
     }
 }

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/ProductEntity.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.search;
 
 import java.io.Serializable;
 import java.util.Date;

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/QtyPrice.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.search;
 
 import java.io.Serializable;
 import java.util.Date;

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/SearchComponentResp.java

@@ -1,8 +1,7 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.search;
 
 import java.io.Serializable;
-import java.util.Date;
-import java.util.Objects;
+import java.util.List;
 
 /**
  * 器件查询
@@ -12,16 +11,10 @@ import java.util.Objects;
  */
 public class SearchComponentResp implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
     private StockEntity stock; // 现货
 
     private FuturesEntity futures; // 期货
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
     public StockEntity getStock() {
         return stock;
     }

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/StockEntity.java

@@ -1,8 +1,8 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.search;
+
 
 import java.io.Serializable;
-import java.util.Date;
-import java.util.Objects;
+import java.util.List;
 
 /**
  * 仓库信息
@@ -20,11 +20,7 @@ public class StockEntity implements Serializable {
 
     private Long size; // 分页大小
 
-    private GoodsEntity content; // 现货在售商品列表
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
+    private List<GoodsEntity> content; // 现货在售商品列表
 
     public Long getTotal() {
         return total;
@@ -50,11 +46,11 @@ public class StockEntity implements Serializable {
         this.size = size;
     }
 
-    public GoodsEntity getContent() {
+    public List<GoodsEntity> getContent() {
         return content;
     }
 
-    public void setContent(GoodsEntity content) {
+    public void setContent(List<GoodsEntity> content) {
         this.content = content;
     }
 }

applications/transfers/mall-api/src/test/java/com/usoftchina/inquiry/test/SearchApiTest.java

@@ -0,0 +1,45 @@
+package com.usoftchina.inquiry.test;
+
+import com.usoftchina.inquiry.api.SearchApi;
+import com.usoftchina.inquiry.po.*;
+import com.usoftchina.inquiry.po.search.SearchComponentResp;
+import com.usoftchina.saas.utils.JsonUtils;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 询报价接口测试
+ * @Author chenwei
+ * @Date 2019/01/04
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class SearchApiTest {
+
+    @Autowired
+    private SearchApi searchApi;
+
+    private static final Long userUU = 1000002503L;
+    private static final Long enUU = 10041559L;
+    private static final int pageNum = 1;
+    private static final int pageSize = 5;
+
+
+
+    @Test
+    public void testA_search(){
+        Map<String,Object> a = new HashMap<String,Object>();
+        a.put("PRICE","ASC");
+        SearchComponentResp result = searchApi.getInquiry("1",5,JsonUtils.toJsonString(a),"component",1,null);
+        System.out.println(JsonUtils.toJsonString(result));
+    }
+}