新增单元测试类

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

@@ -1022,7 +1022,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                 }
             });
         }
-
+        publicInquiryItemDao.save(newInquiryItems);
     }
 
     /**

src/main/test/java/com/uas/ps/inquiry/ApplicationContextRegister.java

@@ -5,12 +5,14 @@ import org.apache.log4j.Logger;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
 
 /**
  * 注册Spring上下文对象
  * @author liuam
  * @since 2018/6/25 0025 下午 15:09
  */
+@Component
 public class ApplicationContextRegister implements ApplicationContextAware {
 
     private static Logger logger = Logger.getLogger(ApplicationContextRegister.class);

src/main/test/java/com/uas/ps/inquiry/BaseJunitTest.java

@@ -0,0 +1,38 @@
+package com.uas.ps.inquiry;
+
+import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.Rollback;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.WebApplicationContext;
+
+/**
+ * @author dongbw
+ * 18/09/27 10:23.
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = {Application.class})
+@Transactional
+@Rollback
+public class BaseJunitTest {
+
+
+
+    @Autowired
+    protected WebApplicationContext wac;
+
+    protected MockMvc mockMvc;
+
+    /**
+     * 前置防范，配置MVCMock
+     */
+    @Before
+    public void setup() {
+        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+    }
+}

src/main/test/java/com/uas/ps/inquiry/ErpDownTest.java

