Browse Source

日志修改

dongbw 7 years ago
parent
commit
3b714f7131

+ 26 - 28
src/main/java/com/uas/ps/inquiry/controller/ErpDownloadController.java

@@ -1,6 +1,5 @@
 package com.uas.ps.inquiry.controller;
 
-import com.uas.ps.httplog.annotation.HttpLog;
 import com.uas.ps.inquiry.entity.*;
 import com.uas.ps.inquiry.model.InquiryEnRemind;
 import com.uas.ps.inquiry.model.PublicInquiryItem;
@@ -20,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 
@@ -56,12 +54,12 @@ public class ErpDownloadController {
      * @return
      * @throws UnsupportedEncodingException
      */
-    @HttpLog
     @RequestMapping(method = RequestMethod.POST)
     public void saveInquiries(@RequestBody List<BatchInquiry> inquiries, Long enuu, String address) throws NotFoundException, UnsupportedEncodingException {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/public post, ERP上传公共询价, size: {}, enuu: {}, 报价的应用来源: {}", inquiries.size(), enuu, InquirySource.ERP.name());
         publicInquiryService.save(inquiries, enuu, URLDecoder.decode(address, "UTF-8"));
-        log.info("/inquiry/public post, ERP上传公共询价, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时:{}", inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/public post, 耗时:{}", (System.currentTimeMillis() - start));
     }
 
     /**
@@ -71,12 +69,12 @@ public class ErpDownloadController {
      * @param enuu      询价企业UU
      * @throws UnsupportedEncodingException
      */
-    @HttpLog
     @RequestMapping(value = "/check", method = RequestMethod.POST)
     public void updateInquiryStatus(@RequestBody List<BatchInquiry> inquiries, Long enuu) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/public/check post, ERP设置公共询价不能报价, size: {}, enuu: {}", inquiries.size(), enuu);
         publicInquiryService.updateStatus(inquiries, enuu);
-        log.info("/inquiry/public/check post, ERP设置公共询价不能报价, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时:{}", inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/check post, 耗时:{}", (System.currentTimeMillis() - start));
     }
 
     /**
@@ -86,12 +84,12 @@ public class ErpDownloadController {
      * @author hejq
      * @date 2018-01-14 15:20
      */
-    @HttpLog
     @RequestMapping(value = "/quotation", method = RequestMethod.GET)
     public List<InquiryDetail> getReply(Long enuu) {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/public/quotation, ERP获取供应商报价信息, enuu: {}, 应用来源: {}", enuu, InquirySource.ERP.name());
         List<InquiryDetail> details = publicInquiryService.findNotUploadReply(enuu);
-        log.info("/inquiry/public/quotation, ERP获取供应商报价信息, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时:{}", details.size(), Constant.UU, enuu, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/quotation, size: {}, 耗时:{}", details.size(),(System.currentTimeMillis() - start));
         return details;
     }
 
@@ -102,13 +100,13 @@ public class ErpDownloadController {
      * @return
      * @throws UnsupportedEncodingException
      */
-    @HttpLog
     @RequestMapping(value = "/reply/back", method = RequestMethod.POST)
     public void onReplySuccess(@RequestBody String data, Long enuu) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/public/reply/back post, ERP获取报价信息回调, id: {}, enuu: {}, 应用来源: {}", data,  enuu, InquirySource.ERP.name());
         String[] idArray = URLDecoder.decode(data, "UTF-8").split(",");
         publicInquiryService.onReplyUploadSuccess(idArray);
-        log.info("/inquiry/public/reply/back post, ERP获取报价信息返回id, id: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", idArray, Constant.UU, enuu, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/reply/back post, 耗时: {}", (System.currentTimeMillis() - start));
     }
 
     /**
@@ -117,12 +115,12 @@ public class ErpDownloadController {
      * @param details 封装的data信息
      * @throws UnsupportedEncodingException
      */
-    @HttpLog
     @RequestMapping(value = "/checking", method = RequestMethod.POST)
     public void checkInquiry(@RequestBody List<InquiryDetail> details, Long enuu) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/public/checking post, ERP提交报价信息应用禁止报价, size: {}, enuu: {}, 应用来源: {}", details.size(), enuu, InquirySource.ERP.name());
         publicInquiryService.updateInquiryStatus(details, enuu);
-        log.info("/inquiry/public/checking post , ERP提交报价信息应用禁止报价, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", details.size(), Constant.UU, enuu, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/checking post, 耗时: {}", (System.currentTimeMillis() - start));
     }
 
     /**
@@ -131,12 +129,12 @@ public class ErpDownloadController {
      * @return 封装的data信息
      * @throws UnsupportedEncodingException
      */
-    @HttpLog
     @RequestMapping(value = "/reply/decide", method = RequestMethod.POST)
     public void onReplyDecide(@RequestBody List<InquiryDecide> decides, Long enuu) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/public/reply/decide post, ERP针对供应报价信息进行(不)采纳操作, size: {}, enuu: {}, 报价的应用来源: {}", decides.size(), enuu, InquirySource.ERP.name());
         publicInquiryService.onReplyDecide(decides, enuu);
-        log.info("/inquiry/public/reply/decide post, ERP针对供应报价信息进行(不)采纳操作, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", decides.size(), Constant.UU, enuu, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/reply/decide post, 耗时: {}", (System.currentTimeMillis() - start));
     }
 
     /**
@@ -146,12 +144,12 @@ public class ErpDownloadController {
      * @return
      * @throws UnsupportedEncodingException
      */
-    @HttpLog
     @RequestMapping(value = "/invalid", method = RequestMethod.POST)
     public void onReplyInvalid(@RequestBody List<Inquiry> inquiries, Long enuu) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/public/invalid post, ERP作废公共询价单返回数据到公共服务, size: {},  enuu: {}, 报价的应用来源: {}", inquiries.size(), enuu, InquirySource.ERP.name());
         publicInquiryService.onReplyInvalid(inquiries, enuu);
-        log.info("/inquiry/public/invalid post, ERP作废公共询价单返回数据到公共服务, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/invalid post, 耗时: {}", (System.currentTimeMillis() - start));
     }
 
     /**
@@ -161,12 +159,12 @@ public class ErpDownloadController {
      * @author dongbw
      * @date 2018年7月3日 15:49:11
      */
-    @HttpLog
     @RequestMapping(value = "/down/decide", method = RequestMethod.GET)
     public List<PublicInquiryItem> downloadDecide(Long enUU) {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/public/down/decide, 买家采纳或拒绝之后,上传到报价方UAS,enuu: {}, ", enUU);
         List<PublicInquiryItem> items = publicInquiryService.findDecideNotUploadReply(enUU);
-        log.info("/inquiry/public/down/decide, 买家采纳或拒绝之后,上传到报价方UAS, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", items.size(), Constant.UU, enUU, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/down/decide, 买家采纳或拒绝之后,上传到报价方UAS, size: {}, 耗时: {}", items.size(), (System.currentTimeMillis() - start));
         return items;
     }
 
@@ -178,17 +176,17 @@ public class ErpDownloadController {
      * @author dongbw
      * @date 2018年7月3日 15:49:11
      */
-    @HttpLog
     @RequestMapping(value = "/down/decide/back", method = RequestMethod.POST)
     public ModelMap downloadDecideBack(String ids, Long enUU) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/public/down/decide/back  post, 买家采纳或拒绝之后,上传到报价方UAS的回调, ids: {}, enuu: {},", ids, enUU);
         String[] idArray = URLDecoder.decode(ids, "UTF-8").split(",");
         List<Long> idList = new ArrayList<>();
         for (String id : idArray) {
             idList.add(Long.valueOf(id));
         }
         ModelMap map = publicInquiryService.downloadDecideBack(idList, enUU);
-        log.info("/inquiry/public/down/decide/back  post, 买家采纳或拒绝之后,上传到报价方UAS的回调, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时:{}", idList.size(), Constant.UU, enUU, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/down/decide/back  post, 耗时:{}", (System.currentTimeMillis() - start));
         return map;
     }
 
@@ -199,12 +197,12 @@ public class ErpDownloadController {
      * @author dongbw
      * @date 2018年7月3日 16:21
      */
-    @HttpLog
     @RequestMapping(value = "/down/reply", method = RequestMethod.GET)
     public List<PublicInquiryItem> downReply(Long enUU) {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/public/down/reply, enuu: {},", enUU);
         List<PublicInquiryItem> details = publicInquiryService.findNotUploadToUas(enUU);
-        log.info("/inquiry/public/down/reply, ERP获取供应商报价信息, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", details.size(), Constant.UU, enUU, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/down/reply, ERP获取供应商报价信息, size: {}, 耗时: {}", details.size(), (System.currentTimeMillis() - start));
         return details;
     }
 
@@ -216,13 +214,13 @@ public class ErpDownloadController {
      * @author dongbw
      * @date 2018年7月3日 16:21
      */
-    @HttpLog
     @RequestMapping(value = "/down/reply/back", method = RequestMethod.POST)
     public void onReplyDownSuccess(String ids, Long enUU) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/public/down/reply/back post , 将报价方在商城报价的单据同步到报价方UAS之后回调修改状态, ids: {}, enuu: {}", ids, enUU);
         String[] idArray = URLDecoder.decode(ids, "UTF-8").split(",");
         publicInquiryService.onReplyDownLoadSuccess(idArray);
-        log.info("/inquiry/public/down/reply/back post , 将报价方在商城报价的单据同步到报价方UAS之后回调修改状态, id: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", idArray, Constant.UU, enUU, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/down/reply/back post, 耗时: {}", (System.currentTimeMillis() - start));
     }
 
     /**
@@ -232,12 +230,12 @@ public class ErpDownloadController {
      * @author dongbw
      * @date 2018年7月23日 10:34:54
      */
-    @HttpLog
     @RequestMapping(value = "/enremind", method = RequestMethod.GET)
     public List<InquiryEnRemind> downEnRemind(Long vendUU) {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/public/enremind, UAS获取商城账套下企业商机, vendUU: {}", vendUU);
         List<InquiryEnRemind> details = publicInquiryService.findNotUploadEnRemind(vendUU);
-        log.info("/inquiry/public/enremind, UAS获取商城账套下企业商机, size: {}, Constant: {}, vendUU: {}, 报价的应用来源: {}, 耗时: {}", details.size(), Constant.UU, vendUU, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/enremind, UAS获取商城账套下企业商机, size: {}, 耗时: {}", details.size(), (System.currentTimeMillis() - start));
         return details;
     }
 
@@ -249,12 +247,12 @@ public class ErpDownloadController {
      * @author dongbw
      * @date 2018年7月23日 10:34:50
      */
-    @HttpLog
     @RequestMapping(value = "/enremind/back", method = RequestMethod.POST)
     public void downEnRemindSuccess(String ids, Long vendUU) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/public/enremind/back post, UAS获取商城账套下企业商机之后,回调修改状态, ids: {},  vendUU: {},", ids, vendUU);
         String[] idArray = URLDecoder.decode(ids, "UTF-8").split(",");
         publicInquiryService.downEnRemindSuccess(idArray, vendUU);
-        log.info("/inquiry/public/enremind/back post, UAS获取商城账套下企业商机之后 之后 回调 修改状态, id: {}, Constant: {}, vendUU: {}, 报价的应用来源: {},  耗时: {}", Arrays.toString(idArray), Constant.UU, vendUU, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/enremind/back post, 耗时: {}", (System.currentTimeMillis() - start));
     }
 }

+ 21 - 14
src/main/java/com/uas/ps/inquiry/controller/InquiryForBuyerController.java

@@ -1,10 +1,9 @@
 package com.uas.ps.inquiry.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.uas.ps.httplog.annotation.HttpLog;
-import com.uas.ps.inquiry.entity.Constant;
 import com.uas.ps.inquiry.entity.InquiryDetailInfo;
 import com.uas.ps.inquiry.entity.InquiryProductInfo;
-import com.uas.ps.inquiry.entity.InquirySource;
 import com.uas.ps.inquiry.model.PurcInquiry;
 import com.uas.ps.inquiry.model.PurcInquiryItemInfo;
 import com.uas.ps.inquiry.page.PageInfo;
@@ -44,8 +43,9 @@ public class InquiryForBuyerController {
     @RequestMapping(value = "/detail", method = RequestMethod.GET)
     public InquiryDetailInfo findById(Long id, Long enuu) {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/buyer/save, 客户查询供应商报价详情, id: {}, enuu: {}, ", id, enuu);
         InquiryDetailInfo detailInfo = inquiryService.findById(id, enuu);
-        log.info("/inquiry/buyer/save, 客户查询供应商报价详情, id: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", id, Constant.UU, enuu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/buyer/save, 耗时: {}", (System.currentTimeMillis() - start));
         return detailInfo;
     }
 
@@ -60,9 +60,10 @@ public class InquiryForBuyerController {
     @RequestMapping(value = "/inquiryList", method = RequestMethod.GET)
     public Page<PurcInquiry> getInquiry(PageInfo pageInfo, SearchFilter searchFilter) {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/buyer/inquiryList, 通过企业UU和分页参数获取已发布的询价信息, pageInfo: {}, searchFilter: {}", JSON.toJSON(pageInfo), JSON.toJSON(searchFilter));
         Page<PurcInquiry> page = inquiryService.findByPageInfo(pageInfo, searchFilter);
         page = inquiryService.setQuotedAmount(page);
-        log.info("/inquiry/buyer/inquiryList, 通过企业UU和分页参数获取已发布的询价信息, UserUU: {}, enuu: {}, 报价的应用来源: {},耗时: {}", searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/buyer/inquiryList, 耗时: {}", (System.currentTimeMillis() - start));
         return page;
     }
 
@@ -79,8 +80,9 @@ public class InquiryForBuyerController {
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     public Page<PurcInquiryItemInfo> getInquiryList(PageInfo pageInfo, SearchFilter searchFilter, String state, Integer overdue) {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/buyer/list, 通过企业UU和分页参数获取已发布的询价明细, pageInfo: {}, searchFilter: {}, state: {}, overdue: {}", JSON.toJSON(pageInfo), JSON.toJSON(searchFilter), state, overdue);
         Page<PurcInquiryItemInfo> page = inquiryService.findTodoByPageInfo(pageInfo, searchFilter, state, overdue);
-        log.info("/inquiry/buyer/list, 通过企业UU和分页参数获取已发布的询价明细, UserUU: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/buyer/list, 耗时: {}", (System.currentTimeMillis() - start));
         return page;
     }
 
@@ -94,10 +96,10 @@ public class InquiryForBuyerController {
     @HttpLog
     @RequestMapping(value = "/product/detail", method = RequestMethod.GET)
     public InquiryProductInfo findInquiryDetailById(Long id, Long enuu) {
-        /*logger.log("公共询价", "针对客户查询单个物料明细的报价情况", null, Constant.UU, enuu, InquirySource.PLAIN.name());*/
         long start = System.currentTimeMillis();
+        log.info("/inquiry/buyer/product/detail, 针对客户查询单个物料明细的报价情况, id: {}, enuu: {}, ", id, enuu);
         InquiryProductInfo info = inquiryService.findInquiryDetailById(id, enuu);
-        log.info("/inquiry/buyer/product/detail, 针对客户查询单个物料明细的报价情况, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", Constant.UU, enuu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/buyer/product/detail, 耗时: {}", (System.currentTimeMillis() - start));
         return info;
     }
 
@@ -115,8 +117,9 @@ public class InquiryForBuyerController {
     public Page<PurcInquiryItemInfo> findQuotationsByPage(PageInfo pageInfo, SearchFilter searchFilter, Long enUU, Long userUU, Short overdue) {
         /* logger.log("公共询价", "客户查询供应商报价信息", null, userUU, enUU, InquirySource.MALL.name());*/
         long start = System.currentTimeMillis();
+        log.info("/inquiry/buyer/quotations, 客户查询供应商报价信息, pageInfo: {}, searchFilter: {}, enUU: {}, userUU: {}, overdue: {}",  JSON.toJSON(pageInfo), JSON.toJSON(searchFilter), enUU, userUU, overdue);
         Page<PurcInquiryItemInfo> page = inquiryService.findQuotationsByPage(pageInfo, searchFilter, enUU, userUU, overdue);
-        log.info("/inquiry/buyer/quotations, 客户查询供应商报价信息, userUU: {}, enUU: {}, 报价的应用来源: {}, 耗时: {}",  userUU, enUU, InquirySource.MALL.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/buyer/quotations, 耗时: {}", (System.currentTimeMillis() - start));
         return page;
     }
 
@@ -130,8 +133,9 @@ public class InquiryForBuyerController {
     @RequestMapping(value = "/quotation", method = RequestMethod.GET)
     public PurcInquiryItemInfo findQuotationById(Long id) {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/buyer/quotation, 针对客户单个公共询价 查询供应商报价信息, id: {}", id);
         PurcInquiryItemInfo itemInfo = inquiryService.findQuotationById(id);
-        log.info("/inquiry/buyer/quotation, 针对客户单个公共询价 查询供应商报价信息, id: {}, 耗时: {}", id, (System.currentTimeMillis() - start));
+        log.info("/inquiry/buyer/quotation, 耗时: {}", (System.currentTimeMillis() - start));
         return itemInfo;
     }
 
@@ -145,12 +149,12 @@ public class InquiryForBuyerController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     public PurcInquiry saveInquiry(@RequestBody PurcInquiry inquiry) throws Exception {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/buyer/save post, 新增公共询价信息,  inquiry: {}",  JSON.toJSON(inquiry));
         inquiry = inquiryService.saveInquiry(inquiry);
+        log.info("/inquiry/buyer/save post, 耗时: {}", (System.currentTimeMillis() - start));
         if (null != inquiry.getId()) {
-            log.info("/inquiry/buyer/save post, 新增公共询价信息, 单号: {}, 生成id: {}, RecorderUU: {}, EnUU: {}, 报价的应用来源: {}, 耗时: {}",  inquiry.getCode(), inquiry.getId(), inquiry.getRecorderUU(), inquiry.getEnUU(), InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
             return inquiry;
         } else {
-            log.info("/inquiry/buyer/save post, 新增公共询价信息失败, 单号: {}, RecorderUU: {}, EnUU: {}, 报价的应用来源: {}, 耗时: {}",  inquiry.getCode(), inquiry.getRecorderUU(), inquiry.getEnUU(), InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
             throw new Exception("保存失败");
         }
     }
@@ -167,8 +171,9 @@ public class InquiryForBuyerController {
     @RequestMapping(value = "/decide", method = RequestMethod.POST)
     public void decideQuote(Long id, Short status, Long enuu, Long useruu) throws Exception {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/buyer/decide post, 通过明细id对供应商报价进行审核操作, id: {}, 采纳状态: {}, UserUU: {}, Enuu: {}", id, status, useruu, enuu);
         inquiryService.decideQuote(id, status);
-        log.info("/inquiry/buyer/decide post, 通过明细id对供应商报价进行审核操作, id: {}, 采纳状态: {}, UserUU: {}, Enuu: {}, 报价的应用来源: {}, 耗时: {}", id, status, useruu, enuu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/buyer/decide post, 耗时: {}", (System.currentTimeMillis() - start));
     }
 
     /**
@@ -183,8 +188,9 @@ public class InquiryForBuyerController {
     @RequestMapping(value = "/adopt", method = RequestMethod.POST)
     public void adoptQuote(Long id, Short status, Long enuu, Long useruu) throws Exception {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/buyer/adopt post , 通过明细id采纳供应商报价, id: {}, 采纳状态: {}, UserUU: {}, Enuu: {}", id, status, useruu, enuu);
         inquiryService.adpotQuote(id, status);
-        log.info("/inquiry/buyer/adopt post , 通过明细id采纳供应商报价, id: {}, 采纳状态: {}, UserUU: {}, Enuu: {}, 报价的应用来源: {}, 耗时: {}", id, status, useruu, enuu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/buyer/adopt post , 耗时: {}", (System.currentTimeMillis() - start));
     }
 
 
@@ -200,8 +206,9 @@ public class InquiryForBuyerController {
     @RequestMapping(value = "/refuse", method = RequestMethod.POST)
     public void refuseQuote(Long id, Short status, Long enuu, Long useruu,String refusereason) throws Exception {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/buyer/refuse post, 通过明细id拒绝供应商报价, id: {}, 采纳状态: {}, UserUU: {}, Enuu: {}, reson: {}", id, status, useruu, enuu, refusereason);
         inquiryService.refuseQuote(id, status, refusereason);
-        log.info("/inquiry/buyer/refuse post, 通过明细id拒绝供应商报价, id: {}, 采纳状态: {}, UserUU: {}, Enuu: {}, 报价的应用来源: {}, 耗时: {}", id, status, useruu, enuu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/buyer/refuse post, 耗时: {}", (System.currentTimeMillis() - start));
     }
 
 

+ 27 - 15
src/main/java/com/uas/ps/inquiry/controller/InquiryForSaleController.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.uas.ps.core.page.exception.IllegalOperatorException;
 import com.uas.ps.httplog.annotation.HttpLog;
 import com.uas.ps.inquiry.domain.IPage;
-import com.uas.ps.inquiry.entity.Constant;
 import com.uas.ps.inquiry.entity.InquirySource;
 import com.uas.ps.inquiry.model.*;
 import com.uas.ps.inquiry.page.PageInfo;
@@ -53,8 +52,9 @@ public class InquiryForSaleController {
     @RequestMapping(value = "/item/saveQuote", method = RequestMethod.POST)
     public ModelMap saveQuote(@RequestBody PublicInquiryItem publicInquiryItem) throws Exception {
         Long start = System.currentTimeMillis();
+        log.info("/inquiry/sale/item/saveQuote post,保存报价接口, publciInquiryItem: {}", JSON.toJSON(publicInquiryItem));
         ModelMap result = saleService.saveQuote(publicInquiryItem);
-        log.info("/inquiry/sale/item/saveQuote post,保存报价接口, 报价单Id:{}, 耗时: {}", publicInquiryItem.getId(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/sale/item/saveQuote post, 耗时: {}", (System.currentTimeMillis() - start));
         publicInquiryService.ReceiveMessage(publicInquiryItem, InquirySource.MALL.name());
 //        if (null != item) {
 //            PublicInquiry inquiry = item.getInquiry();
@@ -76,8 +76,9 @@ public class InquiryForSaleController {
     @RequestMapping(value = "/inquiry/detail", method = RequestMethod.GET)
     public PublicInquiryItem findById(Long itemId, Long en_uu) throws IllegalAccessException {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/sale/inquiry/detail , 查询已转报价的明细, id: {}, en_uu: {}, ", itemId, en_uu);
         PublicInquiryItem item = saleService.findById(itemId, en_uu);
-        log.info("/inquiry/sale/inquiry/detail , 查询已转报价的明细, id: {}, Constant: {}, en_uu: {}, 报价的应用来源: {}, 耗时: {}", itemId, Constant.UU, en_uu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/sale/inquiry/detail , 耗时: {}", (System.currentTimeMillis() - start));
         return item;
     }
 
@@ -92,8 +93,9 @@ public class InquiryForSaleController {
     @RequestMapping(value = "/publicInquiry/detail", method = RequestMethod.GET)
     public ModelMap findInquiryById(Long id, Long enuu) {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/sale/publicInquiry/detail get, 通过id查询公共询价详情, id: {},  enuu: {},", id, enuu);
         ModelMap map = saleService.findByIdAndEnuu(id, enuu);
-        log.info("/inquiry/sale/publicInquiry/detail get, 通过id查询公共询价详情, id: {}, Constant: {}, en_uu: {}, 报价的应用来源: {}, 耗时: {}", id, Constant.UU, enuu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/sale/publicInquiry/detail get,  耗时: {}", (System.currentTimeMillis() - start));
         return map;
     }
 
@@ -108,8 +110,9 @@ public class InquiryForSaleController {
     @RequestMapping(value = "/attach", method = RequestMethod.POST)
     public String addAttachs(@RequestBody Attach attach) throws Exception {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/sale/attach post, 卖家报价时上传附件信息,附件: {}", JSON.toJSON(attach));
         attach = saleService.addAttachs(attach);
-        log.info("/inquiry/sale/attach post, 卖家报价时上传附件信息,附件名称: {}, 耗时: {}", attach.getName(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/sale/attach post,  耗时: {}", (System.currentTimeMillis() - start));
         if (null != attach.getId()) {
             return JSONObject.toJSONString(attach);
         } else {
@@ -131,8 +134,9 @@ public class InquiryForSaleController {
     @RequestMapping(value = "/renew", method = RequestMethod.POST)
     public String saveItem(@RequestBody PublicInquiryItem inquiryItem) throws Exception {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/sale/renew post,保存询价信息,inquiryItem:{}", JSON.toJSON(inquiryItem));
         inquiryItem = saleService.save(inquiryItem);
-        log.info("/inquiry/sale/renew post,保存询价信息,询价单Id:{}, 耗时: {}", inquiryItem.getId(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/sale/renew post,耗时: {}", (System.currentTimeMillis() - start));
         return JSONObject.toJSONString(inquiryItem);
     }
 
@@ -147,8 +151,9 @@ public class InquiryForSaleController {
     @RequestMapping(value = "/quote", method = RequestMethod.GET)
     public PublicInquiryItem findBySourceId(Long id, Long en_uu) {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/sale/quote , 查询公共询价单是否已报价, id: {}, en_uu: {}", id, en_uu);
         PublicInquiryItem item = saleService.findBySourceIdAndEnuu(id, en_uu);
-        log.info("/inquiry/sale/quote , 查询公共询价单是否已报价, id: {}, Constant: {}, en_uu: {}, 报价的应用来源: {}, 耗时: {}", id, Constant.UU, en_uu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/sale/quote , 耗时: {}", (System.currentTimeMillis() - start));
         return item;
     }
 
@@ -165,13 +170,14 @@ public class InquiryForSaleController {
     @RequestMapping(value = "/remind", method = RequestMethod.GET)
     public IPage<InquiryRemind> findByUserInfo(Long useruu, Long enuu, PageInfo pageInfo, SearchFilter searchFilter) {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/sale/remind, 查询推荐询价信息, useruu: {}, enuu: {}, pageInfo: {}, searchFilter: {}", useruu, enuu, JSON.toJSON(pageInfo), JSON.toJSON(searchFilter));
         if (useruu == null || enuu == null) {
             throw new IllegalAccessError("非法访问");
         } else {
             pageInfo.filter("vendUU", enuu);
             pageInfo.filter("vendUserUU", useruu);
             IPage<InquiryRemind> remindIPage = saleService.findRemindByPageInfo(pageInfo, searchFilter);
-            log.info("/inquiry/sale/remind, 查询推荐询价信息, useruu: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", useruu, enuu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
+            log.info("/inquiry/sale/remind, 耗时: {}", (System.currentTimeMillis() - start));
             return remindIPage;
         }
     }
@@ -189,12 +195,13 @@ public class InquiryForSaleController {
     @RequestMapping(value = "/enremind", method = RequestMethod.GET)
     public IPage<InquiryEnRemind> findEnRemind(Long useruu, Long enuu, PageInfo pageInfo, SearchFilter searchFilter) {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/sale/enremind, 查询企业推荐询价信息, useruu: {}, enuu: {}, pageInfo: {}, searchFilter: {}", useruu, enuu, JSON.toJSON(pageInfo), JSON.toJSON(searchFilter));
         if (useruu == null || enuu == null) {
             throw new IllegalAccessError("非法访问");
         } else {
             pageInfo.filter("vendUU", enuu);
             IPage<InquiryEnRemind> enRemindIPage = saleService.findEnRemindByPageInfo(pageInfo, searchFilter);
-            log.info("/inquiry/sale/enremind, 查询企业推荐询价信息, useruu: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", useruu, enuu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
+            log.info("/inquiry/sale/enremind, 耗时: {}", (System.currentTimeMillis() - start));
             return enRemindIPage;
         }
     }
@@ -210,8 +217,9 @@ public class InquiryForSaleController {
     @RequestMapping(value = "/allot/enremind", method = RequestMethod.POST)
     public ModelMap allotEnRemind(Long userUU, Long enRemindId) {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/sale/allot/enremind post,分配企业商机,useruu: {}, enRemindId: {}", userUU, enRemindId);
         ModelMap modelMap = saleService.allotEnRemind(userUU, enRemindId);
-        log.info("/inquiry/sale/allot/enremind post,分配企业商机,useruu: {}, enRemindId: {}, 耗时: {}", userUU, enRemindId,(System.currentTimeMillis() - start));
+        log.info("/inquiry/sale/allot/enremind post, 耗时: {}", (System.currentTimeMillis() - start));
         return modelMap;
     }
 
@@ -227,8 +235,9 @@ public class InquiryForSaleController {
     @RequestMapping(value = "/allot/inquiry", method = RequestMethod.POST)
     public ModelMap allotInquiry(Long userUU, Long enUU, Long itemId) {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/sale/allot/inquiry post, 分配平台商机, useruu: {}, enuu: {}, itemId: {},", userUU, enUU, itemId);
         ModelMap map = saleService.allotInquiry(userUU, enUU, itemId);
-        log.info("/inquiry/sale/allot/inquiry post, 分配平台商机, useruu: {}, enuu: {}, itemId: {}, 耗时: {}", userUU, enUU, itemId, (System.currentTimeMillis() - start));
+        log.info("/inquiry/sale/allot/inquiry post, 耗时: {}", (System.currentTimeMillis() - start));
         return map;
     }
 
@@ -248,13 +257,14 @@ public class InquiryForSaleController {
     @RequestMapping(value = "/mobile/quote", method = RequestMethod.POST)
     public ModelMap quote(Long inquiryItemId, Long en_uu, Long useruu, Long leadtime, Double minPackQty, Double minOrderQty, String replies, String currency, Float taxrate) throws Exception {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/sale/mobile/quote post, 作为卖家,对公共询价进行报价操作, sourceid: {}, useruu: {}, en_uu:{}", inquiryItemId,
+                useruu, en_uu);
         if (StringUtils.isEmpty(en_uu) || StringUtils.isEmpty(useruu)) {
             throw new IllegalOperatorException("en_uu或useruu不能为空");
         }
         List<PublicInquiryReply> replyList = JSONObject.parseArray(replies, PublicInquiryReply.class);
         ModelMap map = saleService.quoteInquiry(inquiryItemId, en_uu, useruu, replyList, leadtime, minPackQty, minOrderQty, currency, taxrate);
-        log.info("/inquiry/sale/mobile/quote post, 作为卖家,对公共询价进行报价操作, sourceid: {}, useruu: {}, en_uu, 报价的应用来源: {},耗时: {}", inquiryItemId,
-                useruu, en_uu, InquirySource.UU.name(), (System.currentTimeMillis() - start));
+        log.info("/inquiry/sale/mobile/quote post, 耗时: {}", (System.currentTimeMillis() - start));
         return map;
     }
 
@@ -269,8 +279,9 @@ public class InquiryForSaleController {
     @RequestMapping(value = "/item/add", method = RequestMethod.POST)
     public String saveInquiryItem(@RequestBody PublicInquiryItem item) throws Exception {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/sale/item/add post,作为卖家,新增报价,item: {}",JSON.toJSON(item));
         item = saleService.add(item);
-        log.info("/inquiry/sale/item/add post,作为卖家,新增报价,询价单Id: {}, 耗时: {}",item.getId() ,(System.currentTimeMillis() - start));
+        log.info("/inquiry/sale/item/add post, 耗时: {}", (System.currentTimeMillis() - start));
         if (null != item.getId()) {
             return JSONObject.toJSONString(item);
         } else {
@@ -290,8 +301,9 @@ public class InquiryForSaleController {
     @RequestMapping(value = "/item/save", method = RequestMethod.POST)
     public String saveInquiryItems(@RequestBody PublicInquiryItem item) throws Exception {
         long start = System.currentTimeMillis();
+        log.info("/inquiry/sale/item/save post, 作为卖家,对公共询价进行报价操作, item: {}", JSON.toJSON(item));
         item = saleService.saveItem(item);
-        log.info("/inquiry/sale/item/save post, 作为卖家,对公共询价进行报价操作, sourceid: {}, id: {}, VendUserUU: {}, VendUU: {} , QutoApp: {}, 耗时: {}", item.getSourceId() == null ? null : item.getSourceId(), item.getId(), item.getVendUserUU(), item.getVendUU(), item.getQutoApp(),(System.currentTimeMillis() - start));
+        log.info("/inquiry/sale/item/save post, 耗时: {}", (System.currentTimeMillis() - start));
         publicInquiryService.ReceiveMessage(item,InquirySource.MALL.name());
         if (null != item) {
             PublicInquiry inquiry = item.getInquiry();

+ 12 - 8
src/main/java/com/uas/ps/inquiry/controller/PublicApiController.java

@@ -38,9 +38,10 @@ public class PublicApiController {
     @RequestMapping(value = "/sum/publish/personal", method = RequestMethod.GET)
     public ModelMap sumPersonalPublish(Long enuu, Long useruu, Long starttime, Long endtime) {
         long start = System.currentTimeMillis();
+        log.info("/api/sum/publish/personal get 参数:enuu: {}, useruu: {}, starttime: {}, endtime: {}",
+                enuu, useruu, new Date(starttime), new Date(endtime));
         ModelMap map = publicInquiryService.sumPersonalPublish(enuu, useruu, starttime, endtime);
-        log.info("/api/sum/publish/personal get 参数:enuu: {}, useruu: {}, starttime: {}, endtime: {}, 耗时: {}",
-                enuu, useruu, new Date(starttime), new Date(endtime), (System.currentTimeMillis() - start));
+        log.info("/api/sum/publish/personal get 耗时: {}", (System.currentTimeMillis() - start));
         return map;
     }
 
@@ -55,9 +56,10 @@ public class PublicApiController {
     @RequestMapping(value = "/sum/publish/enterprise", method = RequestMethod.GET)
     public ModelMap sumEnterprisePublish(Long enuu, Long starttime, Long endtime) {
         long start = System.currentTimeMillis();
+        log.info("/api/sum/publish/enterprise get 参数:enuu: {}, starttime: {}, endtime: {}",
+                enuu, new Date(starttime), new Date(endtime));
         ModelMap map = publicInquiryService.sumEnterprisePublish(enuu, starttime, endtime);
-        log.info("/api/sum/publish/enterprise get 参数:enuu: {}, starttime: {}, endtime: {}, 耗时: {}",
-                enuu, new Date(starttime), new Date(endtime), (System.currentTimeMillis() - start));
+        log.info("/api/sum/publish/enterprise get 耗时: {}", (System.currentTimeMillis() - start));
         return map;
     }
 
@@ -73,9 +75,10 @@ public class PublicApiController {
     @RequestMapping(value = "/sum/reply/personal", method = RequestMethod.GET)
     public ModelMap sumPersonalReply(Long enuu, Long useruu, Long starttime, Long endtime) {
         long start = System.currentTimeMillis();
+        log.info("/api/sum/reply/personal get 参数:enuu: {}, useruu: {}, starttime: {}, endtime: {}",
+                enuu, useruu, new Date(starttime), new Date(endtime));
         ModelMap map = publicInquiryService.sumPersonalReply(enuu, useruu, starttime, endtime);
-        log.info("/api/sum/reply/personal get 参数:enuu: {}, useruu: {}, starttime: {}, endtime: {}, 耗时: {}",
-                enuu, useruu, new Date(starttime), new Date(endtime), (System.currentTimeMillis() - start));
+        log.info("/api/sum/reply/personal get 耗时: {}", (System.currentTimeMillis() - start));
         return map;
     }
 
@@ -90,9 +93,10 @@ public class PublicApiController {
     @RequestMapping(value = "/sum/reply/enterprise", method = RequestMethod.GET)
     public ModelMap sumEnterpriseReply(Long enuu, Long starttime, Long endtime) {
         long start = System.currentTimeMillis();
+        log.info("/api/sum/reply/enterprise get 参数:enuu: {}, starttime: {}, endtime: {}",
+                enuu, new Date(starttime), new Date(endtime));
         ModelMap map = publicInquiryService.sumEnterpriseReply(enuu, starttime, endtime);
-        log.info("/api/sum/reply/enterprise get 参数:enuu: {}, starttime: {}, endtime: {}, 耗时: {}",
-                enuu, new Date(starttime), new Date(endtime), (System.currentTimeMillis() - start));
+        log.info("/api/sum/reply/enterprise get 耗时: {}", (System.currentTimeMillis() - start));
         return map;
     }
 }

+ 29 - 12
src/main/java/com/uas/ps/inquiry/controller/PublicInquiryController.java

@@ -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);