|
|
@@ -1,5 +1,6 @@
|
|
|
package com.uas.ps.inquiry.controller;
|
|
|
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.uas.ps.entity.Status;
|
|
|
import com.uas.ps.httplog.annotation.HttpLog;
|
|
|
@@ -69,6 +70,7 @@ public class PublicInquiryController {
|
|
|
@RequestMapping(method = RequestMethod.GET)
|
|
|
public IPage<PurcInquiryItemInfo> getInquiry(PageInfo pageInfo, SearchFilter searchFilter, String distributes) {
|
|
|
long start = System.currentTimeMillis();
|
|
|
+ log.info("/inquiry/public, 查询公共询价信息, pageInfo: {}, searchFilter: {}, distributes: {}", JSON.toJSON(pageInfo), JSON.toJSON(searchFilter), distributes);
|
|
|
if (!StringUtils.isEmpty(distributes)) {
|
|
|
List<Long> distribute = JSONObject.parseArray(distributes, Long.class);
|
|
|
searchFilter.setDistribute(distribute);
|
|
|
@@ -80,7 +82,7 @@ public class PublicInquiryController {
|
|
|
pageInfo.expression(PredicateUtils.eq("valid", Constant.YES, false));
|
|
|
}
|
|
|
IPage<PurcInquiryItemInfo> page = publicInquiryService.findTodoByPageInfo(pageInfo, searchFilter);
|
|
|
- log.info("/inquiry/public, 查询公共询价信息, UserUU: {}, EnUU: {}, 报价的应用来源: {}, 耗时: {}", searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
|
|
|
+ log.info("/inquiry/public get, 耗时: {}", (System.currentTimeMillis() - start));
|
|
|
return page;
|
|
|
}
|
|
|
|
|
|
@@ -96,6 +98,7 @@ public class PublicInquiryController {
|
|
|
@RequestMapping(value = "/inquiryList", method = RequestMethod.GET)
|
|
|
public IPage<PurcInquiryItemInfo> getInquiryList(PageInfo pageInfo, SearchFilter searchFilter) {
|
|
|
long start = System.currentTimeMillis();
|
|
|
+ log.info("/inquiry/public/inquiryList, 查询公共询价信息, pageInfo: {}, searchFilter: {}", JSON.toJSON(pageInfo), JSON.toJSON(searchFilter));
|
|
|
if (null != searchFilter.getUserUU()) {
|
|
|
pageInfo.filter("userUU", searchFilter.getUserUU());
|
|
|
}
|
|
|
@@ -103,7 +106,7 @@ public class PublicInquiryController {
|
|
|
pageInfo.filter("inquiry.enUU", searchFilter.getEnUU());
|
|
|
}
|
|
|
IPage<PurcInquiryItemInfo> infoIPage = publicInquiryService.findTodoByPageInfo(pageInfo, searchFilter);
|
|
|
- log.info("/inquiry/public/inquiryList, 查询公共询价信息, UserUU: {}, EnUU: {}, 报价的应用来源: {}, 耗时: {}", searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.MALL.name(), (System.currentTimeMillis() - start));
|
|
|
+ log.info("/inquiry/public/inquiryList, 耗时: {}", (System.currentTimeMillis() - start));
|
|
|
return infoIPage;
|
|
|
}
|
|
|
|
|
|
@@ -122,6 +125,8 @@ public class PublicInquiryController {
|
|
|
@RequestMapping(value = "/quotation/list", method = RequestMethod.GET)
|
|
|
public IPage<PublicInquiryItemInfo> getQuotation(PageInfo pageInfo, String filter, String _state, Short overdue) {
|
|
|
long start = System.currentTimeMillis();
|
|
|
+ log.info("/inquiry/public/quotation/list, 查询已转报价询价列表信息, pageInfo:{}, filter: {}, _state: {}, 报价的overdue应用来源: {}",
|
|
|
+ JSON.toJSON(pageInfo), filter, _state, overdue);
|
|
|
SearchFilter searchFilter = JSONObject.parseObject(filter, SearchFilter.class);
|
|
|
if (null != searchFilter) {
|
|
|
if (null != searchFilter.getVendUU()) {
|
|
|
@@ -137,7 +142,7 @@ public class PublicInquiryController {
|
|
|
pageInfo = publicInquiryService.covert(pageInfo, _state, overdue);
|
|
|
}
|
|
|
IPage<PublicInquiryItemInfo> inquiryItemInfoIPage = publicInquiryService.findByPageInfo(pageInfo, searchFilter);
|
|
|
- log.info("/inquiry/public/quotation/list, 查询已转报价询价列表信息, 状态:{}, UserUU: {}, EnUU: {}, 报价的应用来源: {}, 耗时: {}", (_state == null ? "all" : _state), searchFilter != null ? searchFilter.getUserUU() : null, searchFilter != null ? searchFilter.getEnUU() : null, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
|
|
|
+ log.info("/inquiry/public/quotation/list, 耗时: {}", (System.currentTimeMillis() - start));
|
|
|
return inquiryItemInfoIPage;
|
|
|
}
|
|
|
|
|
|
@@ -152,11 +157,12 @@ public class PublicInquiryController {
|
|
|
@RequestMapping(value = "/quotation/one", method = RequestMethod.GET)
|
|
|
public PublicInquiryItemInfo getQuotationById(Long id, Long enuu, Long useruu) throws AccessException {
|
|
|
long start = System.currentTimeMillis();
|
|
|
+ log.info("/inquiry/public/quotation/one,通过id查询单个已转报价的信息,id: {}, enuu: {}, useruu: {}", id, enuu, useruu);
|
|
|
if (StringUtils.isEmpty(enuu) || StringUtils.isEmpty(useruu)) {
|
|
|
throw new IllegalAccessError("暂无访问权限");
|
|
|
}
|
|
|
PublicInquiryItemInfo info = publicInquiryService.findOneInfo(id, enuu, useruu);
|
|
|
- log.info("/inquiry/public/quotation/one,通过id查询单个已转报价的信息,id: {}, enuu: {}, useruu: {}, 耗时: {}", id, enuu, useruu, (System.currentTimeMillis() - start));
|
|
|
+ log.info("/inquiry/public/quotation/one, 耗时: {}", (System.currentTimeMillis() - start));
|
|
|
return info;
|
|
|
}
|
|
|
|
|
|
@@ -173,12 +179,13 @@ public class PublicInquiryController {
|
|
|
@RequestMapping(value = "/quotationList", method = RequestMethod.GET)
|
|
|
public Page<PublicInquiryItemInfo> getQuotationList(PageInfo pageInfo, String filter, String _state, Short overdue) {
|
|
|
long start = System.currentTimeMillis();
|
|
|
+ log.info("/inquiry/public/quotationList, 商城获取采纳列表, filter: {}, state: {}, overdue: {}, pageInfo: {}", filter, _state, overdue, JSON.toJSON(pageInfo));
|
|
|
SearchFilter searchFilter = JSONObject.parseObject(filter, SearchFilter.class);
|
|
|
if (null != _state) {
|
|
|
pageInfo = publicInquiryService.covert(pageInfo, _state, overdue);
|
|
|
}
|
|
|
Page<PublicInquiryItemInfo> itemInfoPage = publicInquiryService.findListByPageInfo(pageInfo, searchFilter);
|
|
|
- log.info("/inquiry/public/quotationList, 商城获取采纳列表, filter: {}, state: {}, overdue: {}, 耗时: {}", filter, _state, overdue, (System.currentTimeMillis() - start));
|
|
|
+ log.info("/inquiry/public/quotationList, 耗时: {}", (System.currentTimeMillis() - start));
|
|
|
return itemInfoPage;
|
|
|
}
|
|
|
|
|
|
@@ -194,8 +201,9 @@ public class PublicInquiryController {
|
|
|
@RequestMapping(value = "/messageList", method = RequestMethod.GET)
|
|
|
public List<InquiryMessage> getList(Long enuu, Integer size) {
|
|
|
long start = System.currentTimeMillis();
|
|
|
+ log.info("/inquiry/public/messageList, 获取最新的公共询价, size:{}, EnUU: {}, ", size, enuu);
|
|
|
List<InquiryMessage> messages = publicInquiryService.getMessageList(enuu, size);
|
|
|
- log.info("/inquiry/public/messageList, 获取最新的公共询价, size:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}, 耗时: {}", size, Constant.UU, enuu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
|
|
|
+ log.info("/inquiry/public/messageList, 耗时: {}", (System.currentTimeMillis() - start));
|
|
|
return messages;
|
|
|
}
|
|
|
|
|
|
@@ -214,8 +222,9 @@ public class PublicInquiryController {
|
|
|
@RequestMapping(value = "/turntoInquiry", method = RequestMethod.POST)
|
|
|
private ModelMap transtoInquiry(Long id, Long enuu, Long useruu) {
|
|
|
long start = System.currentTimeMillis();
|
|
|
+ log.info("/inquiry/public/turntoInquiry post, 将数据转成询价报价单数据, id: {}, enuu: {}, useruu: {}", id, enuu, useruu);
|
|
|
ModelMap map = publicInquiryService.transtoInquiry(id, enuu, useruu);
|
|
|
- log.info("/inquiry/public/turntoInquiry post, 将数据转成询价报价单数据, id: {}, enuu: {}, useruu: {}, 耗时: {}", id, enuu, useruu, (System.currentTimeMillis() - start));
|
|
|
+ log.info("/inquiry/public/turntoInquiry post, 耗时: {}", (System.currentTimeMillis() - start));
|
|
|
return map;
|
|
|
}
|
|
|
|
|
|
@@ -230,8 +239,9 @@ public class PublicInquiryController {
|
|
|
@RequestMapping(value = "/attachUrl", method = RequestMethod.GET)
|
|
|
public com.uas.ps.inquiry.model.Attach getAttach(Long id) {
|
|
|
long start = System.currentTimeMillis();
|
|
|
+ log.info("/inquiry/public/atatchUrl, 获取附件信息, id:{}, ", id);
|
|
|
Attach attach = attachService.findById(id);
|
|
|
- log.info("/inquiry/public/atatchUrl, 获取附件信息, id:{ }, 耗时: {}", id, (System.currentTimeMillis() - start));
|
|
|
+ log.info("/inquiry/public/atatchUrl, 耗时: {}", (System.currentTimeMillis() - start));
|
|
|
return attach;
|
|
|
}
|
|
|
|
|
|
@@ -246,9 +256,10 @@ public class PublicInquiryController {
|
|
|
@RequestMapping(value = "/findInquiryById", method = RequestMethod.GET)
|
|
|
public PurcInquiry findById(Long id, Long enuu) {
|
|
|
long start = System.currentTimeMillis();
|
|
|
+ log.info("/inquiry/public/findInquiryById, 获取询价信息, id: {}, EnUU: {}, ", id, enuu);
|
|
|
PurcInquiry inquiry = publicInquiryService.findInquiryById(id);
|
|
|
inquiry = publicInquiryService.getQuotedDetail(inquiry);
|
|
|
- log.info("/inquiry/public/findInquiryById, 获取询价信息, id: {}, Constant: {}, EnUU: {}, 报价的应用来源: {}, 耗时:{}", id, Constant.UU, enuu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
|
|
|
+ log.info("/inquiry/public/findInquiryById, 耗时:{}", (System.currentTimeMillis() - start));
|
|
|
return inquiry;
|
|
|
}
|
|
|
|
|
|
@@ -279,8 +290,9 @@ public class PublicInquiryController {
|
|
|
@RequestMapping(value = "/findItemByItemId", method = RequestMethod.GET)
|
|
|
public PurcInquiryItemInfo findItemByItemId(Long itemId, Long enuu) {
|
|
|
long start = System.currentTimeMillis();
|
|
|
+ log.info("/inquiry/public/findItemByItemId, 获取询价信息, itemId: {}, enuu: {},", itemId, enuu);
|
|
|
PurcInquiryItemInfo itemInfo = publicInquiryService.findItemByItemId(itemId, enuu);
|
|
|
- log.info("/inquiry/public/findItemByItemId, 获取询价信息, id: {}, Constant: {}, EnUU: {}, 报价的应用来源: {}, 耗时: {}", itemId, Constant.UU, enuu, InquirySource.B2B.name(), (System.currentTimeMillis() - start));
|
|
|
+ log.info("/inquiry/public/findItemByItemId, 耗时: {}", (System.currentTimeMillis() - start));
|
|
|
return itemInfo;
|
|
|
}
|
|
|
|
|
|
@@ -308,8 +320,9 @@ public class PublicInquiryController {
|
|
|
@RequestMapping(value = "/getPurcInquiryItemCountByMonth", method = RequestMethod.GET)
|
|
|
public ModelMap getPurcInquiryItemCountByMonth(Integer year, Integer month) {
|
|
|
long start = System.currentTimeMillis();
|
|
|
+ log.info("/inquiry/public/getPurcInquiryItemCountByMonth, 公共询价单明细某年某月总数, year: {}, month: {}", year, month);
|
|
|
ModelMap map = publicInquiryService.countByMonth(year, month);
|
|
|
- log.info("/inquiry/public/getPurcInquiryItemCountByMonth, 公共询价单明细某年某月总数, year: {}, month: {}, 耗时: {}", year, month, (System.currentTimeMillis() - start));
|
|
|
+ log.info("/inquiry/public/getPurcInquiryItemCountByMonth,耗时: {}", (System.currentTimeMillis() - start));
|
|
|
return map;
|
|
|
}
|
|
|
|
|
|
@@ -338,6 +351,7 @@ public class PublicInquiryController {
|
|
|
@RequestMapping(value = "/deleteItem", method = RequestMethod.POST)
|
|
|
public ModelMap deleteItems(Long id, Integer valid) {
|
|
|
long start = System.currentTimeMillis();
|
|
|
+ log.info("/inquiry/public/deleteItems, 公共询价单明细设置禁用或反禁用, id: {}, valid:{}", id, valid);
|
|
|
if (null == valid) {
|
|
|
valid = 0;
|
|
|
}
|
|
|
@@ -380,6 +394,8 @@ public class PublicInquiryController {
|
|
|
public ModelMap publincInquiry(Integer page, Integer size, Long en_uu, String _state,
|
|
|
String keyword, String user_tel, Long fromDate, Long endDate) {
|
|
|
long start = System.currentTimeMillis();
|
|
|
+ log.info("/inquiry/mobile, 查询公共询价信息, page:{}, size:{}, en_uu:{}, _state:{}, keyword:{}, user_tel:{}, fromDate:{}, endDate:{}",
|
|
|
+ page, size, en_uu, _state, keyword, user_tel, fromDate, endDate);
|
|
|
ModelMap map = new ModelMap();
|
|
|
PageInfo pageInfo = setPageInfo(page, size);
|
|
|
SearchFilter filter = new SearchFilter();
|
|
|
@@ -460,7 +476,8 @@ public class PublicInquiryController {
|
|
|
public ModelMap publicInquiry(Integer page, Integer size, Long en_uu, String _state,
|
|
|
String keyword, String user_tel, Long fromDate, Long endDate) {
|
|
|
long start = System.currentTimeMillis();
|
|
|
- ModelMap map = new ModelMap();
|
|
|
+ log.info("/inquiry/mobile/v2, 查询公共询价信息, page:{}, size:{}, en_uu:{}, _state:{}, keyword:{}, user_tel:{}, fromDate:{}, endDate:{}",
|
|
|
+ page, size, en_uu, _state, keyword, user_tel, fromDate, endDate);ModelMap map = new ModelMap();
|
|
|
PageInfo pageInfo = setPageInfo(page, size);
|
|
|
SearchFilter filter = new SearchFilter();
|
|
|
filter.setFromDate(fromDate);
|