@@ -0,0 +1,254 @@
+package com.uas.ps.inquiry;
+
+import com.alibaba.fastjson.JSON;
+import com.uas.ps.inquiry.entity.BatchInProduct;
+import com.uas.ps.inquiry.entity.BatchInquiry;
+import com.uas.ps.inquiry.entity.Inquiry;
+import com.uas.ps.inquiry.entity.InquiryDecide;
+import com.uas.ps.inquiry.util.FlexJsonUtils;
+import com.uas.ps.inquiry.util.HttpUtil;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @author dongbw
+ * @since 2018年9月27日
+ */
+
+public class ErpDownTest extends BaseJunitTest {
+
+    /**
+     * localhost
+     */
+    private static final String localhost = "http://10.1.51.82:24002";
+
+    /**
+     * dev
+     */
+    private static final String dev_url = "http://192.168.253.12:24000";
+
+    /**
+     * userUU
+     */
+    private static final Long userUU = 1000002503L;
+
+    /**
+     * enUU
+     */
+    private static final Long enUU = 10041166L;
+
+    /**
+     * /
+     * @throws Exception
+     */
+    @Test
+    public void savePublicInquiry() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        List<BatchInquiry> inquiries = new ArrayList<>();
+        BatchInquiry batchInquiry = new BatchInquiry();
+        batchInquiry.setBi_code("MALL201809270001");
+        batchInquiry.setBi_date(new Date(System.currentTimeMillis()));
+        batchInquiry.setBi_enddate(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 2));
+        batchInquiry.setBi_id(1L);
+        batchInquiry.setBi_kind("inquiryType");
+        batchInquiry.setBi_recorder("dongbw");
+        batchInquiry.setBi_recorduu(userUU);
+        batchInquiry.setBi_remark("111");
+        List<BatchInProduct> inProducts = new ArrayList<>();
+
+        BatchInProduct inProduct = new BatchInProduct();
+        inProduct.setBip_biid(1L);
+        inProduct.setBip_currency("RMB");
+        inProduct.setBip_detno((short) 1);
+        inProduct.setBip_id(1L);
+        inProduct.setBip_mobile("15671616315");
+        inProduct.setBip_prodcode("PROD001");
+        inProduct.setPr_brand("Rohm");
+        inProduct.setPr_detail("名称");
+        inProduct.setPr_spec("规格");
+        inProduct.setYcgqty(1000d);
+        inProducts.add(inProduct);
+        batchInquiry.setInProducts(inProducts);
+        inquiries.add(batchInquiry);
+
+        params.put("inquiries", inquiries);
+        params.put("enuu", enUU);
+        params.put("address", "111");
+        String res = HttpUtil.doPost(localhost+ "/inquiry/public", FlexJsonUtils.toJsonDeep(params));
+        System.out.println(JSON.toJSON(res));
+    }
+
+    /**
+     * /check
+     * @throws Exception
+     */
+    @Test
+    public void check() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        List<BatchInquiry> inquiries = new ArrayList<>();
+        BatchInquiry batchInquiry = new BatchInquiry();
+        batchInquiry.setBi_code("MALL201809270001");
+        batchInquiry.setBi_date(new Date(System.currentTimeMillis()));
+        batchInquiry.setBi_enddate(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 2));
+        batchInquiry.setBi_id(1L);
+        batchInquiry.setBi_kind("inquiryType");
+        batchInquiry.setBi_recorder("dongbw");
+        batchInquiry.setBi_recorduu(userUU);
+        batchInquiry.setBi_remark("111");
+        List<BatchInProduct> inProducts = new ArrayList<>();
+
+        BatchInProduct inProduct = new BatchInProduct();
+        inProduct.setBip_biid(1L);
+        inProduct.setBip_currency("RMB");
+        inProduct.setBip_detno((short) 1);
+        inProduct.setBip_id(1L);
+        inProduct.setBip_mobile("15671616315");
+        inProduct.setBip_prodcode("PROD001");
+        inProduct.setPr_brand("Rohm");
+        inProduct.setPr_detail("名称");
+        inProduct.setPr_spec("规格");
+        inProduct.setYcgqty(1000d);
+        inProducts.add(inProduct);
+        batchInquiry.setInProducts(inProducts);
+        inquiries.add(batchInquiry);
+
+        params.put("inquiries", inquiries);
+        params.put("enuu", enUU);
+        String res = HttpUtil.doPost(localhost+ "/inquiry/public/check", FlexJsonUtils.toJsonDeep(params));
+        System.out.println(JSON.toJSON(res));
+    }
+
+    /**
+     * /quotation
+     */
+    @Test
+    public void quotation() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("enuu", enUU);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/quotation", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /reply/back
+     */
+    @Test
+    public void replyBack() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("enuu", enUU);
+        params.put("data", "1223,1224,1225,1226,1227");
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/quotation", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /reply/decide
+     * @throws Exception
+     */
+    @Test
+    public void replyDecide() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        List<InquiryDecide> inquiryDecides = new ArrayList<>();
+        InquiryDecide inquiryDecide = new InquiryDecide();
+        inquiryDecide.setB2b_id(1223L);
+        inquiryDecide.setB2b_qu_id(122L);
+        inquiryDecide.setId_agreed((short) 1);
+        inquiryDecide.setId_detno((short) 1);
+        inquiryDecide.setIn_code("MALL201809270001");
+        inquiryDecides.add(inquiryDecide);
+        params.put("decides", inquiryDecides);
+        params.put("enuu", enUU);
+        String res = HttpUtil.doPost(localhost+ "/inquiry/public/reply/decide", FlexJsonUtils.toJsonDeep(params));
+        System.out.println(JSON.toJSON(res));
+    }
+
+    /**
+     * /invalid
+     * @throws Exception
+     */
+    @Test
+    public void invalid() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        List<Inquiry> inquiries = new ArrayList<>();
+        Inquiry inquiry = new Inquiry();
+        inquiry.setIn_code("IN20180929001");
+        inquiries.add(inquiry);
+        params.put("inquiries", inquiries);
+        params.put("enuu", enUU);
+        String res = HttpUtil.doPost(localhost+ "/inquiry/public/invalid", FlexJsonUtils.toJsonDeep(params));
+        System.out.println(JSON.toJSON(res));
+    }
+
+    /**
+     * /down/decide
+     */
+    @Test
+    public void downloadDecide() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("enuu", enUU);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/down/decide", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /down/decide/back
+     */
+    @Test
+    public void downDecideBack() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("enuu", enUU);
+        params.put("data", "1223,1224,1225,1226,1227");
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/down/decide/back", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /down/reply
+     */
+    @Test
+    public void downReply() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("enuu", enUU);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/down/reply", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /down/reply/back
+     */
+    @Test
+    public void downReplyBack() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("enUU", enUU);
+        params.put("ids", "1223,1224,1225,1226,1227");
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/down/reply/back", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /enremind
+     */
+    @Test
+    public void enremind() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("vendUU", enUU);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/enremind", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /enremind/back
+     */
+    @Test
+    public void enremindBack() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("vendUU", enUU);
+        params.put("ids", "1223,1224,1225,1226,1227");
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/enremind/back", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+}

