新的资金路由添加重试

src/main/java/com/quantgroup/asset/distribution/controller/NewAssertController.java

@@ -7,6 +7,7 @@ import com.quantgroup.asset.distribution.model.response.GlobalResponse;
 import com.quantgroup.asset.distribution.service.newrule.CoreFilter;
 import com.quantgroup.asset.distribution.service.newrule.pojo.funds.FundCallBackParam;
 import com.quantgroup.asset.distribution.service.newrule.third.AuditResponce;
+import com.quantgroup.asset.distribution.util.UUIDUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -33,6 +34,7 @@ public class NewAssertController {
     public GlobalResponse assetsHandler(AuditResponce auditResponce) {
         log.info("风控通知审核结果：{}", JSONObject.toJSONString(auditResponce));
         try {
+            auditResponce.setAssetNo(UUIDUtil.getAssetNo());
             coreFilter.coreHandle(auditResponce);
         } catch (Exception e) {
             return GlobalResponse.error(e.getMessage());

src/main/java/com/quantgroup/asset/distribution/controller/RetryController.java

@@ -4,6 +4,8 @@ import java.sql.Timestamp;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import com.quantgroup.asset.distribution.service.newrule.CoreFilter;
+import com.quantgroup.asset.distribution.service.newrule.third.AuditResponce;
 import com.quantgroup.asset.distribution.service.redis.IRedisService;
 import com.quantgroup.asset.distribution.util.DateUtil;
 import org.apache.commons.collections.CollectionUtils;
@@ -23,6 +25,8 @@ import com.quantgroup.asset.distribution.service.jpa.repository.IDistributeFailL
 
 import lombok.extern.slf4j.Slf4j;
 
+import javax.annotation.Resource;
+
 /**
  * 重试Controller
  * 
@@ -40,14 +44,16 @@ public class RetryController {
 	private IAssetService assetService;
 	@Autowired
 	private IRedisService<String> redisService;
+    @Resource
+    private CoreFilter coreFilter;
 
 	@RequestMapping("/orders")
 	public GlobalResponse retryOrders(String startTime, String endTime) {
 		try {
-			Page<DistributeFailLog> pageableFailAuditLog = distributeFailLogRepository.findByCreatedAtBetweenAndEnable(
-					Timestamp.valueOf(startTime), Timestamp.valueOf(endTime), true, new PageRequest(0, 1000));
+			Page<DistributeFailLog> pageableFailAuditLog = distributeFailLogRepository.findByCreatedAtBetweenAndEnableAndCallType(
+					Timestamp.valueOf(startTime), Timestamp.valueOf(endTime), true,0, new PageRequest(0, 1000));
 			List<DistributeFailLog> distributeFailLogList = pageableFailAuditLog.getContent();
-			retryDistributeFailLogList(distributeFailLogList);
+			retryDistributeFailLogListOld(distributeFailLogList);
 		} catch (Exception e) {
 			log.error("资产分发失败订单重新分发异常!", e);
 		}
@@ -59,35 +65,67 @@ public class RetryController {
 	public void repeatDBAudit() {
 		String lockKey = "ASSET_DISTRIBUTION:REPEAT_DB_ATTRIBUTE:@88JMS";
 		try {
-			log.info("数据库资产分发失败订单重新分发开始");
             boolean b = redisService.setIfAbsent(lockKey, "1", 1, TimeUnit.DAYS);
-			if (!b) { return; }
+            if (!b) {
+                return;
+            }
+            old();
+            now();
+		} catch (Exception e) {
+			log.error("数据库资产分发失败订单重新分发出现异常!", e);
+		} finally {
+			redisService.del(lockKey);
+		}
+	}
+	@Async
+    public void now() throws  Exception {
+        log.info("数据库new资产分发失败订单重新分发开始");
+        try {
             String startTime = DateUtil.getStrFormatDate("yyyy-MM-dd HH:mm:ss", -7);
             String endTime = DateUtil.timestamp2Str(System.currentTimeMillis() + "", "yyyy-MM-dd HH:mm:ss");
             int i = 1;
             while (i > 0 && !CheckController.isOffLine()) {
-				Page<DistributeFailLog> pageableFailDistributeLog = distributeFailLogRepository.findByCreatedAtBetweenAndEnable(Timestamp.valueOf(startTime),
-						Timestamp.valueOf(endTime), true, new PageRequest(0, 50));
+                Page<DistributeFailLog> pageableFailDistributeLog = distributeFailLogRepository.findByCreatedAtBetweenAndEnableAndCallType(Timestamp.valueOf(startTime),
+                        Timestamp.valueOf(endTime), true, 1,new PageRequest(0, 50));
                 List<DistributeFailLog> distributeFailLogList = pageableFailDistributeLog.getContent();
-				retryDistributeFailLogList(distributeFailLogList);
+                retryDistributeFailLogListNew(distributeFailLogList);
                 TimeUnit.SECONDS.sleep(30);
                 ++i;
                 if (distributeFailLogList == null || distributeFailLogList.size() < 50) {
                     i = -1;
                 }
             }
-			log.info("数据库资产分发失败订单重新分发完成!");
-		} catch (Exception e) {
-			log.error("数据库资产分发失败订单重新分发出现异常!", e);
-		} finally {
-			redisService.del(lockKey);
+            log.info("数据库new资产分发失败订单重新分发完成!");
+        } catch (Exception e){
+            throw e;
         }
     }
-
-
-	private void retryDistributeFailLogList(List<DistributeFailLog> distributeFailLogList) {
+    @Async
+    public void old() throws  Exception {
+        log.info("数据库old资产分发失败订单重新分发开始");
+     try {
+         String startTime = DateUtil.getStrFormatDate("yyyy-MM-dd HH:mm:ss", -7);
+         String endTime = DateUtil.timestamp2Str(System.currentTimeMillis() + "", "yyyy-MM-dd HH:mm:ss");
+         int i = 1;
+         while (i > 0 && !CheckController.isOffLine()) {
+             Page<DistributeFailLog> pageableFailDistributeLog = distributeFailLogRepository.findByCreatedAtBetweenAndEnableAndCallType(Timestamp.valueOf(startTime),
+                     Timestamp.valueOf(endTime), true, 0,new PageRequest(0, 50));
+             List<DistributeFailLog> distributeFailLogList = pageableFailDistributeLog.getContent();
+             retryDistributeFailLogListOld(distributeFailLogList);
+             TimeUnit.SECONDS.sleep(30);
+             ++i;
+             if (distributeFailLogList == null || distributeFailLogList.size() < 50) {
+                 i = -1;
+             }
+         }
+         log.info("数据库old资产分发失败订单重新分发完成!");
+     } catch (Exception e){
+         throw e;
+     }
+    }
+	private void retryDistributeFailLogListOld(List<DistributeFailLog> distributeFailLogList) {
         if (CollectionUtils.isNotEmpty(distributeFailLogList)) {
-			log.info("分发失败查询数量为:{}", distributeFailLogList.size());
+            log.info("old分发失败查询数量为:{}", distributeFailLogList.size());
             distributeFailLogList.forEach(distributeFailLog -> {
                 AssetForm assetForm = JSON.parseObject(distributeFailLog.getContext(), AssetForm.class);
                 // 重新审核
@@ -98,4 +136,17 @@ public class RetryController {
             });
         }
     }
+
+    private void retryDistributeFailLogListNew(List<DistributeFailLog> distributeFailLogList) {
+        if (CollectionUtils.isNotEmpty(distributeFailLogList)) {
+            log.info("new分发失败查询数量为:{}", distributeFailLogList.size());
+            distributeFailLogList.forEach(distributeFailLog -> {
+                AuditResponce assetForm = JSON.parseObject(distributeFailLog.getContext(), AuditResponce.class);
+                // 重新审核
+                coreFilter.coreHandle(assetForm);
+                distributeFailLog.setEnable(false);
+                distributeFailLogRepository.save(distributeFailLog);
+            });
+        }
+    }
 }

src/main/java/com/quantgroup/asset/distribution/service/distribute/IDistributeFailLogService.java

 package com.quantgroup.asset.distribution.service.distribute;
 
 import com.quantgroup.asset.distribution.model.form.AssetForm;
+import com.quantgroup.asset.distribution.service.newrule.third.AuditResponce;
 
 /**
  * 分发失败日志处理Service
@@ -15,4 +16,10 @@ public interface IDistributeFailLogService {
 	 * @param failReason
 	 */
 	public void saveDistributeFailLog(AssetForm assetForm, String failReason);
+    /**
+     * 保存失败订单new
+     * @param assetForm
+     * @param failReason
+     */
+    public void saveDistributeFailLogNew(AuditResponce assetForm, String failReason);
 }

src/main/java/com/quantgroup/asset/distribution/service/distribute/impl/DistributeFailLogServiceImpl.java

 package com.quantgroup.asset.distribution.service.distribute.impl;
 
+import com.quantgroup.asset.distribution.service.newrule.third.AuditResponce;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,26 @@ public class DistributeFailLogServiceImpl implements IDistributeFailLogService{
 			distributeFailLog.setContext(JSON.toJSONString(assetForm));
 			distributeFailLog.setFailReason(failReason);
 			distributeFailLog.setEnable(true);
+			distributeFailLog.setCallType(0);
+			distributeFailLogRepository.save(distributeFailLog);
+		} catch (Exception e) {
+			log.error("资产分发失败订单保存异常, asset : {}", JSON.toJSONString(assetForm), e);
+		}
+	}
+    @Async
+    @Override
+    public void saveDistributeFailLogNew(AuditResponce assetForm, String failReason) {
+        try {
+            DistributeFailLog distributeFailLog = new DistributeFailLog();
+            distributeFailLog.setBizChannel(assetForm.getBizChannel());
+            distributeFailLog.setAssetNo(assetForm.getAssetNo());
+            distributeFailLog.setBizNo(assetForm.getBizNo());
+            distributeFailLog.setBizType(Integer.parseInt(assetForm.getBizType()));
+            distributeFailLog.setUuid(assetForm.getUuid());
+            distributeFailLog.setContext(JSON.toJSONString(assetForm));
+            distributeFailLog.setFailReason(failReason);
+            distributeFailLog.setEnable(true);
+            distributeFailLog.setCallType(1);
             distributeFailLogRepository.save(distributeFailLog);
         } catch (Exception e) {
             log.error("资产分发失败订单保存异常, asset : {}", JSON.toJSONString(assetForm), e);

src/main/java/com/quantgroup/asset/distribution/service/jpa/entity/DistributeFailLog.java

@@ -58,6 +58,9 @@ public class DistributeFailLog implements Serializable{
 	@Column(name = "enable")
 	private Boolean enable;
 
+    @Column(name = "call_type")
+    private Integer callType = 0;
+
 	@Column(name = "created_at")
 	private Timestamp createdAt;
 	

src/main/java/com/quantgroup/asset/distribution/service/jpa/repository/IDistributeFailLogRepository.java

@@ -20,8 +20,9 @@ public interface IDistributeFailLogRepository extends JpaRepository<DistributeFa
 	 * @param start
 	 * @param end
 	 * @param enable
+     * @param callType
 	 * @param pageable
 	 * @return
 	 */
-	public Page<DistributeFailLog> findByCreatedAtBetweenAndEnable(Timestamp start, Timestamp end, Boolean enable,Pageable pageable);
+	public Page<DistributeFailLog> findByCreatedAtBetweenAndEnableAndCallType(Timestamp start, Timestamp end, Boolean enable,Integer callType ,Pageable pageable);
 }

src/main/java/com/quantgroup/asset/distribution/service/newrule/CoreFilter.java

@@ -11,6 +11,7 @@ import com.quantgroup.asset.distribution.exception.QGException;
 import com.quantgroup.asset.distribution.exception.QGExceptionType;
 import com.quantgroup.asset.distribution.service.alarm.IAlarmService;
 import com.quantgroup.asset.distribution.service.alarm.impl.MarkdownMessage;
+import com.quantgroup.asset.distribution.service.distribute.IDistributeFailLogService;
 import com.quantgroup.asset.distribution.service.httpclient.IHttpService;
 import com.quantgroup.asset.distribution.service.jpa.entity.*;
 import com.quantgroup.asset.distribution.service.jpa.repository.IChannelRuleRepository;
@@ -30,8 +31,11 @@ import com.quantgroup.asset.distribution.util.IdCardUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -74,8 +78,13 @@ public class CoreFilter {
     @Resource
     private IRoutingRecordRepository routingRecordRepository;
 
+    @Autowired
+    private IDistributeFailLogService distributeFailLogService;
+
+    @Async
     @Transactional(rollbackFor = Exception.class)
     public void coreHandle(AuditResponce auditResponce){
+        try {
             List<ChannelRuleEntity> channelRuleEntityList = channelRuleRepository.getByChannelId(Long.parseLong(auditResponce.getBizChannel()));
             if (CollectionUtils.isEmpty(channelRuleEntityList)){
                 throw new RuntimeException("渠道配置产品集不存在，运营人员配置有问题");
@@ -94,9 +103,6 @@ public class CoreFilter {
                 }
                 routingRecordList.add(generateRouteRecord(channelRuleEntity));
             }
-        if (CollectionUtils.isEmpty(financeProducts)) {
-            throw new RuntimeException("筛选完成后没有可用的配置");
-        }
             FilterResult result = new FilterResult();
             result.setFinanceProducts(JSON.toJSONString(financeProducts));
             Map<String,String> response = httpService.postHasResponse(auditResponce.getCallbackUrl(), result.get(auditResponce));
@@ -122,6 +128,15 @@ public class CoreFilter {
                 }
                 routingRecordRepository.save(routingRecordEntity);
             }
+        } catch (Exception e) {
+            log.error("资金路由分发出现异常, uuid : {}, bizChannel : {}, bizType : {}, bizNo : {} ", auditResponce.getUuid(),
+                    auditResponce.getBizChannel(), auditResponce.getBizType());
+            distributeFailLogService.saveDistributeFailLogNew(auditResponce, ExceptionUtils.getMessage(e));
+            alarmService.dingtalkAlarm("Warn", "资金路由分发出现异常", "bizChannel : " + auditResponce.getBizChannel()
+                    + " , bizType : " + auditResponce.getBizType() + " , bizNo : " + auditResponce.getBizNo()
+                    + " , uuid : " + auditResponce.getUuid()
+                    + " , 错误信息 : "+ ExceptionUtils.getMessage(e));
+        }
     }
 
     private RoutingRecordVO generateRouteRecord(ChannelRuleEntity channelRuleEntity){

src/main/java/com/quantgroup/asset/distribution/service/newrule/third/AuditResponce.java

@@ -124,4 +124,6 @@ public class AuditResponce {
 
     private String userTag;
 
+    private String assetNo;
+
 }