Merge remote-tracking branch 'origin/dev' into dev

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

@@ -162,7 +162,7 @@ public class DeadlineTask {
                 try {
                     log.info("发送消息实体" + JSON.toJSONString(models));
                     String res = HttpUtil.doPost(PS_MESSAGE_URL + "/messages", FlexJsonUtils.toJsonDeep(models));
-                    log.info("消息请求发送日志" + res);
+                    log.info("消息请求发送");
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

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

@@ -149,14 +149,14 @@ public class InquiryForBuyerController {
      */
     @HttpLog
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public String saveInquiry(@RequestBody PurcInquiry inquiry) throws Exception {
+    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());*/
-            return JSONObject.toJSONString(inquiry);
+            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());*/

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

@@ -6,28 +6,9 @@ import com.uas.ps.core.util.ContextUtils;
 import com.uas.ps.entity.Product;
 import com.uas.ps.entity.Status;
 import com.uas.ps.inquiry.AccessConfiguration;
-import com.uas.ps.inquiry.dao.EnterpriseDao;
-import com.uas.ps.inquiry.dao.InquiryEnRemindDao;
-import com.uas.ps.inquiry.dao.InquiryRemindDao;
-import com.uas.ps.inquiry.dao.ProductDao;
-import com.uas.ps.inquiry.dao.PublicInquiryDao;
-import com.uas.ps.inquiry.dao.PublicInquiryItemDao;
-import com.uas.ps.inquiry.dao.PurcInquiryDao;
-import com.uas.ps.inquiry.dao.PurcInquiryItemDao;
-import com.uas.ps.inquiry.dao.PurcInquiryItemInfoDao;
-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.entity.MessageModel;
-import com.uas.ps.inquiry.entity.OrderStatus;
-import com.uas.ps.inquiry.model.Enterprise;
-import com.uas.ps.inquiry.model.InquiryRemind;
-import com.uas.ps.inquiry.model.PublicInquiry;
-import com.uas.ps.inquiry.model.PublicInquiryItem;
-import com.uas.ps.inquiry.model.PurcInquiry;
-import com.uas.ps.inquiry.model.PurcInquiryItem;
-import com.uas.ps.inquiry.model.PurcInquiryItemInfo;
+import com.uas.ps.inquiry.dao.*;
+import com.uas.ps.inquiry.entity.*;
+import com.uas.ps.inquiry.model.*;
 import com.uas.ps.inquiry.page.PageInfo;
 import com.uas.ps.inquiry.page.SearchFilter;
 import com.uas.ps.inquiry.page.criteria.CriterionExpression;
@@ -37,9 +18,9 @@ import com.uas.ps.inquiry.page.criteria.SimpleExpression;
 import com.uas.ps.inquiry.page.exception.IllegalOperatorException;
 import com.uas.ps.inquiry.service.InquiryService;
 import com.uas.ps.inquiry.service.PublicInquiryService;
-import com.uas.ps.inquiry.support.InquiryBufferedLogger;
 import com.uas.ps.inquiry.util.FlexJsonUtils;
 import com.uas.ps.inquiry.util.HttpUtil;
+import com.uas.ps.inquiry.util.StringUtil;
 import com.uas.ps.inquiry.util.ThreadUtils;
 import javassist.NotFoundException;
 import org.slf4j.Logger;
@@ -58,12 +39,9 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * 针对转询价报价单的数据查询操作
@@ -187,15 +165,15 @@ public class InquiryServiceImpl implements InquiryService {
             info.setOffset(info.getPageSize() * (info.getPageNumber() - 1));
         }
         info.setSort(sort);
-        if (null != filter.getUserUU()) {
-            info.filter("userUU", filter.getUserUU());
-            info.expression(PredicateUtils.isNull("inquiry.enUU"));
-        } else if (null != filter.getEnUU()) {
-            info.filter("inquiry.enUU", filter.getEnUU());
-        } else {
-            throw new IllegalAccessError("非法访问");
-        }
         if (null != filter) {
+            if (null != filter.getUserUU()) {
+                info.filter("userUU", filter.getUserUU());
+                info.expression(PredicateUtils.isNull("inquiry.enUU"));
+            } else if (null != filter.getEnUU()) {
+                info.filter("inquiry.enUU", filter.getEnUU());
+            } else {
+                throw new IllegalAccessError("非法访问");
+            }
             if (StringUtils.hasText(filter.getKeyword())) {
                 SimpleExpression cmpCode = new SimpleExpression("cmpCode", filter.getKeyword(), CriterionExpression.Operator.LIKE);
                 SimpleExpression brand = new SimpleExpression("inbrand", filter.getKeyword(), CriterionExpression.Operator.LIKE);
@@ -260,6 +238,18 @@ public class InquiryServiceImpl implements InquiryService {
      */
     @Override
     public PurcInquiry saveInquiry(PurcInquiry currentInquiry) throws NotFoundException {
+        // amount,code,date设置
+        if (StringUtils.isEmpty(currentInquiry.getAmount())) {
+            currentInquiry.setAmount(currentInquiry.getInquiryItems().size());
+        }
+        if (StringUtils.isEmpty(currentInquiry.getCode())) {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddsss");
+            try {
+                currentInquiry.setCode("MALL" + sdf.parse(sdf.format(new Date())).getTime() + StringUtil.getRandomNumber(3) + StringUtil.getRandomNumber(3));
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        }
         //通过流水号和企业号找到公共询价单
         List<PurcInquiry> existInquiryList = purcInquiryDao.findByCodeAndEnUU(currentInquiry.getCode(), currentInquiry.getEnUU());
         if (!CollectionUtils.isEmpty(existInquiryList)) {
@@ -933,7 +923,7 @@ public class InquiryServiceImpl implements InquiryService {
                         if (models.size() >= 500) {
                             long start = System.currentTimeMillis();
                             String res = HttpUtil.doPost(PS_MESSAGE_URL + "/messages", FlexJsonUtils.toJsonDeep(models));
-                            log.info("消息中心生成消息接口返回日志" + res);
+                            log.info("消息中心生成消息");
                             log.info("发送消息" + models.size() + ",耗时：" + (System.currentTimeMillis() - start));
                             models = new ArrayList<>();
                         }
@@ -941,7 +931,7 @@ public class InquiryServiceImpl implements InquiryService {
                     if (!CollectionUtils.isEmpty(models)) {
                         long start = System.currentTimeMillis();
                         String res = HttpUtil.doPost(PS_MESSAGE_URL + "/messages", FlexJsonUtils.toJsonDeep(models));
-                        log.info("消息中心生成消息接口返回日志" + res);
+                        log.info("消息中心生成消息");
                         log.info("发送消息" + models.size() + ",耗时：" + (System.currentTimeMillis() - start));
                     }
                     log.info("发送消息全部完成");

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

@@ -17,7 +17,6 @@ import com.uas.ps.inquiry.page.SearchFilter;
 import com.uas.ps.inquiry.page.criteria.*;
 import com.uas.ps.inquiry.page.exception.IllegalOperatorException;
 import com.uas.ps.inquiry.service.PublicInquiryService;
-import com.uas.ps.inquiry.support.InquiryBufferedLogger;
 import com.uas.ps.inquiry.util.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,7 +33,10 @@ import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-import javax.persistence.criteria.*;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -528,7 +530,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                     long start = System.currentTimeMillis();
                     log.info("发送消息实体" + JSON.toJSONString(models));
                     String res = HttpUtil.doPost(PS_MESSAGE_URL + "/messages", FlexJsonUtils.toJsonDeep(models));
-                    log.info("消息请求发送日志" + res);
+                    log.info("消息请求发送");
                     log.info("/messages , 条数： " + models.size() + ",耗时：" + (System.currentTimeMillis() - start));
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -1135,6 +1137,22 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
         }
         info.setSort(sort);
         if (null != filter) {
+            if (filter.getFromDate() != null) {
+                info.expression(PredicateUtils.gte("offerTime", new Date(filter.getFromDate()), false));
+            }
+            if (filter.getEndDate() != null) {
+                info.expression(PredicateUtils.lte("offerTime", new Date(filter.getEndDate()), false));
+            }
+            // 此处的 fromDelivery 作为发布时间过滤
+            if (filter.getFromDelivery() != null) {
+                info.expression(PredicateUtils.gte("date", new Date(filter.getFromDelivery()), false));
+            }
+            if (filter.getEndDelivery() != null) {
+                info.expression(PredicateUtils.lte("date", new Date(filter.getEndDelivery()), false));
+            }
+            if (filter.getUserUU() != null) {
+                info.expression(PredicateUtils.gte("vendUserUU", filter.getUserUU(), false));
+            }
             if (StringUtils.hasText(filter.getKeyword())) {
                 SimpleExpression cmpCode = new SimpleExpression("cmpCode", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
                 SimpleExpression brand = new SimpleExpression("inbrand", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
@@ -1146,12 +1164,6 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                 LogicalExpression logical = new LogicalExpression(simpleExpressions, CriterionExpression.Operator.OR);
                 info.expression(logical);
             }
-            if (filter.getFromDate() != null) {
-                info.expression(PredicateUtils.gte("offerTime", new Date(filter.getFromDate()), false));
-            }
-            if (filter.getEndDate() != null) {
-                info.expression(PredicateUtils.lte("offerTime", new Date(filter.getEndDate()), false));
-            }
         }
         Page<PublicInquiryItemInfo> itemInfoPage = itemInfoDao.findAll(new Specification<PublicInquiryItemInfo>() {
             @Override

src/main/java/com/uas/ps/inquiry/util/StringUtil.java

@@ -0,0 +1,34 @@
+package com.uas.ps.inquiry.util;
+
+import java.util.Random;
+import java.util.UUID;
+
+public class StringUtil {
+
+	/**
+	 * 产生唯一字符串
+	 * 
+	 * @return
+	 */
+	public static String uuid() {
+		return UUID.randomUUID().toString().replaceAll("\\-", "");
+	}
+
+	public static String substr(String str, int begin, int end) {
+		return str.substring(begin, Math.min(str.length(), end));
+	}
+
+	/**
+	 * 随机数字
+	 * 
+	 * @param len
+	 *            数字长度
+	 * @return
+	 */
+	public static String getRandomNumber(int len) {
+		int max = (int) Math.pow(10, len) - 1;
+		int min = (int) Math.pow(10, len - 1);
+		return String.valueOf(new Random().nextInt(max) % (max - min + 1) + min);
+	}
+
+}

src/main/resources/config/application-dev.properties

@@ -4,7 +4,7 @@ datasource.password=select111***
 datasource.driverClassName=com.mysql.jdbc.Driver
 datasource.initialSize=1
 datasource.minIdle=30
-datasource.maxActive=100
+datasource.maxActive=500
 datasource.maxWait=5000
 datasource.timeBetweenEvictionRunsMillis=60000
 datasource.minEvictableIdleTimeMillis=300000