src/main/test/java/com/uas/ps/inquiry/InquiryForBuyerTest.java

@@ -0,0 +1,212 @@
+package com.uas.ps.inquiry;
+
+import com.alibaba.fastjson.JSON;
+import com.uas.ps.inquiry.entity.Constant;
+import com.uas.ps.inquiry.model.PurcInquiry;
+import com.uas.ps.inquiry.model.PurcInquiryItem;
+import com.uas.ps.inquiry.page.PageInfo;
+import com.uas.ps.inquiry.page.SearchFilter;
+import com.uas.ps.inquiry.util.FlexJsonUtils;
+import com.uas.ps.inquiry.util.HttpUtil;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author liuam
+ * @since 2018/9/12 0012 上午 11:24
+ */
+
+public class InquiryForBuyerTest extends BaseJunitTest {
+
+
+    /**
+     * localhost
+     */
+    private static final String localhost = "http://10.1.51.82:24002";
+
+    /**
+     * dev
+     */
+    private static final String dev_url = "http://192.168.253.12:24000";
+
+    /**
+     * userUU
+     */
+    private static final Long userUU = 1000002503L;
+
+    /**
+     * enUU
+     */
+    private static final Long enUU = 10041166L;
+
+    /**
+     * /detail
+     */
+    @Test
+    public void findById() throws Exception {
+        Long id = 59L;
+        Long enuu = 10041166L;
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("id", id);
+        params.put("enuu", enuu);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/buyer/save", params);
+        Assert.assertEquals(enuu, JSON.parseObject(res.getResponseText(), PurcInquiry.class).getEnUU());
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /inquiryList
+     */
+    @Test
+    public void inquiryList() throws Exception {
+        SearchFilter searchFilter = new SearchFilter();
+        searchFilter.setEnUU(1001166L);
+        searchFilter.setUserUU(1000002503L);
+        PageInfo pageInfo = new PageInfo(1, 20);
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("pageInfo", pageInfo);
+        params.put("searchFilter", searchFilter);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/buyer/inquiryList", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /list
+     */
+    @Test
+    public void list() throws Exception {
+        SearchFilter searchFilter = new SearchFilter();
+        searchFilter.setEnUU(1001166L);
+        searchFilter.setUserUU(1000002503L);
+        PageInfo pageInfo = new PageInfo(1, 20);
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("pageInfo", pageInfo);
+        params.put("searchFilter", searchFilter);
+        params.put("state", "done");
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/buyer/list", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /product/detail
+     */
+    @Test
+    public void productDetail() throws Exception {
+        Long id = 9L;
+        Long enuu = 10041166L;
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("id", id);
+        params.put("enuu", enuu);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/buyer/list", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /quotations
+     */
+    @Test
+    public void quotations() throws Exception {
+        SearchFilter searchFilter = new SearchFilter();
+        searchFilter.setEnUU(1001166L);
+        searchFilter.setUserUU(1000002503L);
+        PageInfo pageInfo = new PageInfo(1, 20);
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("pageInfo", pageInfo);
+        params.put("searchFilter", searchFilter);
+        params.put("enUU", enUU);
+        params.put("userUU", userUU);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/buyer/quotations", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /quotation
+     */
+    @Test
+    public void quotation() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("id", 9L);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/buyer/quotation", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /save
+     */
+    @Test
+    public void saveInquiry() throws Exception {
+        PurcInquiry inquiry = new PurcInquiry();
+        inquiry.setEndDate(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 2));
+        inquiry.setRecorderUU(1000002503L);
+        inquiry.setAmount(1);
+        inquiry.setRecorder("董必伟");
+        inquiry.setEnUU(10041559L);
+        inquiry.setSourceapp("MALL");
+        PurcInquiryItem item = new PurcInquiryItem();
+        item.setCmpCode("HCD89045");
+        item.setDate(new Date(System.currentTimeMillis()));
+        item.setUserUU(1000002503L);
+        item.setProdTitle("测试15");
+        item.setEndDate(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 2));
+        item.setSource("MALL");
+        item.setSpec("14211");
+        item.setUserTel("15671616315");
+        item.setUserName("董必伟");
+        item.setInbrand("A123 Systems");
+        Set<PurcInquiryItem> items = new HashSet<>();
+        items.add(item);
+        inquiry.setInquiryItems(items);
+        String res = HttpUtil.doPost("http://10.1.51.82:24002" + "/inquiry/buyer/save",
+                FlexJsonUtils.toJsonDeep(inquiry));
+        System.out.println(res);
+    }
+
+    /**
+     * /decide
+     */
+    @Test
+    public void decide() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("id", 9L);
+        params.put("status", Constant.YES);
+        params.put("useruu", userUU);
+        params.put("enuu", enUU);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/buyer/decide", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /adopt
+     */
+    @Test
+    public void adopt() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("id", 9L);
+        params.put("status", Constant.YES);
+        params.put("useruu", userUU);
+        params.put("enuu", enUU);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/buyer/adopt", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /refuse
+     */
+    @Test
+    public void refuse() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("id", 9L);
+        params.put("status", Constant.NO);
+        params.put("refusereason", "拒绝理由1");
+        params.put("useruu", userUU);
+        params.put("enuu", enUU);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/buyer/refuse", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+}

src/main/test/java/com/uas/ps/inquiry/InquiryForSalerTest.java

@@ -0,0 +1,151 @@
+package com.uas.ps.inquiry;
+
+import com.alibaba.fastjson.JSON;
+import com.uas.ps.inquiry.model.PublicInquiry;
+import com.uas.ps.inquiry.model.PublicInquiryItem;
+import com.uas.ps.inquiry.model.PublicInquiryReply;
+import com.uas.ps.inquiry.page.PageInfo;
+import com.uas.ps.inquiry.page.SearchFilter;
+import com.uas.ps.inquiry.util.FlexJsonUtils;
+import com.uas.ps.inquiry.util.HttpUtil;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @author dongbw
+ * @since 2018年9月26日
+ */
+
+public class InquiryForSalerTest extends BaseJunitTest {
+
+    /**
+     * localhost
+     */
+    private static final String localhost = "http://10.1.51.82:24002";
+
+    /**
+     * dev
+     */
+    private static final String dev_url = "http://192.168.253.12:24000";
+
+    /**
+     * userUU
+     */
+    private static final Long userUU = 1000002503L;
+
+    /**
+     * enUU
+     */
+    private static final Long enUU = 10041166L;
+
+
+    /**
+     * saveQuote
+     * @throws Exception
+     */
+    @Test
+    public void saveQuote() throws Exception {
+        PublicInquiry inquiry = new PublicInquiry();
+        inquiry.setId(1225L);
+        inquiry.setEnUU(enUU);
+        inquiry.setRecorderUU(userUU);
+        PublicInquiryItem item = new PublicInquiryItem();
+        item.setInquiry(inquiry);
+        item.setUserName("龙晓兰");
+        item.setUserTel("18692990942");
+        item.setQutoApp("MALL");
+        item.setCurrency("RMB");
+        item.setProdTitle("IC");
+        item.setStatus((short) 100);
+        item.setInbrand("美尔森");
+        item.setLeadtime((long) 1);
+        item.setVendUserUU(userUU);
+        item.setVendUU(10041559L);
+        item.setId(139018L);
+        item.setSpec("EMC0123SN7406DREMC123EMC");
+        item.setIsReplace((short) 0);
+
+        List<PublicInquiryReply> replies = new ArrayList<>();
+        PublicInquiryReply reply = new PublicInquiryReply();
+        reply.setLapQty((double) 1);
+        reply.setPrice((double) 200);
+        replies.add(reply);
+        item.setReplies(replies);
+
+        String res = HttpUtil.doPost(localhost + "/inquiry/sale/saveQuote",
+                FlexJsonUtils.toJsonDeep(item));
+        System.out.println(res);
+    }
+
+    /**
+     * /inquiry/detail
+     * @throws Exception
+     */
+    @Test
+    public void inquiryDetail() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        // 报价明细Id
+        params.put("itemId", 1225);
+        params.put("en_uu", enUU);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/sale/inquiry/detail", params);
+        System.out.println(JSON.toJSON(res));
+    }
+
+
+    /**
+     * /publicInquiry/detail
+     * @throws Exception
+     */
+    @Test
+    public void publciInquiryDetail() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        // 询价明细Id
+        params.put("id", 1169);
+        params.put("enuu", enUU);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/sale/publicInquiry/detail", params);
+        System.out.println(JSON.toJSON(res));
+    }
+
+    /**
+     * /remind
+     * @throws Exception
+     */
+    @Test
+    public void remind() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        // 询价明细Id
+        params.put("useruu", userUU);
+        params.put("enuu", enUU);
+        SearchFilter searchFilter = new SearchFilter();
+        searchFilter.setEndDate(System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 2);
+        PageInfo pageInfo = new PageInfo(1, 20);
+        params.put("pageInfo", pageInfo);
+        params.put("searchFilter", searchFilter);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/sale/remind", params);
+        System.out.println(JSON.toJSON(res));
+    }
+
+    /**
+     * /enremind
+     * @throws Exception
+     */
+    @Test
+    public void enremind() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        // 询价明细Id
+        params.put("useruu", userUU);
+        params.put("enuu", enUU);
+        SearchFilter searchFilter = new SearchFilter();
+        searchFilter.setEndDate(System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 2);
+        PageInfo pageInfo = new PageInfo(1, 20);
+        params.put("pageInfo", pageInfo);
+        params.put("searchFilter", searchFilter);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/sale/enremind", params);
+        System.out.println(JSON.toJSON(res));
+    }
+
+
+}

