Merge remote-tracking branch 'origin/master'

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/portal/SendCodeRequest.java

@@ -20,9 +20,9 @@ public class SendCodeRequest extends AbstractPortalRequest<SendCodeResponse> {
     @Pattern(regexp = RegexConstant.REGEX_MOBILE, message = "请传入正确格式的11位手机号码")
     @NotBlank(message = "手机号不能为空")
     private String mobile;
-    @IntegerConstant(values = "0,1,2,3")
+    @IntegerConstant(values = "0,1,2,3,4")
     @NotNull(message = "业务类型不能为空")
-    private Integer businessType;//0-登录 1-注册 2-忘记密码 3-修改手机号
+    private Integer businessType;//0-登录 1-注册 2-忘记密码 3-修改手机号 4-非本人激活
     @NotNull(message = "来源不能为空")
     private SourceType loginSource;
 

zhywpt-service-bls/src/main/java/cn/com/taiji/bls/config/AppConfig.java

@@ -10,6 +10,7 @@ import org.springframework.context.annotation.AdviceMode;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
 
@@ -18,6 +19,8 @@ import cn.com.taiji.common.manager.AbstractManager;
 import cn.com.taiji.common.pub.AppEnv;
 import cn.com.taiji.common.repo.jpa.MyJpaRespositoryFactoryBean;
 
+import java.util.concurrent.ThreadPoolExecutor;
+
 @Configuration
 @EntityScan(value = {"cn.com.taiji." + AppConfig.APP_NAME + ".entity", "cn.com.taiji.core.entity"})
 @EnableJpaRepositories(
@@ -51,4 +54,15 @@ public class AppConfig extends AbstractManager {
     public CommonBatchJdbcDao commonJdbcDao() {
         return new CommonBatchJdbcDao(dataSource);
     }
+
+    @Bean(name = "myExecutor")
+    public ThreadPoolTaskExecutor threadPoolExecutor() {
+        ThreadPoolTaskExecutor threadPoolTaskExecutor = new ThreadPoolTaskExecutor();
+        threadPoolTaskExecutor.setCorePoolSize(256);
+        threadPoolTaskExecutor.setMaxPoolSize(512);
+        threadPoolTaskExecutor.setKeepAliveSeconds(60);
+        threadPoolTaskExecutor.setQueueCapacity(100);
+        threadPoolTaskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        return threadPoolTaskExecutor;
+    }
 }

zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackCardQueryManager.java

@@ -15,6 +15,7 @@ import cn.com.taiji.core.repo.jpa.basic.QtkCardInfoRepo;
 import cn.com.taiji.core.repo.jpa.log.BlsInterfaceLogRepo;
 import cn.com.taiji.core.repo.request.bls.BlackCardHisPageRequest;
 import cn.com.taiji.core.repo.request.bls.BlackCardPageRequest;
+import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -58,7 +59,6 @@ public class BlackCardQueryManager extends AbstractManager implements LogManager
         }
     }
 
-
 //    private AbstractBlsResponse blackUpload(CardBlackUploadRequest request, Integer status) throws ServiceHandleException {
 ////        CardBlackUploadResponse response = ygzUploader.syncDoCardBlackUpload(request, DataSourceEnum.DSI_INTERFACE);
 //        return response;
@@ -66,7 +66,7 @@ public class BlackCardQueryManager extends AbstractManager implements LogManager
 
 
     private List<CardQueryModel> addModelList(List<QtkBlackCard> cardBlackList, List<QtkBlackCardHis> cardblackHisList){
-        List<CardQueryModel> modelList = null;
+        List<CardQueryModel> modelList = Lists.newArrayList();
         if (!CollectionTools.isEmpty(cardblackHisList)){
             modelList = SourceTargetMapper.INSTANCE.toCardModelList(cardblackHisList);//进行复制
         }

zhywpt-service-bls/src/test/java/cn/com/taiji/oqs/client/bls/TestBlackCardInManager.java

@@ -68,8 +68,11 @@ public class TestBlackCardInManager extends AbstractCommManager {
     @Test
     public void cardQuery(){
         CardQueryRequest cardQueryRequest = new CardQueryRequest();
+
+        cardQueryRequest.setCardId("52012223230230868396");
         try {
             CardQueryResponse response = blackCardQueryManager.serviceHandle(cardQueryRequest);
+            System.out.println(response);
         } catch (ServiceHandleException e) {
             logger.error(e.getMessage(), e);
         }
@@ -80,6 +83,7 @@ public class TestBlackCardInManager extends AbstractCommManager {
     @Test
     public void cardQueryJsonRepeat() throws ManagerException {
         CardQueryRequest cardQueryRequest = new CardQueryRequest();
+        cardQueryRequest.setCardId("52012223230230868396");
         try {
             CardQueryResponse response = jsonPostRepeat(cardQueryRequest);
             System.out.println(response);