Merge branch 'test' of http://www.baoxianzhanggui.com:8090/sxzgd/java-insagent-pc into test-cyr

src/main/java/com/ydtech/modules/order/entity/crawler/request/CrawlerQuoteRequest.java

@@ -39,4 +39,9 @@ public class CrawlerQuoteRequest extends BaseQuoteInfoVo {
      */
     private String pythonCheck;
 
+    /**
+     * 系统字段
+     */
+    private String form;
+
 }

src/main/java/com/ydtech/modules/order/service/impl/InsCrawlerOrderServiceImpl.java

@@ -27,6 +27,7 @@ import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.order.service.InsTaskImagesService;
 import com.ydtech.modules.protocol.entity.constants.PtlCrawlerApiType;
 import com.ydtech.modules.protocol.entity.dto.PtlAgreementAttributionDto;
+import com.ydtech.modules.protocol.entity.dto.PtlAttributionTemplateDto;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementAttribution;
 import com.ydtech.modules.protocol.service.PtlAgreementAttributionService;
 import com.ydtech.modules.protocol.service.PtlCrawlerApiService;
@@ -116,6 +117,15 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
             crawlerQuoteRequest.setPlyappno(insAreaCompany.getInsOrderNo());
         }
 
+        // 系统类型
+        List<PtlAttributionTemplateDto> ptlAttributionTemplateDtos = ptlAgreementAttribution.getFields().toJavaList(PtlAttributionTemplateDto.class);
+        List<PtlAttributionTemplateDto> collect = ptlAttributionTemplateDtos.stream().filter(x -> "form".equals(x.getField())).collect(Collectors.toList());
+        if (!collect.isEmpty()) {
+            PtlAttributionTemplateDto ptlAttributionTemplateDto = collect.get(0);
+            String value = ptlAttributionTemplateDto.getValue();
+            crawlerQuoteRequest.setForm(value);
+        }
+
         // 发送请求
         CrawlerQuoteResponse response = insCrawlerOrderComponents.request(apiUrl, ptlAgreementAttribution.getInsCompanyId(),
                 PtlCrawlerApiType.API_2.getDesc(), crawlerQuoteRequest, CrawlerQuoteResponse.class);

src/main/java/com/ydtech/modules/order/service/impl/YongchengOrderApiServiceImpl.java

@@ -4,10 +4,8 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.ydtech.config.properties.GuorenApiConfigurationProperties;
 import com.ydtech.config.properties.YongchengApiConfigurationProperties;
 import com.ydtech.constants.InsuranceEnum;
 import com.ydtech.constants.enums.InsuranceRisk;
@@ -76,14 +74,12 @@ import com.ydtech.modules.order.utils.InsuranceLog;
 import com.ydtech.modules.protocol.entity.constants.PtlApiType;
 import com.ydtech.modules.protocol.utils.AssertionUtils;
 import com.ydtech.utils.DateTimeUtil;
-import com.ydtech.utils.ObjectUtil;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.baidu.FileUtil;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.ObjectUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -477,7 +473,7 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
      * @param regex    正则表达是
      * @return
      */
-    private String processingTime(String errorMsg, String regex, String rule) {
+    private static String processingTime(String errorMsg, String regex, String rule) {
         String coverageEndDate = GuorenDuplicateInsuranceComponent.getEndDate(errorMsg, regex);
 
         if (coverageEndDate.isEmpty() && errorMsg.contains(rule)) {
@@ -494,7 +490,7 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
      * @param regex
      * @return
      */
-    private TimeEntity getRepeatStartEndTime(String errorMsg, String regex, String rule) {
+    private static TimeEntity getRepeatStartEndTime(String errorMsg, String regex, String rule) {
         String coverageEndDate = processingTime(errorMsg, regex, rule);
         TimeEntity timeEntity = new TimeEntity();
 
@@ -587,10 +583,10 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
             }
 
             //终保日期
-            TimeEntity timeEntity = getRepeatStartEndTime(ciMsg, SY_REGEX, SY_RULE);
+            TimeEntity timeEntity = getRepeatStartEndTime(ciMsg, SY_REGEX, "");
 
             if (StringUtils.isEmpty(timeEntity.getCoverageEndDate())) {
-                return true;
+                throw new SystemException(ciMsg);
             }
 
             System.err.println("商业新起：" + timeEntity.getNewStartDate());