src/main/test/java/com/uas/ps/inquiry/PublicApiTest.java

@@ -0,0 +1,117 @@
+package com.uas.ps.inquiry;
+
+import com.alibaba.fastjson.JSON;
+import com.uas.ps.inquiry.util.HttpUtil;
+import org.junit.Test;
+
+import java.util.HashMap;
+
+/**
+ * @author dongbw
+ * @since 2018年9月26日
+ */
+
+public class PublicApiTest extends BaseJunitTest {
+
+    /**
+     * localhost
+     */
+    private static final String localhost = "http://10.1.51.82:24002";
+
+    /**
+     * dev
+     */
+    private static final String dev_url = "http://192.168.253.12:24000";
+
+    /**
+     * userUU
+     */
+    private static final Long userUU = 1000002503L;
+
+    /**
+     * enUU
+     */
+    private static final Long enUU = 10041166L;
+
+    /**
+     * /sum/publish/personal
+     * @throws Exception
+     */
+    @Test
+    public void sumPersonalPublish() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("useruu", userUU);
+        params.put("enuu", enUU);
+        params.put("starttime", System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 2);
+        params.put("endtime", System.currentTimeMillis());
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost+ "/inquiry/api/sum/publish/personal", params);
+        System.out.println(JSON.toJSON(res));
+    }
+
+    /**
+     * /sum/publish/enterprise
+     * @throws Exception
+     */
+    @Test
+    public void sumEnterprisePublish() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("enuu", enUU);
+        params.put("starttime", System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 2);
+        params.put("endtime", System.currentTimeMillis());
+        HttpUtil.Response res = HttpUtil.sendGetRequest("http://10.1.51.82:24002" + "/inquiry/api/sum/publish/enterprise", params);
+        System.out.println(JSON.toJSON(res));
+    }
+
+    /**
+     * /sum/reply/personal
+     * @throws Exception
+     */
+    @Test
+    public void sumPersonalReply() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("useruu", userUU);
+        params.put("enuu", enUU);
+        params.put("starttime", System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 2);
+        params.put("endtime", System.currentTimeMillis());
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost+ "/inquiry/api/sum/reply/personal", params);
+        System.out.println(JSON.toJSON(res));
+    }
+
+    /**
+     * /sum/reply/enterprise
+     * @throws Exception
+     */
+    @Test
+    public void sumEnterpriseReply() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("enuu", enUU);
+        params.put("starttime", System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 2);
+        params.put("endtime", System.currentTimeMillis());
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/api/sum/reply/enterprise", params);
+        System.out.println(JSON.toJSON(res));
+    }
+
+    /**
+     * /sum/all/time
+     * @throws Exception
+     */
+    @Test
+    public void sumPublishWithTime() throws Exception {
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/api/sum/all/time?time=" + System.currentTimeMillis(), null);
+        System.out.println(JSON.toJSON(res));
+    }
+
+
+    /**
+     * /sum/all/scope
+     * @throws Exception
+     */
+    @Test
+    public void sumPublishWithTimeScope() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("starttime", System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 7);
+        params.put("endtime", System.currentTimeMillis());
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/api/sum/all/scope", params);
+        System.out.println(JSON.toJSON(res));
+    }
+}

