|
|
@@ -2,6 +2,7 @@ package com.uas.ps.inquiry.service.impl;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.uas.ps.core.logging.BufferedLoggerManager;
|
|
|
import com.uas.ps.core.util.ContextUtils;
|
|
|
import com.uas.ps.entity.Product;
|
|
|
import com.uas.ps.entity.ProductUsers;
|
|
|
@@ -19,6 +20,7 @@ import com.uas.ps.inquiry.page.criteria.LogicalExpression;
|
|
|
import com.uas.ps.inquiry.page.criteria.PredicateUtils;
|
|
|
import com.uas.ps.inquiry.page.criteria.SimpleExpression;
|
|
|
import com.uas.ps.inquiry.service.PublicInquiryService;
|
|
|
+import com.uas.ps.inquiry.support.InquiryBufferedLogger;
|
|
|
import com.uas.ps.inquiry.util.*;
|
|
|
import org.apache.log4j.Logger;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -80,7 +82,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
|
|
|
@Autowired
|
|
|
private InquiryRemindDao remindDao;
|
|
|
|
|
|
- private static final Logger logger = Logger.getLogger(Logger.class);
|
|
|
+ private static final Logger log = Logger.getLogger(Logger.class);
|
|
|
|
|
|
/**
|
|
|
* 应用来源
|
|
|
@@ -142,6 +144,11 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
|
|
|
*/
|
|
|
private final String PS_MESSAGE_URL = ContextUtils.getBean(AccessConfiguration.class).getPsMessageUrl();
|
|
|
|
|
|
+ /**
|
|
|
+ * 日志
|
|
|
+ */
|
|
|
+ private final static InquiryBufferedLogger logger = BufferedLoggerManager.getLogger(InquiryBufferedLogger.class);
|
|
|
+
|
|
|
/**
|
|
|
* 保存公共询价信息
|
|
|
*
|
|
|
@@ -233,6 +240,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
|
|
|
model.setMailTemplate(MAIL_TEMP_ID);
|
|
|
model.setSmTemplate(SMS_TEMP_ID);
|
|
|
models.add(model);
|
|
|
+ logger.log("公共询价产生消息", "根据物料型号【" + cmpCode + "】查询接收人", "关联询价单明细【" + item.getId() + "】", user.getUseruu(), user.getEnuu(), InquirySource.ERP.name());
|
|
|
}
|
|
|
if (!CollectionUtils.isEmpty(models)) {
|
|
|
sendMessage(models);
|
|
|
@@ -243,7 +251,8 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
|
|
|
}
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
- logger.info("根据企业UU和物料原厂型号cmpCode从公共物料库获取个人产品库相关用户失败:" + e.getMessage());
|
|
|
+ String reson = e.getMessage().length() > 10 ? e.getMessage().substring(0, 1000).concat("") : e.getMessage();
|
|
|
+ logger.log("公共询价产生消息", "根据物料型号【" + cmpCode + "】查询接收人失败,id" + item.getId(), reson, Constant.UU, Constant.UU, InquirySource.ERP.name());
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
}
|
|
|
@@ -342,9 +351,9 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
|
|
|
@Override
|
|
|
public void run() {
|
|
|
try {
|
|
|
- logger.info("发送消息实体" + JSON.toJSONString(models));
|
|
|
+ log.info("发送消息实体" + JSON.toJSONString(models));
|
|
|
String res = HttpUtil.doPost(PS_MESSAGE_URL + "/messages", FlexJsonUtils.toJsonDeep(models));
|
|
|
- logger.info("消息请求发送日志" + res);
|
|
|
+ log.info("消息请求发送日志" + res);
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
@@ -888,7 +897,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
|
|
|
*/
|
|
|
@Override
|
|
|
public IPage<PurcInquiryItemInfo> findTodoByPageInfo(final PageInfo info, final SearchFilter filter) {
|
|
|
- Page<PurcInquiryItemInfo> orders = inquiryItemInfoDao.findAll(new Specification<PurcInquiryItemInfo>() {
|
|
|
+ Page<PurcInquiryItemInfo> orders = inquiryItemInfoDao.findAll(new Specification<PurcInquiryItemInfo>() {
|
|
|
public Predicate toPredicate(Root<PurcInquiryItemInfo> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
|
|
|
if (null != filter) {
|
|
|
if (filter.getFromDate() != null) {
|