Merge branch 'hotfix-0903-huyy' into dev

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

@@ -32,7 +32,6 @@ import java.util.Map;
  * 求购截止，每日晚上轮询一次
  *
  * @version 2018年6月12日 15:00  询价短信定时发送的任务移到这里  dongbw
-
  */
 @Component
 @EnableAsync
@@ -114,37 +113,37 @@ public class DeadlineTask {
      */
     private final Long MESSAGE_SENDERENUU = ContextUtils.getBean(AccessConfiguration.class).getSenderEnuu();
 
-    @Scheduled(cron =  "0 30 23 ? * *" )//每天23:30分执行
-    public void execute(){
-         List<PublicInquiryItem> d = purcInquiryItemDao.findendDate();
-            for(PublicInquiryItem param : d){
-                final String SMS_TYPE = "SM"; //发送信息
-                List<MessageModel> models = new ArrayList<MessageModel>();
-                String cmpCode = param.getCmpCode();
-                String cmp = cmpCode.length() > 10 ? cmpCode.substring(0, 10).concat("...") : cmpCode;
-                String content= param.getInquiry().getEnName()+"关于“型号："+ cmp +"“的求购【已截止】，您的报价尚未被采纳。";
-                MessageModel model = new MessageModel();
-                model.setType(INQUIRY_DECIDE_TYPE_MALL);
-                model.setProducerApp(SOURCEAPP_MALL);
-                model.setConsumerType(CUST_TYPE);
-                model.setConsumerApp(CONSUMERAPP_B2B_MALL);
-                model.setContent(content);
-                model.setRemark(String.valueOf(param.getInquiry().getId()));
-                model.setSourceId(param.getId());
-                model.setReceiverEnuu(param.getVendUU());
-                model.setReceiverUu(param.getVendUserUU());
-                model.setSenderEnuu(param.getInquiry().getEnUU());
-                if (null != param.getUserUU() || null != param.getInquiry().getRecorderUU()) {
-                    model.setSenderUu(param.getUserUU() != null ? param.getUserUU() : param.getInquiry().getRecorderUU());
-                } else {
-                    Enterprise enterprise = enterpriseDao.findOne(param.getInquiry().getEnUU());
-                    model.setSenderUu(null != enterprise ? enterprise.getAdminUU() : 0L);
-                }
-                model.setSmsType(SMS_TYPE);
-                models.add(model);
-                if (!CollectionUtils.isEmpty(models)) {
-                    sendMessage(models);
-                }
+    @Scheduled(cron = "0 30 23 ? * *")//每天23:30分执行
+    public void execute() {
+        List<PublicInquiryItem> d = purcInquiryItemDao.findendDate();
+        for (PublicInquiryItem param : d) {
+            final String SMS_TYPE = "SM"; //发送信息
+            List<MessageModel> models = new ArrayList<MessageModel>();
+            String cmpCode = param.getCmpCode();
+            String cmp = cmpCode.length() > 10 ? cmpCode.substring(0, 10).concat("...") : cmpCode;
+            String content = param.getInquiry().getEnName() + "关于“型号：" + cmp + "“的求购【已截止】，您的报价尚未被采纳。";
+            MessageModel model = new MessageModel();
+            model.setType(INQUIRY_DECIDE_TYPE_MALL);
+            model.setProducerApp(SOURCEAPP_MALL);
+            model.setConsumerType(CUST_TYPE);
+            model.setConsumerApp(CONSUMERAPP_B2B_MALL);
+            model.setContent(content);
+            model.setRemark(String.valueOf(param.getInquiry().getId()));
+            model.setSourceId(param.getId());
+            model.setReceiverEnuu(param.getVendUU());
+            model.setReceiverUu(param.getVendUserUU());
+            model.setSenderEnuu(param.getInquiry().getEnUU());
+            if (null != param.getUserUU() || null != param.getInquiry().getRecorderUU()) {
+                model.setSenderUu(param.getUserUU() != null ? param.getUserUU() : param.getInquiry().getRecorderUU());
+            } else {
+                Enterprise enterprise = enterpriseDao.findOne(param.getInquiry().getEnUU());
+                model.setSenderUu(null != enterprise ? enterprise.getAdminUU() : 0L);
+            }
+            model.setSmsType(SMS_TYPE);
+            models.add(model);
+            if (!CollectionUtils.isEmpty(models)) {
+                sendMessage(models);
+            }
 
         }
     }
@@ -159,9 +158,10 @@ public class DeadlineTask {
             @Override
             public void run() {
                 try {
+                    long start = System.currentTimeMillis();
                     log.info("发送消息");
                     String res = HttpUtil.doPost(PS_MESSAGE_URL + "/messages", FlexJsonUtils.toJsonDeep(models));
-                    log.info("消息请求发送");
+                    log.info("公共询价, 定时发动消息: {}, 耗时: {}", FlexJsonUtils.toJsonDeep(models), (System.currentTimeMillis() - start));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -172,20 +172,20 @@ public class DeadlineTask {
     /**
      * 每早9点、14点、17点发送询价通知短信
      */
-    @Scheduled(cron = "0 0 9,14,17 * * ?" )
+    @Scheduled(cron = "0 0 9,14,17 * * ?")
     private void sendMessageTiming() throws Exception {
         Calendar now = Calendar.getInstance();
         Integer hour = now.get(Calendar.HOUR_OF_DAY);
-        log.info(hour + "点定时统计询价单总数服务开启");
+        log.info("{}点定时统计询价单总数服务开启", hour);
         List<InquiryRemind> reminds = new ArrayList<>();
         switch (hour) {
-            case 9 :
-                reminds = inquiryService. findInquiryRemindGroupByVendUUAndVendUserUU(16);
+            case 9:
+                reminds = inquiryService.findInquiryRemindGroupByVendUUAndVendUserUU(16);
                 break;
-            case 14 :
+            case 14:
                 reminds = inquiryService.findInquiryRemindGroupByVendUUAndVendUserUU(5);
                 break;
-            case 17 :
+            case 17:
                 reminds = inquiryService.findInquiryRemindGroupByVendUUAndVendUserUU(3);
                 break;
             default:
@@ -193,18 +193,19 @@ public class DeadlineTask {
                 break;
         }
 
-        if(!CollectionUtils.isEmpty(reminds)){
+        if (!CollectionUtils.isEmpty(reminds)) {
             inquiryService.sendMessage(reminds);
         }
-        log.info(hour + "点定时统计询价单总数服务结束");
+        log.info("{}点定时统计询价单总数服务结束", hour);
     }
 
     /**
      * 每天0时 查询询价数据
      */
-    @Scheduled(cron =  "0 0 0 * * ?" )
-    public void inquiryDataQuery(){
+    @Scheduled(cron = "0 0 0 * * ?")
+    public void inquiryDataQuery() {
         List<InquiryData> inquiryDataList = inquiryDataDao.findAll();
+        long start = System.currentTimeMillis();
         String sql = "";
         List<Map<String, Object>> data = null;
         String jsonData = "";
@@ -216,5 +217,6 @@ public class DeadlineTask {
             System.out.println(jsonData);
             inquiryDataDao.save(inquiryData);
         }
+        log.info("公共询价, 查询询价数据: {}, 耗时: {}", jsonData, (System.currentTimeMillis() - start));
     }
 }

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

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.ArrayList;
@@ -25,9 +26,10 @@ import java.util.List;
 
 /**
  * Erp从公共服务下载数据接口
- *
+ * <p>
  * 便于将之前PublicInquiryController中的Erp相关方法整理到这个Controller，当前Controller路径与之相同。
- * @author  dongbw
+ *
+ * @author dongbw
  * @version 2018年7月3日 14:27:25
  */
 @RestController
@@ -48,9 +50,9 @@ public class ErpDownloadController {
     /**
      * 将买家ERP的公共询价写到公共询价服务中心
      *
-     * @param inquiries    公共询价信息
-     * @param enuu    询价企业UU
-     * @param address 询价企业地址信息
+     * @param inquiries 公共询价信息
+     * @param enuu      询价企业UU
+     * @param address   询价企业地址信息
      * @return
      * @throws UnsupportedEncodingException
      */
@@ -59,16 +61,14 @@ public class ErpDownloadController {
     public void saveInquiries(@RequestBody List<BatchInquiry> inquiries, Long enuu, String address) throws NotFoundException, UnsupportedEncodingException {
         long start = System.currentTimeMillis();
         publicInquiryService.save(inquiries, enuu, URLDecoder.decode(address, "UTF-8"));
-        log.info("/inquiry/public post 耗时:{}", (System.currentTimeMillis() - start));
-        log.info("公共询价, ERP上传公共询价, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}", inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name());
-
+        log.info("/inquiry/public post, ERP上传公共询价, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时:{}", inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
     }
 
     /**
      * erp的公共询价单提交待审核时，更新公共询价服务中心的单据设置为不能报价
      *
      * @param inquiries 封装的数据信息
-     * @param enuu 询价企业UU
+     * @param enuu      询价企业UU
      * @throws UnsupportedEncodingException
      */
     @HttpLog
@@ -76,9 +76,7 @@ public class ErpDownloadController {
     public void updateInquiryStatus(@RequestBody List<BatchInquiry> inquiries, Long enuu) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
         publicInquiryService.updateStatus(inquiries, enuu);
-        log.info("/inquiry/public/check post 耗时:{}", (System.currentTimeMillis() - start));
-        log.info("公共询价, ERP设置公共询价不能报价, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}", inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name());
-
+        log.info("/inquiry/public/check post, ERP设置公共询价不能报价, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时:{}", inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
     }
 
     /**
@@ -93,8 +91,7 @@ public class ErpDownloadController {
     public List<InquiryDetail> getReply(Long enuu) {
         long start = System.currentTimeMillis();
         List<InquiryDetail> details = publicInquiryService.findNotUploadReply(enuu);
-        log.info("/inquiry/public/quotation 耗时:{}", (System.currentTimeMillis() - start));
-        log.info("公共询价, ERP获取供应商报价信息, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}",details.size(), Constant.UU, enuu, InquirySource.ERP.name());
+        log.info("/inquiry/public/quotation, ERP获取供应商报价信息, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时：{}", details.size(), Constant.UU, enuu, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
         return details;
     }
 
@@ -110,9 +107,8 @@ public class ErpDownloadController {
     public void onReplySuccess(@RequestBody String data, Long enuu) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
         String[] idArray = URLDecoder.decode(data, "UTF-8").split(",");
-        log.info("公共询价, ERP获取报价信息返回id, id: {}, Constant: {}, enuu: {}, 报价的应用来源: {}",idArray, Constant.UU, enuu, InquirySource.ERP.name());
         publicInquiryService.onReplyUploadSuccess(idArray);
-        log.info("/inquiry/public/reply/back post 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/reply/back post, ERP获取报价信息返回id, id: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", idArray, Constant.UU, enuu, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
     }
 
     /**
@@ -123,11 +119,10 @@ public class ErpDownloadController {
      */
     @HttpLog
     @RequestMapping(value = "/checking", method = RequestMethod.POST)
-    public void checkInquiry(@RequestBody List<InquiryDetail> details , Long enuu) throws UnsupportedEncodingException {
+    public void checkInquiry(@RequestBody List<InquiryDetail> details, Long enuu) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
-        log.info("公共询价, ERP提交报价信息应用禁止报价, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}", details.size(), Constant.UU, enuu, InquirySource.ERP.name());
         publicInquiryService.updateInquiryStatus(details, enuu);
-        log.info("/inquiry/public/checking post 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/checking post , ERP提交报价信息应用禁止报价, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", details.size(), Constant.UU, enuu, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
     }
 
     /**
@@ -140,9 +135,8 @@ public class ErpDownloadController {
     @RequestMapping(value = "/reply/decide", method = RequestMethod.POST)
     public void onReplyDecide(@RequestBody List<InquiryDecide> decides, Long enuu) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
-        log.info("公共询价, ERP针对供应报价信息进行（不）采纳操作, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}", decides.size(), Constant.UU, enuu, InquirySource.ERP.name());
         publicInquiryService.onReplyDecide(decides, enuu);
-        log.info("/inquiry/public/reply/decide post 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/reply/decide post, ERP针对供应报价信息进行（不）采纳操作, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", decides.size(), Constant.UU, enuu, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
     }
 
     /**
@@ -156,9 +150,8 @@ public class ErpDownloadController {
     @RequestMapping(value = "/invalid", method = RequestMethod.POST)
     public void onReplyInvalid(@RequestBody List<Inquiry> inquiries, Long enuu) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
-        log.info("公共询价, ERP作废公共询价单返回数据到公共服务, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}", inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name());
         publicInquiryService.onReplyInvalid(inquiries, enuu);
-        log.info("/inquiry/public/invalid post 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/invalid post, ERP作废公共询价单返回数据到公共服务, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
     }
 
     /**
@@ -173,15 +166,14 @@ public class ErpDownloadController {
     public List<PublicInquiryItem> downloadDecide(Long enUU) {
         long start = System.currentTimeMillis();
         List<PublicInquiryItem> items = publicInquiryService.findDecideNotUploadReply(enUU);
-        log.info("/inquiry/public/down/decide 耗时:{}", (System.currentTimeMillis() - start));
-        log.info("公共询价, 买家采纳或拒绝之后，上传到报价方UAS, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}", items.size(), Constant.UU, enUU, InquirySource.ERP.name());
+        log.info("/inquiry/public/down/decide, 买家采纳或拒绝之后，上传到报价方UAS, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", items.size(), Constant.UU, enUU, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
         return items;
     }
 
     /**
      * 买家采纳或拒绝之后，上传到报价方UAS 之后，UAS回调 修改状态
      *
-     * @param ids 采纳或拒绝的报价单明细id list
+     * @param ids  采纳或拒绝的报价单明细id list
      * @param enUU 报价方企业UU
      * @author dongbw
      * @date 2018年7月3日 15:49:11
@@ -196,8 +188,7 @@ public class ErpDownloadController {
             idList.add(Long.valueOf(id));
         }
         ModelMap map = publicInquiryService.downloadDecideBack(idList, enUU);
-        log.info("/inquiry/public/down/decide/back 耗时:{}", (System.currentTimeMillis() - start));
-        log.info("公共询价, 买家采纳或拒绝之后，上传到报价方UAS的回调, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}", idList.size(), Constant.UU, enUU, InquirySource.ERP.name());
+        log.info("/inquiry/public/down/decide/back  post, 买家采纳或拒绝之后，上传到报价方UAS的回调, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时:{}", idList.size(), Constant.UU, enUU, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
         return map;
     }
 
@@ -213,8 +204,7 @@ public class ErpDownloadController {
     public List<PublicInquiryItem> downReply(Long enUU) {
         long start = System.currentTimeMillis();
         List<PublicInquiryItem> details = publicInquiryService.findNotUploadToUas(enUU);
-        log.info("/inquiry/public/down/reply 耗时:{}", (System.currentTimeMillis() - start));
-        log.info("公共询价, ERP获取供应商报价信息, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}", details.size(), Constant.UU, enUU, InquirySource.ERP.name());
+        log.info("/inquiry/public/down/reply, ERP获取供应商报价信息, size: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", details.size(), Constant.UU, enUU, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
         return details;
     }
 
@@ -222,7 +212,7 @@ public class ErpDownloadController {
      * 将报价方在商城报价的单据同步到报价方UAS 之后 回调 修改状态
      *
      * @param enUU 报价企业UU
-     * @param ids 报价单明细id list
+     * @param ids  报价单明细id list
      * @author dongbw
      * @date 2018年7月3日 16：21
      */
@@ -231,9 +221,8 @@ public class ErpDownloadController {
     public void onReplyDownSuccess(String ids, Long enUU) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
         String[] idArray = URLDecoder.decode(ids, "UTF-8").split(",");
-        log.info("公共询价, 将报价方在商城报价的单据同步到报价方UAS之后回调修改状态, id: {}, Constant: {}, enuu: {}, 报价的应用来源: {}", idArray, Constant.UU, enUU, InquirySource.ERP.name());
         publicInquiryService.onReplyDownLoadSuccess(idArray);
-        log.info("/inquiry/public/down/reply/back post 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/down/reply/back post , 将报价方在商城报价的单据同步到报价方UAS之后回调修改状态, id: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", idArray, Constant.UU, enUU, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
     }
 
     /**
@@ -248,8 +237,7 @@ public class ErpDownloadController {
     public List<InquiryEnRemind> downEnRemind(Long vendUU) {
         long start = System.currentTimeMillis();
         List<InquiryEnRemind> details = publicInquiryService.findNotUploadEnRemind(vendUU);
-        log.info("/inquiry/public/enremind 耗时:{}", (System.currentTimeMillis() - start));
-        log.info("公共询价, UAS获取商城账套下企业商机, size: {}, Constant: {}, vendUU: {}, 报价的应用来源: {}", details.size(), Constant.UU, vendUU, InquirySource.ERP.name());
+        log.info("/inquiry/public/enremind, UAS获取商城账套下企业商机, size: {}, Constant: {}, vendUU: {}, 报价的应用来源: {}, 耗时: {}", details.size(), Constant.UU, vendUU, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
         return details;
     }
 
@@ -257,7 +245,7 @@ public class ErpDownloadController {
      * UAS获取商城账套下企业商机之后 回调 修改状态
      *
      * @param vendUU 报价企业UU
-     * @param ids 报价单明细id list
+     * @param ids    报价单明细id list
      * @author dongbw
      * @date 2018年7月23日 10:34:50
      */
@@ -266,8 +254,7 @@ public class ErpDownloadController {
     public void downEnRemindSuccess(String ids, Long vendUU) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
         String[] idArray = URLDecoder.decode(ids, "UTF-8").split(",");
-        log.info("公共询价, UAS获取商城账套下企业商机之后 之后 回调 修改状态, id: {}, Constant: {}, vendUU: {}, 报价的应用来源: {}", Arrays.toString(idArray), Constant.UU, vendUU, InquirySource.ERP.name());
         publicInquiryService.downEnRemindSuccess(idArray, vendUU);
-        log.info("/inquiry/public/enremind/back post 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/enremind/back post, UAS获取商城账套下企业商机之后 之后 回调 修改状态, id: {}, Constant: {}, vendUU: {}, 报价的应用来源: {},  耗时: {}", Arrays.toString(idArray), Constant.UU, vendUU, InquirySource.ERP.name(), (System.currentTimeMillis() - start));
     }
 }

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

@@ -43,10 +43,9 @@ public class InquiryForBuyerController {
     @HttpLog
     @RequestMapping(value = "/detail", method = RequestMethod.GET)
     public InquiryDetailInfo findById(Long id, Long enuu) {
-        log.info("公共询价, 客户查询供应商报价详情, id: {}, Constant: {}, enuu: {}, 报价的应用来源: {}", id, Constant.UU, enuu, InquirySource.PLAIN.name());
         long start = System.currentTimeMillis();
         InquiryDetailInfo detailInfo = inquiryService.findById(id, enuu);
-        log.info("/inquiry/buyer/save 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/buyer/save, 客户查询供应商报价详情, id: {}, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", id, Constant.UU, enuu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
         return detailInfo;
     }
 
@@ -60,11 +59,10 @@ public class InquiryForBuyerController {
     @HttpLog
     @RequestMapping(value = "/inquiryList", method = RequestMethod.GET)
     public Page<PurcInquiry> getInquiry(PageInfo pageInfo, SearchFilter searchFilter) {
-        log.info("公共询价, 通过企业UU和分页参数获取已发布的询价信息, UserUU: {}, enuu: {}, 报价的应用来源: {}",  searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.PLAIN.name());
         long start = System.currentTimeMillis();
         Page<PurcInquiry> page = inquiryService.findByPageInfo(pageInfo, searchFilter);
         page = inquiryService.setQuotedAmount(page);
-        log.info("/inquiry/buyer/inquiryList 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/buyer/inquiryList, 通过企业UU和分页参数获取已发布的询价信息, UserUU: {}, enuu: {}, 报价的应用来源: {},耗时: {}", searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
         return page;
     }
 
@@ -80,10 +78,9 @@ public class InquiryForBuyerController {
     @HttpLog
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     public Page<PurcInquiryItemInfo> getInquiryList(PageInfo pageInfo, SearchFilter searchFilter, String state, Integer overdue) {
-        log.info("公共询价, 通过企业UU和分页参数获取已发布的询价明细, UserUU: {}, enuu: {}, 报价的应用来源: {}",  searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.PLAIN.name());
         long start = System.currentTimeMillis();
         Page<PurcInquiryItemInfo> page = inquiryService.findTodoByPageInfo(pageInfo, searchFilter, state, overdue);
-        log.info("/inquiry/buyer/list 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/buyer/list, 通过企业UU和分页参数获取已发布的询价明细, UserUU: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
         return page;
     }
 
@@ -97,11 +94,10 @@ public class InquiryForBuyerController {
     @HttpLog
     @RequestMapping(value = "/product/detail", method = RequestMethod.GET)
     public InquiryProductInfo findInquiryDetailById(Long id, Long enuu) {
-        log.info("公共询价, 针对客户查询单个物料明细的报价情况, Constant: {}, enuu: {}, 报价的应用来源: {}",  Constant.UU, enuu, InquirySource.PLAIN.name());
         /*logger.log("公共询价", "针对客户查询单个物料明细的报价情况", null, Constant.UU, enuu, InquirySource.PLAIN.name());*/
         long start = System.currentTimeMillis();
         InquiryProductInfo info = inquiryService.findInquiryDetailById(id, enuu);
-        log.info("/inquiry/buyer/product/detail 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/buyer/product/detail, 针对客户查询单个物料明细的报价情况, Constant: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", Constant.UU, enuu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
         return info;
     }
 
@@ -117,11 +113,10 @@ public class InquiryForBuyerController {
     @HttpLog
     @RequestMapping(value = "/quotations", method = RequestMethod.GET)
     public Page<PurcInquiryItemInfo> findQuotationsByPage(PageInfo pageInfo, SearchFilter searchFilter, Long enUU, Long userUU, Short overdue) {
-        log.info("公共询价, 客户查询供应商报价信息, userUU: {}, enUU: {}, 报价的应用来源: {}",  userUU, enUU, InquirySource.MALL.name());
         /* logger.log("公共询价", "客户查询供应商报价信息", null, userUU, enUU, InquirySource.MALL.name());*/
         long start = System.currentTimeMillis();
         Page<PurcInquiryItemInfo> page = inquiryService.findQuotationsByPage(pageInfo, searchFilter, enUU, userUU, overdue);
-        log.info("/inquiry/buyer/quotations 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/buyer/quotations, 客户查询供应商报价信息, userUU: {}, enUU: {}, 报价的应用来源: {}, 耗时: {}",  userUU, enUU, InquirySource.MALL.name(), (System.currentTimeMillis() - start));
         return page;
     }
 
@@ -136,7 +131,7 @@ public class InquiryForBuyerController {
     public PurcInquiryItemInfo findQuotationById(Long id) {
         long start = System.currentTimeMillis();
         PurcInquiryItemInfo itemInfo = inquiryService.findQuotationById(id);
-        log.info("/inquiry/buyer/quotation 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/buyer/quotation, 针对客户单个公共询价 查询供应商报价信息, id: {}, 耗时: {}", id, (System.currentTimeMillis() - start));
         return itemInfo;
     }
 
@@ -151,14 +146,11 @@ public class InquiryForBuyerController {
     public PurcInquiry saveInquiry(@RequestBody PurcInquiry inquiry) throws Exception {
         long start = System.currentTimeMillis();
         inquiry = inquiryService.saveInquiry(inquiry);
-        log.info("/inquiry/buyer/save post 耗时:{}", (System.currentTimeMillis() - start));
         if (null != inquiry.getId()) {
-            log.info("公共询价, 新增公共询价信息, 单号: {}, 生成id: {}, RecorderUU: {}, EnUU: {}, 报价的应用来源: {}",  inquiry.getCode(), inquiry.getId(), inquiry.getRecorderUU(), inquiry.getEnUU(), InquirySource.PLAIN.name());
-            /*logger.log("公共询价", "新增公共询价信息", "单号： " + inquiry.getCode() + "生成id: " + inquiry.getId(), inquiry.getRecorderUU(), inquiry.getEnUU(), InquirySource.PLAIN.name());*/
+            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("公共询价, 新增公共询价信息失败, 单号: {}, RecorderUU: {}, EnUU: {}, 报价的应用来源: {}",  inquiry.getCode(), inquiry.getRecorderUU(), inquiry.getEnUU(), InquirySource.PLAIN.name());
-            /*logger.log("公共询价", "新增公共询价信息失败", "单号： " + inquiry.getCode(), inquiry.getRecorderUU(), inquiry.getEnUU(), InquirySource.PLAIN.name());*/
+            log.info("/inquiry/buyer/save post, 新增公共询价信息失败, 单号: {}, RecorderUU: {}, EnUU: {}, 报价的应用来源: {}, 耗时: {}",  inquiry.getCode(), inquiry.getRecorderUU(), inquiry.getEnUU(), InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
             throw new Exception("保存失败");
         }
     }
@@ -174,11 +166,9 @@ public class InquiryForBuyerController {
     @HttpLog
     @RequestMapping(value = "/decide", method = RequestMethod.POST)
     public void decideQuote(Long id, Short status, Long enuu, Long useruu) throws Exception {
-        log.info("公共询价, 通过明细id对供应商报价进行审核操作, id: {}, 采纳状态: {}, UserUU: {}, Enuu: {}, 报价的应用来源: {}",  id, status, useruu, enuu, InquirySource.PLAIN.name());
-       /* logger.log("公共询价", "通过明细id对供应商报价进行审核操作", "id： " + id + ",采纳状态： " + status, useruu, enuu, InquirySource.PLAIN.name());*/
         long start = System.currentTimeMillis();
         inquiryService.decideQuote(id, status);
-        log.info("/inquiry/buyer/decide post 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/buyer/decide post, 通过明细id对供应商报价进行审核操作, id: {}, 采纳状态: {}, UserUU: {}, Enuu: {}, 报价的应用来源: {}, 耗时: {}", id, status, useruu, enuu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
     }
 
     /**
@@ -192,11 +182,9 @@ public class InquiryForBuyerController {
     @HttpLog
     @RequestMapping(value = "/adopt", method = RequestMethod.POST)
     public void adoptQuote(Long id, Short status, Long enuu, Long useruu) throws Exception {
-        log.info("公共询价, 通过明细id采纳供应商报价, id: {}, 采纳状态: {}, UserUU: {}, Enuu: {}, 报价的应用来源: {}",  id, status, useruu, enuu, InquirySource.PLAIN.name());
-/*        logger.log("公共询价", "通过明细id采纳供应商报价", "id： " + id + ",采纳状态： " + status, useruu, enuu, InquirySource.PLAIN.name());*/
         long start = System.currentTimeMillis();
         inquiryService.adpotQuote(id, status);
-        log.info("/inquiry/buyer/adopt post 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/buyer/adopt post , 通过明细id采纳供应商报价, id: {}, 采纳状态: {}, UserUU: {}, Enuu: {}, 报价的应用来源: {}, 耗时: {}", id, status, useruu, enuu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
     }
 
 
@@ -211,11 +199,9 @@ public class InquiryForBuyerController {
     @HttpLog
     @RequestMapping(value = "/refuse", method = RequestMethod.POST)
     public void refuseQuote(Long id, Short status, Long enuu, Long useruu,String refusereason) throws Exception {
-        log.info("公共询价, 通过明细id拒绝供应商报价, id: {}, 采纳状态: {}, UserUU: {}, Enuu: {}, 报价的应用来源: {}",  id, status, useruu, enuu, InquirySource.PLAIN.name());
-      /*  logger.log("公共询价", "通过明细id拒绝供应商报价", "id： " + id + ",采纳状态： " + status, useruu, enuu, InquirySource.PLAIN.name());*/
         long start = System.currentTimeMillis();
         inquiryService.refuseQuote(id, status, refusereason);
-        log.info("/inquiry/buyer/refuse post 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/buyer/refuse post, 通过明细id拒绝供应商报价, id: {}, 采纳状态: {}, UserUU: {}, Enuu: {}, 报价的应用来源: {}, 耗时: {}", id, status, useruu, enuu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
     }
 
 

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

@@ -54,7 +54,7 @@ public class InquiryForSaleController {
     public ModelMap saveQuote(@RequestBody PublicInquiryItem publicInquiryItem) throws Exception {
         Long start = System.currentTimeMillis();
         ModelMap result = saleService.saveQuote(publicInquiryItem);
-        log.info("/inquiry/sale/item/saveQuote post 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/sale/item/saveQuote post,保存报价接口, 报价单Id：{}, 耗时: {}", publicInquiryItem.getId(), (System.currentTimeMillis() - start));
         publicInquiryService.ReceiveMessage(publicInquiryItem, InquirySource.MALL.name());
 //        if (null != item) {
 //            PublicInquiry inquiry = item.getInquiry();
@@ -75,10 +75,9 @@ public class InquiryForSaleController {
     @HttpLog
     @RequestMapping(value = "/inquiry/detail", method = RequestMethod.GET)
     public PublicInquiryItem findById(Long itemId, Long en_uu) throws IllegalAccessException {
-        log.info("公共询价, 查询已转报价的明细, id: {}, Constant: {}, en_uu: {}, 报价的应用来源: {}", itemId, Constant.UU, en_uu, InquirySource.PLAIN.name());
         long start = System.currentTimeMillis();
         PublicInquiryItem item = saleService.findById(itemId, en_uu);
-        log.info("/inquiry/sale/inquiry/detail 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/sale/inquiry/detail , 查询已转报价的明细, id: {}, Constant: {}, en_uu: {}, 报价的应用来源: {}, 耗时: {}", itemId, Constant.UU, en_uu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
         return item;
     }
 
@@ -92,10 +91,9 @@ public class InquiryForSaleController {
     @HttpLog
     @RequestMapping(value = "/publicInquiry/detail", method = RequestMethod.GET)
     public ModelMap findInquiryById(Long id, Long enuu) {
-        log.info("公共询价, 通过id查询公共询价详情, id: {}, Constant: {}, en_uu: {}, 报价的应用来源: {}", id, Constant.UU, enuu, InquirySource.PLAIN.name());
         long start = System.currentTimeMillis();
         ModelMap map = saleService.findByIdAndEnuu(id, enuu);
-        log.info("/inquiry/sale/publicInquiry/detail 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/sale/publicInquiry/detail get, 通过id查询公共询价详情, id: {}, Constant: {}, en_uu: {}, 报价的应用来源: {}, 耗时: {}", id, Constant.UU, enuu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
         return map;
     }
 
@@ -111,7 +109,7 @@ public class InquiryForSaleController {
     public String addAttachs(@RequestBody Attach attach) throws Exception {
         long start = System.currentTimeMillis();
         attach = saleService.addAttachs(attach);
-        log.info("/inquiry/sale/attach post 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/sale/attach post, 卖家报价时上传附件信息，附件名称: {}, 耗时: {}", attach.getName(), (System.currentTimeMillis() - start));
         if (null != attach.getId()) {
             return JSONObject.toJSONString(attach);
         } else {
@@ -134,7 +132,7 @@ public class InquiryForSaleController {
     public String saveItem(@RequestBody PublicInquiryItem inquiryItem) throws Exception {
         long start = System.currentTimeMillis();
         inquiryItem = saleService.save(inquiryItem);
-        log.info("/inquiry/sale/rnew post 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/sale/renew post，保存询价信息，询价单Id：{}, 耗时: {}", inquiryItem.getId(), (System.currentTimeMillis() - start));
         return JSONObject.toJSONString(inquiryItem);
     }
 
@@ -148,10 +146,9 @@ public class InquiryForSaleController {
     @HttpLog
     @RequestMapping(value = "/quote", method = RequestMethod.GET)
     public PublicInquiryItem findBySourceId(Long id, Long en_uu) {
-        log.info("公共询价, 查询公共询价单是否已报价, id: {}, Constant: {}, en_uu: {}, 报价的应用来源: {}", id, Constant.UU, en_uu, InquirySource.PLAIN.name());
         long start = System.currentTimeMillis();
         PublicInquiryItem item = saleService.findBySourceIdAndEnuu(id, en_uu);
-        log.info("/inquiry/sale/quote 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/sale/quote , 查询公共询价单是否已报价, id: {}, Constant: {}, en_uu: {}, 报价的应用来源: {}, 耗时: {}", id, Constant.UU, en_uu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
         return item;
     }
 
@@ -173,9 +170,8 @@ public class InquiryForSaleController {
         } else {
             pageInfo.filter("vendUU", enuu);
             pageInfo.filter("vendUserUU", useruu);
-            log.info("公共询价, 查询推荐询价信息, useruu: {}, enuu: {}, 报价的应用来源: {}", useruu, enuu, InquirySource.PLAIN.name());
             IPage<InquiryRemind> remindIPage = saleService.findRemindByPageInfo(pageInfo, searchFilter);
-            log.info("/inquiry/sale/remind 耗时:{}", (System.currentTimeMillis() - start));
+            log.info("/inquiry/sale/remind, 查询推荐询价信息, useruu: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", useruu, enuu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
             return remindIPage;
         }
     }
@@ -197,9 +193,8 @@ public class InquiryForSaleController {
             throw new IllegalAccessError("非法访问");
         } else {
             pageInfo.filter("vendUU", enuu);
-            log.info("公共询价, 查询企业推荐询价信息, useruu: {}, enuu: {}, 报价的应用来源: {}", useruu, enuu, InquirySource.PLAIN.name());
             IPage<InquiryEnRemind> enRemindIPage = saleService.findEnRemindByPageInfo(pageInfo, searchFilter);
-            log.info("/inquiry/sale/enremind 耗时:{}", (System.currentTimeMillis() - start));
+            log.info("/inquiry/sale/enremind, 查询企业推荐询价信息, useruu: {}, enuu: {}, 报价的应用来源: {}, 耗时: {}", useruu, enuu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
             return enRemindIPage;
         }
     }
@@ -216,7 +211,7 @@ public class InquiryForSaleController {
     public ModelMap allotEnRemind(Long userUU, Long enRemindId) {
         long start = System.currentTimeMillis();
         ModelMap modelMap = saleService.allotEnRemind(userUU, enRemindId);
-        log.info("/inquiry/sale/allot/enremind post  耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/sale/allot/enremind post,分配企业商机，useruu: {}, enRemindId: {}, 耗时: {}", userUU, enRemindId,(System.currentTimeMillis() - start));
         return modelMap;
     }
 
@@ -233,7 +228,7 @@ public class InquiryForSaleController {
     public ModelMap allotInquiry(Long userUU, Long enUU, Long itemId) {
         long start = System.currentTimeMillis();
         ModelMap map = saleService.allotInquiry(userUU, enUU, itemId);
-        log.info("/inquiry/sale/allot/inquiry post 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/sale/allot/inquiry post, 分配平台商机, useruu: {}, enuu: {}, itemId: {}, 耗时: {}", userUU, enUU, itemId, (System.currentTimeMillis() - start));
         return map;
     }
 
@@ -257,10 +252,9 @@ public class InquiryForSaleController {
             throw new IllegalOperatorException("en_uu或useruu不能为空");
         }
         List<PublicInquiryReply> replyList = JSONObject.parseArray(replies, PublicInquiryReply.class);
-        log.info("公共询价, 作为卖家,对公共询价进行报价操作, sourceid: {}, useruu: {}, en_uu, 报价的应用来源: {}", inquiryItemId,
-                useruu, en_uu, InquirySource.UU.name());
         ModelMap map = saleService.quoteInquiry(inquiryItemId, en_uu, useruu, replyList, leadtime, minPackQty, minOrderQty, currency, taxrate);
-        log.info("/inquiry/sale/mobile/quote post 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/sale/mobile/quote post, 作为卖家,对公共询价进行报价操作, sourceid: {}, useruu: {}, en_uu, 报价的应用来源: {},耗时: {}", inquiryItemId,
+                useruu, en_uu, InquirySource.UU.name(), (System.currentTimeMillis() - start));
         return map;
     }
 
@@ -276,7 +270,7 @@ public class InquiryForSaleController {
     public String saveInquiryItem(@RequestBody PublicInquiryItem item) throws Exception {
         long start = System.currentTimeMillis();
         item = saleService.add(item);
-        log.info("/inquiry/sale/item/add post 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/sale/item/add post,作为卖家，新增报价,询价单Id: {}, 耗时: {}",item.getId() ,(System.currentTimeMillis() - start));
         if (null != item.getId()) {
             return JSONObject.toJSONString(item);
         } else {
@@ -297,8 +291,7 @@ public class InquiryForSaleController {
     public String saveInquiryItems(@RequestBody PublicInquiryItem item) throws Exception {
         long start = System.currentTimeMillis();
         item = saleService.saveItem(item);
-        log.info("/inquiry/sale/item/save post 耗时:{}", (System.currentTimeMillis() - start));
-        log.info("公共询价, 作为卖家,对公共询价进行报价操作, sourceid: {}, id: {}, VendUserUU: {}, VendUU: {} , QutoApp: {}", item.getSourceId() == null ? null : item.getSourceId(), item.getId(), item.getVendUserUU(), item.getVendUU(), item.getQutoApp());
+        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));
         publicInquiryService.ReceiveMessage(item,InquirySource.MALL.name());
         if (null != item) {
             PublicInquiry inquiry = item.getInquiry();

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

@@ -57,7 +57,8 @@ public class PublicInquiryController {
 
     /**
      * 通过分页参数和过滤条件查询公共询价列表信息
-     *                                B2B\B2C\IM
+     * B2B\B2C\IM
+     *
      * @param pageInfo     分页参数
      * @param searchFilter 过滤条件
      * @return
@@ -79,14 +80,14 @@ public class PublicInquiryController {
             pageInfo.expression(PredicateUtils.eq("valid", Constant.YES, false));
         }
         IPage<PurcInquiryItemInfo> page = publicInquiryService.findTodoByPageInfo(pageInfo, searchFilter);
-        log.info("公共询价, 查询公共询价信息, UserUU: {}, EnUU: {}, 报价的应用来源: {}",  searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.PLAIN.name());
-        log.info("/inquiry/public 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/public, 查询公共询价信息, UserUU: {}, EnUU: {}, 报价的应用来源: {}, 耗时: {}", searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
         return page;
     }
 
     /**
      * 针对商城，查询已发布的公共询价信息
-     *                        暂无
+     * 暂无
+     *
      * @param pageInfo     分页信息
      * @param searchFilter 过滤条件
      * @return
@@ -102,15 +103,15 @@ public class PublicInquiryController {
             pageInfo.filter("inquiry.enUU", searchFilter.getEnUU());
         }
         IPage<PurcInquiryItemInfo> infoIPage = publicInquiryService.findTodoByPageInfo(pageInfo, searchFilter);
-        log.info("公共询价, 查询公共询价信息, UserUU: {}, EnUU: {}, 报价的应用来源: {}",  searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.MALL.name());
-        log.info("/inquiry/public/inquiryList 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/inquiryList, 查询公共询价信息, UserUU: {}, EnUU: {}, 报价的应用来源: {}, 耗时: {}", searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.MALL.name(), (System.currentTimeMillis() - start));
         return infoIPage;
     }
 
 
     /**
      * 通过分页信息和过滤条件查询已转报价的信息
-     *                          B2B\B2C
+     * B2B\B2C
+     *
      * @param pageInfo 分页参数
      * @param filter   过滤条件
      * @return
@@ -135,15 +136,15 @@ public class PublicInquiryController {
         if (null != _state) {
             pageInfo = publicInquiryService.covert(pageInfo, _state, overdue);
         }
-        log.info("公共询价, 查询已转报价询价列表信息, 状态:{}, UserUU: {}, EnUU: {}, 报价的应用来源: {}",  (_state == null ? "all" : _state), searchFilter != null ? searchFilter.getUserUU() : null, searchFilter != null ? searchFilter.getEnUU() : null, InquirySource.PLAIN.name());
         IPage<PublicInquiryItemInfo> inquiryItemInfoIPage = publicInquiryService.findByPageInfo(pageInfo, searchFilter);
-        log.info("/inquiry/public/quotation/list 耗时:{}", (System.currentTimeMillis() - start));
+        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));
         return inquiryItemInfoIPage;
     }
 
     /**
      * 通过id查询单个已转报价的信息
-     *                      B2C
+     * B2C
+     *
      * @param id
      * @return
      */
@@ -155,13 +156,14 @@ public class PublicInquiryController {
             throw new IllegalAccessError("暂无访问权限");
         }
         PublicInquiryItemInfo info = publicInquiryService.findOneInfo(id, enuu, useruu);
-        log.info("/inquiry/public/quotation/one 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/quotation/one,通过id查询单个已转报价的信息,id: {}, enuu: {}, useruu: {}, 耗时: {}", id, enuu, useruu, (System.currentTimeMillis() - start));
         return info;
     }
 
     /**
      * 商城获取采纳列表
-     *                  B2C
+     * B2C
+     *
      * @param pageInfo
      * @param filter
      * @param _state
@@ -176,13 +178,14 @@ public class PublicInquiryController {
             pageInfo = publicInquiryService.covert(pageInfo, _state, overdue);
         }
         Page<PublicInquiryItemInfo> itemInfoPage = publicInquiryService.findListByPageInfo(pageInfo, searchFilter);
-        log.info("/inquiry/public/quotationList 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/quotationList, 商城获取采纳列表, filter: {}, state: {}, overdue: {}, 耗时: {}", filter, _state, overdue, (System.currentTimeMillis() - start));
         return itemInfoPage;
     }
 
     /**
      * 获取最新的公共询价列表
-     *                      B2B
+     * B2B
+     *
      * @param enuu 当前企业UU号
      * @param size 大小
      * @return
@@ -191,15 +194,15 @@ public class PublicInquiryController {
     @RequestMapping(value = "/messageList", method = RequestMethod.GET)
     public List<InquiryMessage> getList(Long enuu, Integer size) {
         long start = System.currentTimeMillis();
-        log.info("公共询价, 获取最新的公共询价, size:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", size, Constant.UU, enuu, InquirySource.PLAIN.name());
         List<InquiryMessage> messages = publicInquiryService.getMessageList(enuu, size);
-        log.info("/inquiry/public/messageList 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/messageList, 获取最新的公共询价, size:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}, 耗时: {}", size, Constant.UU, enuu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
         return messages;
     }
 
     /**
      * 将客户的公共询价列表中一条数据转成询价报价单数据
-     *                                  暂无
+     * 暂无
+     *
      * @param id     公共询价明细id
      * @param enuu   报价企业UU
      * @param useruu 报价个人UU
@@ -212,13 +215,14 @@ public class PublicInquiryController {
     private ModelMap transtoInquiry(Long id, Long enuu, Long useruu) {
         long start = System.currentTimeMillis();
         ModelMap map = publicInquiryService.transtoInquiry(id, enuu, useruu);
-        log.info("/inquiry/public/turntoInquiry post 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/turntoInquiry post, 将数据转成询价报价单数据, id: {}, enuu: {}, useruu: {}, 耗时: {}", id, enuu, useruu, (System.currentTimeMillis() - start));
         return map;
     }
 
     /**
      * 获取附件信息
-     *              B2B
+     * B2B
+     *
      * @param id 附件id
      * @return
      */
@@ -227,13 +231,14 @@ public class PublicInquiryController {
     public com.uas.ps.inquiry.model.Attach getAttach(Long id) {
         long start = System.currentTimeMillis();
         Attach attach = attachService.findById(id);
-        log.info("/inquiry/public/atatchUrl 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/atatchUrl, 获取附件信息, id:{ }, 耗时: {}", id, (System.currentTimeMillis() - start));
         return attach;
     }
 
     /**
      * 通过询价主表id查询主表信息
-     *                      B2C
+     * B2C
+     *
      * @param id 主表id
      * @return
      */
@@ -241,16 +246,16 @@ public class PublicInquiryController {
     @RequestMapping(value = "/findInquiryById", method = RequestMethod.GET)
     public PurcInquiry findById(Long id, Long enuu) {
         long start = System.currentTimeMillis();
-        log.info("公共询价, 获取询价信息, id:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", id, Constant.UU, enuu, InquirySource.PLAIN.name());
         PurcInquiry inquiry = publicInquiryService.findInquiryById(id);
         inquiry = publicInquiryService.getQuotedDetail(inquiry);
-        log.info("/inquiry/public/findInquiryById 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/findInquiryById, 获取询价信息, id: {}, Constant: {}, EnUU: {}, 报价的应用来源: {}, 耗时:{}", id, Constant.UU, enuu, InquirySource.PLAIN.name(), (System.currentTimeMillis() - start));
         return inquiry;
     }
 
     /**
      * 商城-采购排行榜
-     *                  B2C
+     * B2C
+     *
      * @return
      */
     @HttpLog
@@ -258,13 +263,14 @@ public class PublicInquiryController {
     public List<Map<String, Object>> findCodeRankingList() {
         long start = System.currentTimeMillis();
         List<Map<String, Object>> list = publicInquiryService.findCodeRankingList();
-        log.info("/inquiry/public/findCodeRankingList 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/findCodeRankingList，商城-采购排行榜, 耗时: {}", (System.currentTimeMillis() - start));
         return list;
     }
 
     /**
      * 通过明细id查询该条询价的详情
-     *                      B2B\B2C
+     * B2B\B2C
+     *
      * @param itemId 明细id
      * @param enuu   enuu
      * @return
@@ -274,27 +280,28 @@ public class PublicInquiryController {
     public PurcInquiryItemInfo findItemByItemId(Long itemId, Long enuu) {
         long start = System.currentTimeMillis();
         PurcInquiryItemInfo itemInfo = publicInquiryService.findItemByItemId(itemId, enuu);
-        log.info("公共询价, 获取询价信息, id:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", itemId, Constant.UU, enuu, InquirySource.B2B.name());
-        log.info("/inquiry/public/findItemByItemId 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/findItemByItemId, 获取询价信息, id: {}, Constant: {}, EnUU: {}, 报价的应用来源: {}, 耗时: {}", itemId, Constant.UU, enuu, InquirySource.B2B.name(), (System.currentTimeMillis() - start));
         return itemInfo;
     }
 
     /**
      * 公共询价单明细总数
-     *                zanwu
+     * zanwu
+     *
      * @return
      */
     @RequestMapping(value = "/getPurcInquiryItemCount", method = RequestMethod.GET)
     public ModelMap getPurcInquiryItemCount() {
         long start = System.currentTimeMillis();
         ModelMap map = publicInquiryService.getPurcInquiryItemCount();
-        log.info("/inquiry/public/getPurcInquiryItemCount 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/getPurcInquiryItemCount, 公共询价单明细总数, 耗时: {}", (System.currentTimeMillis() - start));
         return map;
     }
 
     /**
      * 公共询价单明细某年某月总数
-     *                  B2C
+     * B2C
+     *
      * @param month 月份
      * @return
      */
@@ -302,27 +309,29 @@ public class PublicInquiryController {
     public ModelMap getPurcInquiryItemCountByMonth(Integer year, Integer month) {
         long start = System.currentTimeMillis();
         ModelMap map = publicInquiryService.countByMonth(year, month);
-        log.info("/inquiry/public/getPurcInquiryItemCountByMonth 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/getPurcInquiryItemCountByMonth, 公共询价单明细某年某月总数, year: {}, month: {}, 耗时: {}", year, month, (System.currentTimeMillis() - start));
         return map;
     }
 
     /**
      * 公共询价单明细本月数量和上月数量
-     *                  B2C
+     * B2C
+     *
      * @return
      */
     @RequestMapping(value = "/getCountOfLastAndThisMonth", method = RequestMethod.GET)
     public ModelMap getPurcInquiryItemCountByMonth() {
         long start = System.currentTimeMillis();
         ModelMap map = publicInquiryService.getCountOfLastAndThisMonth();
-        log.info("/inquiry/public/getCountOfLastAndThisMonth 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/getCountOfLastAndThisMonth,公共询价单明细本月数量和上月数量, 耗时: {}", (System.currentTimeMillis() - start));
         return map;
     }
 
     /**
      * 公共询价单明细设置禁用或反禁用
-     *                  B2C-admin
-     * @param id 询价明细id
+     * B2C-admin
+     *
+     * @param id    询价明细id
      * @param valid 是否生效状态 1为是，0为否
      * @return
      */
@@ -333,19 +342,20 @@ public class PublicInquiryController {
             valid = 0;
         }
         ModelMap map = publicInquiryService.deleteItems(id, valid);
-        log.info("/inquiry/public/deleteItems 耗时:{}", (System.currentTimeMillis() - start));
+        log.info("/inquiry/public/deleteItems, 公共询价单明细设置禁用或反禁用, 耗时: {}", (System.currentTimeMillis() - start));
         return map;
     }
 
     /**
      * 商城后台-统计询价产品和用户
+     *
      * @param startDate
      * @param endDate
      * @return
      */
     @RequestMapping(value = "/getInquiryCountData", method = RequestMethod.GET)
-    public ModelMap getInquiryCountData(String startDate, String endDate){
-        log.info("/inquiry/public/getInquiryCountData 参数为：{}", startDate, endDate);
+    public ModelMap getInquiryCountData(String startDate, String endDate) {
+        log.info("/inquiry/public/getInquiryCountData, 商城后台-统计询价产品和用户, startDate: {}, endDate：{}", startDate, endDate);
         return publicInquiryService.getInquiryCountData(startDate, endDate);
     }
 
@@ -378,36 +388,36 @@ public class PublicInquiryController {
         filter.setKeyword(keyword);
         if (StringUtils.hasText(_state)) {
             if (_state.equals(OrderStatus.end.name())) {
-                log.info("公共询价, 查询公共询价信息, tel:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name());
                 pageInfo.filter("overdue", Constant.YES);
                 map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
+                log.info("/inquiry/mobile, 查询公共询价信息, tel: {}, Constant: {}, EnUU: {}, 报价的应用来源: {}, 耗时: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name(), (System.currentTimeMillis() - start));
                 return map;
             } else if (_state.equals(OrderStatus.invalid.name())) {
-                log.info("公共询价, 查询公共询价信息, tel:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name());
                 pageInfo.filter("status", Status.DISABLED.value());
                 map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
+                log.info("/inquiry/mobile, 查询公共询价信息, tel: {}, Constant: {}, EnUU: {}, 报价的应用来源: {}, 耗时: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name(), (System.currentTimeMillis() - start));
                 return map;
             } else if (_state.equals(OrderStatus.done.name())) {
-                log.info("公共询价, 查询已转报价询价列表信息, tel:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name());
                 pageInfo.filter("vendUU", en_uu);
                 filter.setKeyword(keyword);
                 map.put("content", publicInquiryService.findByPageInfo(pageInfo, filter).getContent());
+                log.info("/inquiry/mobile, 查询已转报价询价列表信息, tel: {}, Constant: {}, EnUU: {}, 报价的应用来源: {}, 耗时: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name(), (System.currentTimeMillis() - start));
                 return map;
             }
         } else {
             filter.setEnUU(en_uu);
-            log.info("公共询价, 查询公共询价信息, tel:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name());
             map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
+            log.info("/inquiry/mobile, 查询公共询价信息, tel: {}, Constant: {}, EnUU: {}, 报价的应用来源: {}, 耗时: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name(), (System.currentTimeMillis() - start));
             return map;
         }
-        log.info("/inquiry/mobile 耗时:{}", (System.currentTimeMillis() - start));
         return map;
     }
 
     /**
      * 设置分页信息
-     * @param page  页码
-     * @param size  条数
+     *
+     * @param page 页码
+     * @param size 条数
      * @return
      */
     private PageInfo setPageInfo(Integer page, Integer size) {
@@ -425,13 +435,15 @@ public class PublicInquiryController {
         pageInfo.setOffset(pageInfo.getPageSize() * (pageInfo.getPageNumber() - 1));
         Sort sort = new Sort(Sort.Direction.DESC, "date");
         pageInfo.setSort(sort);
+        log.info("设置分页信息, page: {}, size: {}", page, size);
         return pageInfo;
     }
 
     /**
      * 移动端查询公共询价列表信息
-     *                     2018年7月10日 16:24:35 此接口实际是将获取全部、获取已报价、获取未报价接口整合到一起，供UU互联只调用一个接口，
-     *                     可以修改为去调用对应的列表方法，这样，UU只用调用一个接口，公共服务也不用重复维护。
+     * 2018年7月10日 16:24:35 此接口实际是将获取全部、获取已报价、获取未报价接口整合到一起，供UU互联只调用一个接口，
+     * 可以修改为去调用对应的列表方法，这样，UU只用调用一个接口，公共服务也不用重复维护。
+     *
      * @param page     页码
      * @param size     每页大小
      * @param en_uu    企业UU
@@ -456,29 +468,29 @@ public class PublicInquiryController {
         filter.setKeyword(keyword);
         if (StringUtils.hasText(_state)) {
             if (_state.equals(OrderStatus.end.name())) {
-                log.info("公共询价, 查询公共询价信息, tel:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name());
                 pageInfo.filter("overdue", Constant.YES);
                 map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
+                log.info("/inquiry/mobile/mobile/v2, 查询公共询价信息, tel: {}, Constant: {}, EnUU: {}, 报价的应用来源: {}, 耗时:{}", user_tel, Constant.UU, en_uu, InquirySource.UU.name(), (System.currentTimeMillis() - start));
                 return map;
             } else if (_state.equals(OrderStatus.invalid.name())) {
-                log.info("公共询价, 查询公共询价信息, tel:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name());
                 pageInfo.filter("status", Status.DISABLED.value());
                 map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
+                log.info("/inquiry/mobile/mobile/v2, 查询公共询价信息, tel: {}, Constant: {}, EnUU: {}, 报价的应用来源: {}, 耗时:{}", user_tel, Constant.UU, en_uu, InquirySource.UU.name(), (System.currentTimeMillis() - start));
                 return map;
             } else if (_state.equals(OrderStatus.done.name())) {
-                log.info("公共询价, 查询已转报价询价列表信息, tel:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name());
                 pageInfo.filter("vendUU", en_uu);
                 filter.setKeyword(keyword);
                 map.put("content", publicInquiryService.findByPageInfo(pageInfo, filter).getContent());
+                log.info("/inquiry/mobile/mobile/v2, 查询已转报价询价列表信息, tel: {}, Constant: {}, EnUU: {}, 报价的应用来源: {}, 耗时: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name(), (System.currentTimeMillis() - start));
+
                 return map;
             }
         } else {
-            log.info("公共询价, 查询公共询价信息, tel:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name());
             pageInfo.filter("vendUU", en_uu);
             map.put("content", publicInquiryService.covertRemindToInquiry(saleService.findRemindByPageInfo(pageInfo, filter).getContent()));
+            log.info("/inquiry/mobile/mobile/v2, 查询公共询价信息, tel: {}, Constant: {}, EnUU: {}, 报价的应用来源: {}, 耗时: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name(), (System.currentTimeMillis() - start));
             return map;
         }
-        log.info("/inquiry/public/mobile/v2 耗时:{}", (System.currentTimeMillis() - start));
         return map;
     }
     /* ===========================================app接口end============================================================ */