新增apache依赖

pom.xml

@@ -26,11 +26,17 @@
             <artifactId>ps-entity</artifactId>
         </dependency>
 
-        <!--<dependency>
-            <groupId>net.sf.json-lib</groupId>
-            <artifactId>json-lib</artifactId>
-            <classifier>jdk15</classifier>
-        </dependency>-->
+        <!-- httpClient -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>4.4</version>
+        </dependency>
 
         <!-- spring boot -->
         <dependency>

src/main/java/com/uas/ps/inquiry/controller/InquiryForBuyerController.java

@@ -2,16 +2,15 @@ package com.uas.ps.inquiry.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.uas.ps.inquiry.entity.InquiryDetailInfo;
-import com.uas.ps.inquiry.model.PublicInquiryItem;
 import com.uas.ps.inquiry.model.PurcInquiry;
 import com.uas.ps.inquiry.model.PurcInquiryItemInfo;
 import com.uas.ps.inquiry.page.PageInfo;
 import com.uas.ps.inquiry.page.SearchFilter;
 import com.uas.ps.inquiry.service.InquiryService;
+import com.uas.ps.inquiry.service.PublicInquiryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
-import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -29,6 +28,9 @@ public class InquiryForBuyerController {
     @Autowired
     private InquiryService inquiryService;
 
+    @Autowired
+    private PublicInquiryService publicInquiryService;
+
     /**
      * 作为买家，保存更新公共询价单
      *
@@ -96,4 +98,25 @@ public class InquiryForBuyerController {
         }
         return inquiryService.findByPageInfo(pageInfo, searchFilter);
     }
+
+    /**
+     * 通过企业UU和分页参数获取已发布的询价信息
+     *
+     * @param pageInfo 分页参数
+     * @param searchFilter 过滤条件
+     * @return
+     */
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public Page<PurcInquiryItemInfo> getInquiryList(PageInfo pageInfo, SearchFilter searchFilter) {
+        Sort sort = new Sort(Sort.Direction.DESC, "date");
+        pageInfo.setSort(sort);
+        if (null != searchFilter.getUserUU()) {
+            pageInfo.filter("userUU", searchFilter.getUserUU());
+        } else if (null != searchFilter.getEnUU()) {
+            pageInfo.filter("inquiry.enUU", searchFilter.getEnUU());
+        } else {
+            throw new IllegalAccessError("非法访问");
+        }
+        return publicInquiryService.findTodoByPageInfo(pageInfo, searchFilter);
+    }
 }

src/main/java/com/uas/ps/inquiry/service/impl/InquiryServiceImpl.java

@@ -108,10 +108,8 @@ public class InquiryServiceImpl implements InquiryService {
                     if (null == item.getDate()) {
                         item.setDate(new Date(System.currentTimeMillis()));
                     }
-                    items.add(item);
                 }
-                items = purcInquiryItemDao.save(items);
-                System.out.println(items);
+                purcInquiryItemDao.save(items);
             }
             return inquiry;
         }