src/main/test/java/com/uas/ps/inquiry/PublicInquiryTest.java

@@ -0,0 +1,216 @@
+package com.uas.ps.inquiry;
+
+import com.alibaba.fastjson.JSON;
+import com.uas.ps.inquiry.entity.Constant;
+import com.uas.ps.inquiry.page.PageInfo;
+import com.uas.ps.inquiry.page.SearchFilter;
+import com.uas.ps.inquiry.util.FlexJsonUtils;
+import com.uas.ps.inquiry.util.HttpUtil;
+import org.junit.Test;
+import org.springframework.test.web.servlet.RequestBuilder;
+
+import java.util.HashMap;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+
+/**
+ * @author dongbw
+ * @since 2018年9月27日
+ */
+public class PublicInquiryTest extends BaseJunitTest {
+
+    /**
+     * localhost
+     */
+    private static final String localhost = "http://10.1.51.82:24002";
+
+    /**
+     * dev
+     */
+    private static final String dev_url = "http://192.168.253.12:24000";
+
+    /**
+     * userUU
+     */
+    private static final Long userUU = 1000002503L;
+
+    /**
+     * enUU
+     */
+    private static final Long enUU = 10041166L;
+
+    /**
+     * /
+     */
+    @Test
+    public void publicInquiry() throws Exception {
+        SearchFilter searchFilter = new SearchFilter();
+        searchFilter.setEnUU(1001166L);
+        searchFilter.setUserUU(1000002503L);
+        PageInfo pageInfo = new PageInfo(1, 20);
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("pageInfo", pageInfo);
+        params.put("searchFilter", searchFilter);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * inquiryList
+     * @throws Exception
+     */
+    @Test
+    public void inquiryList() throws Exception {
+        SearchFilter searchFilter = new SearchFilter();
+        searchFilter.setEnUU(1001166L);
+        searchFilter.setUserUU(1000002503L);
+        PageInfo pageInfo = new PageInfo(1, 20);
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("pageInfo", pageInfo);
+        params.put("searchFilter", searchFilter);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/inquiryList", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /quotation/list
+     * @throws Exception
+     */
+    @Test
+    public void quotationList() throws Exception {
+        SearchFilter filter = new SearchFilter();
+        filter.setEnUU(1001166L);
+        filter.setUserUU(1000002503L);
+        PageInfo pageInfo = new PageInfo(1, 20);
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("pageInfo", pageInfo);
+        params.put("filter", JSON.toJSON(filter));
+        params.put("overdue", Constant.NO);
+        params.put("_state", "done");
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/quotation/list", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /quotation/one
+     * @throws Exception
+     */
+    @Test
+    public void quotationOne() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("id", 223L);
+        params.put("useruu", userUU);
+        params.put("enuu", enUU);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/quotation/one", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /quotationList
+     * @throws Exception
+     */
+    @Test
+    public void quotationLists() throws Exception {
+        SearchFilter filter = new SearchFilter();
+        filter.setEnUU(1001166L);
+        filter.setUserUU(1000002503L);
+        PageInfo pageInfo = new PageInfo(1, 20);
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("pageInfo", pageInfo);
+        params.put("searchFilter", JSON.toJSON(filter));
+        params.put("overdue", Constant.NO);
+        params.put("_state", "agreed");
+
+        RequestBuilder request= get("/inquiry/public/quotationList")
+                .requestAttr("pageInfo", pageInfo).requestAttr("filter", filter)
+                .requestAttr("overdue", Constant.NO).requestAttr("_state", "agreed");
+        System.out.println(mockMvc.perform(request).andReturn().getResponse().getContentAsString());
+    }
+
+    /**
+     * /messageList
+     * @throws Exception
+     */
+    @Test
+    public void messageList() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("size", 20);
+        params.put("enuu", enUU);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/messageList", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /findInquiryById
+     * @throws Exception
+     */
+    @Test
+    public void findInquiryById() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("id", 20L);
+        params.put("enuu", enUU);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/findInquiryById", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+
+    /**
+     * /findCodeRankingList
+     * @throws Exception
+     */
+    @Test
+    public void findCodeRankingList() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/findCodeRankingList", null);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /findItemByItemId
+     * @throws Exception
+     */
+    @Test
+    public void findItemByItemId() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("itemId", 1220L);
+        params.put("enuu", enUU);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/findItemByItemId", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /getPurcInquiryItemCountByMonth
+     * @throws Exception
+     */
+    @Test
+    public void getPurcInquiryItemCountByMonth() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("year", 2018);
+        params.put("month", 9);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/getPurcInquiryItemCountByMonth", params);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /getCountOfLastAndThisMonth
+     * @throws Exception
+     */
+    @Test
+    public void getCountOfLastAndThisMonth() throws Exception {
+        HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/getCountOfLastAndThisMonth", null);
+        System.out.println(FlexJsonUtils.toJson(res));
+    }
+
+    /**
+     * /deleteItem
+     * @throws Exception
+     */
+    @Test
+    public void deleteItem() throws Exception {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("id", 1220);
+        params.put("valid", Constant.NO);
+        String res = HttpUtil.doPost(localhost + "/inquiry/public/deleteItem", null);
+        System.out.println(res);
+    }
+}

src/main/test/java/com/uas/ps/inquiry/TestInquiry.java

@@ -1,18 +1,13 @@
-package java.com.uas.ps.inquiry;
+package com.uas.ps.inquiry;
 
-import com.uas.ps.inquiry.Application;
 import com.uas.ps.inquiry.model.PurcInquiry;
 import com.uas.ps.inquiry.model.PurcInquiryItem;
 import com.uas.ps.inquiry.rabbit.RabbitConstants;
 import com.uas.ps.inquiry.util.FlexJsonUtils;
 import com.uas.ps.inquiry.util.HttpUtil;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.Date;
 import java.util.HashSet;
@@ -22,10 +17,8 @@ import java.util.Set;
  * @author liuam
  * @since 2018/9/12 0012 上午 11:24
  */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-@Import(com.uas.ps.inquiry.ApplicationContextRegister.class)
-public class TestInquiry {
+
+public class TestInquiry extends BaseJunitTest {
 
     @Autowired
     private RabbitTemplate rabbitTemplate;