Merge remote-tracking branch 'remotes/origin/dev_fegin_concurrent' into pingyin_master

3 years ago · d3c8ac31dc
25 changed files with 178 additions and 6 deletions
--- a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml
+++ b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml
@ -136,6 +136,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200

 ribbon:
  ReadTimeout: 300000
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@ -471,6 +471,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200

 ribbon:
  ReadTimeout: 300000
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
@ -191,6 +191,13 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200
+

 ribbon:
  ReadTimeout: 300000
--- a/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml
@ -138,6 +138,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200

 ribbon:
  ReadTimeout: 300000
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
@ -120,6 +120,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200

 ribbon:
  ReadTimeout: 300000
--- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml
@ -122,6 +122,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200

 ribbon:
  ReadTimeout: 300000
--- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
@ -127,6 +127,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 600000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200

 ribbon:
  ReadTimeout: 600000
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml
@ -133,6 +133,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200

 ribbon:
  ReadTimeout: 300000
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml
@ -122,6 +122,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200

 ribbon:
  ReadTimeout: 300000
--- a/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml
@ -77,6 +77,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200

 ribbon:
  ReadTimeout: 300000
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml
@ -120,6 +120,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200

 ribbon:
  ReadTimeout: 300000
--- a/epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml
@ -101,6 +101,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200

 ribbon:
  ReadTimeout: 300000
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@ -66,6 +66,9 @@ import org.springframework.transaction.annotation.Transactional;

 import java.lang.reflect.Field;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;

@ -112,6 +115,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
    private IcBuildingUnitDao icBuildingUnitDao;
    @Autowired
    private IcHouseDao icHouseDao;
+    @Autowired
+    private ExecutorService executorService;


    @Override
@ -171,10 +176,22 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
        if (null == staffOrgsFormDTO || staffOrgsFormDTO.getCustomerIdList().size() == 0) {
            return new Result<>();
        }
-        List<StaffOrgsResultDTO> list = baseDao.selectStaffOrgList(staffOrgsFormDTO.getCustomerIdList());
+        CompletableFuture<List<StaffOrgsResultDTO>> listFuture = CompletableFuture.supplyAsync(()-> baseDao.selectStaffOrgList(staffOrgsFormDTO.getCustomerIdList()),executorService);
+        //List<StaffOrgsResultDTO> list = baseDao.selectStaffOrgList(staffOrgsFormDTO.getCustomerIdList());
+
        CustomerFormDTO customerFormDTO = new CustomerFormDTO();
        customerFormDTO.setCustomerIdList(staffOrgsFormDTO.getCustomerIdList());
-        Result<List<CustomerDTO>> customerDTOResult = operCrmFeignClient.queryCustomerList(customerFormDTO);
+        CompletableFuture<Result<List<CustomerDTO>>> customerDTOResultFuture = CompletableFuture.supplyAsync(()-> operCrmFeignClient.queryCustomerList(customerFormDTO),executorService);
+        //Result<List<CustomerDTO>> customerDTOResult = operCrmFeignClient.queryCustomerList(customerFormDTO);
+        List<StaffOrgsResultDTO> list = null;
+        Result<List<CustomerDTO>> customerDTOResult = null;
+        try {
+            list = listFuture.get(10, TimeUnit.SECONDS);
+            customerDTOResult = customerDTOResultFuture.get(10, TimeUnit.SECONDS);
+        } catch (Exception e) {
+            log.error("getStaffOrgList exception",e);
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getMsg());
+        }
        List<CustomerDTO> customerDTOList = customerDTOResult.getData();
        if (customerDTOResult.success() && customerDTOList.size() > 0) {
            for (CustomerDTO customer : customerDTOList) {
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml
@ -214,6 +214,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200

 ribbon:
  ReadTimeout: 300000
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml
@ -111,6 +111,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200

 ribbon:
  ReadTimeout: 300000
--- a/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml
@ -122,6 +122,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200

 ribbon:
  ReadTimeout: 300000
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
@ -229,8 +229,24 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn

    @Override
    public Result<List<CustomerDTO>> queryCustomerList(CustomerFormDTO formDTO) {
-        List<CustomerDTO> customerDTOList = baseDao.selectListByIds(formDTO.getCustomerIdList());
-        return new Result<List<CustomerDTO>>().ok(customerDTOList);
+        List<CustomerDTO> result = new ArrayList<>();
+        if(formDTO.getCustomerIdList() != null){
+            for (String customerId : formDTO.getCustomerIdList()) {
+                //先从缓存取 取不到从数据库取
+                CustomerDTO customerDTO = customerRedis.queryCustomerInfo(customerId);
+                if (customerDTO == null) {
+                    CustomerEntity customerEntity = baseDao.selectById(customerId);
+                    if (customerEntity != null) {
+                        customerDTO = ConvertUtils.sourceToTarget(customerEntity, CustomerDTO.class);
+                    }
+                }
+                if (customerDTO != null) {
+                    result.add(customerDTO);
+                }
+            }
+            //List<CustomerDTO> customerDTOList = baseDao.selectListByIds(formDTO.getCustomerIdList());
+        }
+        return new Result<List<CustomerDTO>>().ok(result);
    }

    @Override
--- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml
@ -128,6 +128,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200

 ribbon:
  ReadTimeout: 300000
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml
@ -123,6 +123,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200

 ribbon:
  ReadTimeout: 300000
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
@ -131,6 +131,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200

 ribbon:
  ReadTimeout: 300000
--- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
@ -123,6 +123,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200

 ribbon:
  ReadTimeout: 300000
--- a/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml
@ -104,6 +104,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200

 ribbon:
  ReadTimeout: 300000
@ -129,4 +135,4 @@ thread:
    queueCapacity: @thread.threadPool.queue-capacity@
    keepAliveSeconds: @thread.threadPool.keep-alive-seconds@
    threadNamePrefix: @thread.threadPool.thread-name-prefix@
-    rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@
+    rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml
@ -122,6 +122,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200

 ribbon:
  ReadTimeout: 300000
--- a/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml
@ -72,6 +72,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200

 ribbon:
  ReadTimeout: 300000
@ -97,4 +103,4 @@ thread:
    queueCapacity: @thread.threadPool.queue-capacity@
    keepAliveSeconds: @thread.threadPool.keep-alive-seconds@
    threadNamePrefix: @thread.threadPool.thread-name-prefix@
-    rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@
+    rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@
--- a/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml
+++ b/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml
@ -76,6 +76,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 200

 ribbon:
  ReadTimeout: 300000