diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java index c9c4c45..db3f355 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java @@ -35,7 +35,7 @@ public class HttpClientUtil { // 设置连接池 connMgr = new PoolingHttpClientConnectionManager(); // 设置连接池大小 - connMgr.setMaxTotal(10); + connMgr.setMaxTotal(20); connMgr.setDefaultMaxPerRoute(connMgr.getMaxTotal()); RequestConfig.Builder configBuilder = RequestConfig.custom(); @@ -107,6 +107,7 @@ public class HttpClientUtil { try{ httpClient = new SSLClient(); httpGet = new HttpGet(url+sb.toString()); + httpGet.setConfig(requestConfig); httpGet.addHeader("Authorization", authorization); HttpResponse response = httpClient.execute(httpGet); if(response != null){ diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java index 935fbce..52ad438 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java @@ -8,8 +8,7 @@ import com.lyms.platform.msg.worker.BabyAmsMsgGenerateWorker; import com.lyms.platform.msg.worker.ChanAmsMsgGenerateWorker; import com.lyms.platform.msg.worker.TempleteMsgGenerateWorker; import com.lyms.platform.msg.worker.YunAmsMsgGenerateWorker; -import com.lyms.platform.permission.service.OrganizationService; -import com.lyms.platform.permission.service.UsersService; + import com.lyms.platform.pojo.SmsConfigModel; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; @@ -18,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; +import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -64,7 +64,7 @@ public class MsgGenerateServiceImpl implements IMsgGenerateService { logger.info("The generatePatAmsMsg configs hospital size is {}",configModels.size()); if (CollectionUtils.isNotEmpty(configModels)) { - int batchSize = 3; + int batchSize = 5; int end = 0; for (int i = 0; i < configModels.size(); i += batchSize) { end = (end + batchSize); @@ -90,7 +90,7 @@ public class MsgGenerateServiceImpl implements IMsgGenerateService { logger.info("The generateBabyAmsMsg configs hospital size is {}",configModels.size()); if (CollectionUtils.isNotEmpty(configModels)) { - int batchSize = 3; + int batchSize = 5; int end = 0; for (int i = 0; i < configModels.size(); i += batchSize) { end = (end + batchSize); @@ -116,7 +116,7 @@ public class MsgGenerateServiceImpl implements IMsgGenerateService { logger.info("The generateChanAmsMsg configs hospital size is {}",configModels.size()); if (CollectionUtils.isNotEmpty(configModels)) { - int batchSize = 3; + int batchSize = 5; int end = 0; for (int i = 0; i < configModels.size(); i += batchSize) { end = (end + batchSize); @@ -142,7 +142,7 @@ public class MsgGenerateServiceImpl implements IMsgGenerateService { logger.info("The generateChanAmsMsg configs hospital size is {}",configModels.size()); if (CollectionUtils.isNotEmpty(configModels)) { - int batchSize = 3; + int batchSize = 5; int end = 0; for (int i = 0; i < configModels.size(); i += batchSize) { end = (end + batchSize); @@ -163,11 +163,13 @@ public class MsgGenerateServiceImpl implements IMsgGenerateService { @Override public void generaterAllMsg() { + final CountDownLatch countDownLatch = new CountDownLatch(2); logger.info("generater all msg starting."); new Thread(new Runnable() { @Override public void run() { generateTemplateMsg(null); + countDownLatch.countDown(); } }).start(); @@ -176,17 +178,17 @@ public class MsgGenerateServiceImpl implements IMsgGenerateService { @Override public void run() { generateChanAmsMsg(null); - } - }).start(); - - new Thread(new Runnable() { - @Override - public void run() { generateBabyAmsMsg(null); + generatePatAmsMsg(null); + countDownLatch.countDown(); } }).start(); + try { + countDownLatch.await(); + } catch (InterruptedException e) { + e.printStackTrace(); + } - generatePatAmsMsg(null); logger.info("generater all msg ending."); } } diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java index 3edf806..e1725a7 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java @@ -91,7 +91,7 @@ public class TempleteMsgGenerateWorker implements Runnable { } try { - int batchSize = 3; + int batchSize = 8; int end = 0; for (int i = 0; i < templates.size(); i += batchSize) { end = (end + batchSize);