update:

1.华农财险修改问题

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/api/service/impl/DaJiaApiRequestImpl.java

@@ -14,6 +14,8 @@ import com.jzg.commons.util.StringUtils;
 import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.commons.entity.quote.vo.base.OrderBase;
 import com.jzg.commons.entity.quote.vo.image.InsuranceImageVo;
+import com.jzg.quotation.commons.annotation.QuoteApiService;
+import com.jzg.quotation.commons.constant.InsuranceCode;
 import com.jzg.quotation.commons.standard.conversion.ConfigureParametersConversion;
 import com.jzg.quotation.commons.utils.DateTimeUtil;
 import com.jzg.quotation.dajia.api.build.DaJiaAPIQuoteResultsVoBuild;
@@ -39,8 +41,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-//@QuoteApiService(value = InsuranceCode.INSURANCE_DJPC)
-@Service
+@QuoteApiService(value = InsuranceCode.INSURANCE_DJPC)
 @RequiredArgsConstructor
 @Transactional
 public class DaJiaApiRequestImpl implements DaJiaApiRequest {

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/build/HuaNongCrawlerQuoteResultsVoBuild.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/build/HuaNongCrawlerQuoteResultsVoBuild.java

@@ -1,12 +1,12 @@
-package com.jzg.quote.huanong.crawler.build;
+package com.jzg.quotation.huanong.crawler.build;
 
 import com.jzg.commons.entity.quote.vo.KindInfoVo;
 import com.jzg.commons.entity.quote.vo.RiskInfoVo;
 import com.jzg.quotation.commons.component.ConversionOfQuoteInformation;
 import com.jzg.commons.entity.quote.vo.aggregated.QuoteResultsVo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
-import com.jzg.quote.huanong.crawler.entity.response.HuaNongCrawlerQuotedPriceResponse;
-import com.jzg.quote.huanong.enums.dictionary.Risk;
+import com.jzg.quotation.huanong.crawler.entity.response.HuaNongCrawlerQuotedPriceResponse;
+import com.jzg.quotation.huanong.enums.dictionary.Risk;
 
 import java.util.List;
 import java.util.Map;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/component/HuaNongCrawlerCacheComponent.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/component/HuaNongCrawlerCacheComponent.java

@@ -1,8 +1,8 @@
-package com.jzg.quote.huanong.crawler.component;
+package com.jzg.quotation.huanong.crawler.component;
 
 
 import com.jzg.commons.exception.SystemException;
-import com.jzg.quote.huanong.crawler.entity.response.HuaNongCrawlerLoginResponse;
+import com.jzg.quotation.huanong.crawler.entity.response.HuaNongCrawlerLoginResponse;
 import lombok.RequiredArgsConstructor;
 import org.redisson.api.RMap;
 import org.redisson.api.RedissonClient;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/component/HuaNongCrawlerRequestComponent.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/component/HuaNongCrawlerRequestComponent.java

@@ -1,14 +1,14 @@
-package com.jzg.quote.huanong.crawler.component;
+package com.jzg.quotation.huanong.crawler.component;
 
 import cn.hutool.core.codec.Base64;
 import com.alibaba.fastjson2.JSONObject;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.component.RequestComponent;
-import com.jzg.quote.huanong.crawler.constant.enums.RequestUrl;
-import com.jzg.quote.huanong.crawler.entity.request.*;
-import com.jzg.quote.huanong.crawler.entity.response.*;
-import com.jzg.quote.huanong.crawler.properties.HuaNongCrawlerProperties;
-import com.jzg.quote.huanong.crawler.utils.RequestEncryptor;
+import com.jzg.quotation.huanong.crawler.constant.enums.RequestUrl;
+import com.jzg.quotation.huanong.crawler.entity.request.*;
+import com.jzg.quotation.huanong.crawler.entity.response.*;
+import com.jzg.quotation.huanong.crawler.properties.HuaNongCrawlerProperties;
+import com.jzg.quotation.huanong.crawler.utils.RequestEncryptor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.FileSystemResource;
@@ -25,7 +25,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
-import static com.jzg.quote.huanong.crawler.constant.enums.RequestUrl.*;
+import static com.jzg.quotation.huanong.crawler.constant.enums.RequestUrl.*;
 
 
 /**

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/constant/enums/RequestUrl.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/constant/enums/RequestUrl.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.constant.enums;
+package com.jzg.quotation.huanong.crawler.constant.enums;
 
 import com.jzg.quotation.commons.standard.CrawlerRequestUrlStandard;
 import lombok.AllArgsConstructor;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/constant/enums/ReturnCode.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/constant/enums/ReturnCode.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.constant.enums;
+package com.jzg.quotation.huanong.crawler.constant.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/HuaNongCrawlerConfigureParameters.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/HuaNongCrawlerConfigureParameters.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity;
+package com.jzg.quotation.huanong.crawler.entity;
 
 import com.jzg.quotation.commons.standard.ConfigureParameters;
 import lombok.Data;
@@ -29,7 +29,7 @@ public class HuaNongCrawlerConfigureParameters implements ConfigureParameters {
     /**
      * 渠道类型编码
      */
-    private String producerCode;
+    private String producer;
     /**
      * 协议号
      */

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/po/HuaNongCrawlerOrder.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/po/HuaNongCrawlerOrder.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.po;
+package com.jzg.quotation.huanong.crawler.entity.po;
 
 
 import lombok.AllArgsConstructor;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerActualValueRequest.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerActualValueRequest.java

@@ -1,9 +1,9 @@
-package com.jzg.quote.huanong.crawler.entity.request;
+package com.jzg.quotation.huanong.crawler.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jzg.commons.entity.quote.vo.CarInfoVo;
 import com.jzg.quotation.commons.utils.TimeProcessing;
-import com.jzg.quote.huanong.crawler.entity.response.HuaNongCrawlerModelsQueryResponse;
+import com.jzg.quotation.huanong.crawler.entity.response.HuaNongCrawlerModelsQueryResponse;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerComInfoQueryRequest.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerComInfoQueryRequest.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.request;
+package com.jzg.quotation.huanong.crawler.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerDocumentsPrintRequest.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerDocumentsPrintRequest.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.request;
+package com.jzg.quotation.huanong.crawler.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerFileSubmitRequest.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerFileSubmitRequest.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.request;
+package com.jzg.quotation.huanong.crawler.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
@@ -55,70 +55,101 @@ public class HuaNongCrawlerFileSubmitRequest {
 
             @JsonProperty("pid")
             private String pid;
+
             @JsonProperty("newNodeFlag")
             private Integer newNodeFlag;
+
             @JsonProperty("docNum")
             private Integer docNum;
+
             @JsonProperty("nodeLevel")
             private Integer nodeLevel;
+
             @JsonProperty("pages")
             private Object pages;
+
             @JsonProperty("resize")
             private String resize;
+
             @JsonProperty("childFlag")
             private Integer childFlag;
+
             @JsonProperty("sortNo")
             private Integer sortNo;
+
             @JsonProperty("bizNo")
             private String bizNo;
+
             @JsonProperty("appCode")
             private String appCode;
+
             @JsonProperty("appName")
             private String appName;
+
             @JsonProperty("icon")
             private String icon;
+
             @JsonProperty("label")
             private String label;
+
             @JsonProperty("children")
             private List<ChildrenDTO> children;
+
             @JsonProperty("pagesNew")
             private List<PagesNewDTO> pagesNew;
 
             @NoArgsConstructor
             @Data
             public static class ChildrenDTO {
+
                 @JsonProperty("id")
                 private Object id;
+
                 @JsonProperty("right")
                 private String right;
+
                 @JsonProperty("nodeCode")
                 private String nodeCode;
+
                 @JsonProperty("nodeName")
                 private String nodeName;
+
                 @JsonProperty("pid")
                 private String pid;
+
                 @JsonProperty("newNodeFlag")
                 private Integer newNodeFlag;
+
                 @JsonProperty("docNum")
                 private Integer docNum;
+
                 @JsonProperty("nodeLevel")
                 private Integer nodeLevel;
+
                 @JsonProperty("pages")
                 private Object pages;
+
                 @JsonProperty("resize")
                 private String resize;
+
                 @JsonProperty("childFlag")
                 private Integer childFlag;
+
                 @JsonProperty("sortNo")
                 private Integer sortNo;
+
                 @JsonProperty("bizNo")
                 private String bizNo;
+
                 @JsonProperty("appCode")
                 private String appCode;
+
                 @JsonProperty("appName")
                 private String appName;
+
                 @JsonProperty("icon")
                 private String icon;
+
                 @JsonProperty("label")
                 private String label;
             }
@@ -126,48 +157,70 @@ public class HuaNongCrawlerFileSubmitRequest {
             @NoArgsConstructor
             @Data
             public static class PagesNewDTO {
+
                 @JsonProperty("thumbUrl")
                 private String thumbUrl;
+
                 @JsonProperty("imageUrl")
                 private String imageUrl;
+
                 @JsonProperty("progressStatl")
                 private Integer progressStatl;
+
                 @JsonProperty("originalName")
                 private String originalName;
+
                 @JsonProperty("pageFormat")
                 private String pageFormat;
+
                 @JsonProperty("id")
                 private String id;
+
                 @JsonProperty("nodeId")
                 private String nodeId;
+
                 @JsonProperty("newFileFlag")
                 private Integer newFileFlag;
+
                 @JsonProperty("noSubmitFileFlag")
                 private Integer noSubmitFileFlag;
+
                 @JsonProperty("appCode")
                 private String appCode;
+
                 @JsonProperty("bizNo")
                 private String bizNo;
+
                 @JsonProperty("type")
                 private String type;
+
                 @JsonProperty("createUserName")
                 private String createUserName;
+
                 @JsonProperty("createUser")
                 private String createUser;
+
                 @JsonProperty("uploadOrg")
                 private String uploadOrg;
+
                 @JsonProperty("createTime")
                 private String createTime;
+
                 @JsonProperty("pageName")
                 private String pageName;
+
                 @JsonProperty("tempId")
                 private String tempId;
+
                 @JsonProperty("exif")
                 private String exif;
+
                 @JsonProperty("pageDesc")
                 private String pageDesc;
+
                 @JsonProperty("sortNo")
                 private Integer sortNo;
+
             }
         }
     }

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerFindBusinessesRequest.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerFindBusinessesRequest.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.request;
+package com.jzg.quotation.huanong.crawler.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerFtpDownloadRequest.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerFtpDownloadRequest.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.request;
+package com.jzg.quotation.huanong.crawler.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerLoginRequest.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerLoginRequest.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.request;
+package com.jzg.quotation.huanong.crawler.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jodd.util.Base64;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerModelsQueryRequest.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerModelsQueryRequest.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.request;
+package com.jzg.quotation.huanong.crawler.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jzg.commons.entity.quote.vo.CarInfoVo;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerNewImageQueryRequest.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerNewImageQueryRequest.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.request;
+package com.jzg.quotation.huanong.crawler.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerQuotedPriceRequest.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerQuotedPriceRequest.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.request;
+package com.jzg.quotation.huanong.crawler.entity.request;
 
 import cn.hutool.core.codec.Base64;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -7,10 +7,10 @@ import com.jzg.commons.entity.quote.vo.CustomerInfoVo;
 import com.jzg.commons.entity.quote.vo.KindInfoVo;
 import com.jzg.commons.entity.quote.vo.RiskInfoVo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
-import com.jzg.quote.huanong.crawler.entity.HuaNongCrawlerConfigureParameters;
-import com.jzg.quote.huanong.crawler.entity.response.HuaNongCrawlerComInfoQueryResponse;
-import com.jzg.quote.huanong.crawler.entity.response.HuaNongCrawlerModelsQueryResponse;
-import com.jzg.quote.huanong.crawler.entity.response.HuaNongCrawlerUserTypeAndProxyInfoQueryResponse;
+import com.jzg.quotation.huanong.crawler.entity.HuaNongCrawlerConfigureParameters;
+import com.jzg.quotation.huanong.crawler.entity.response.HuaNongCrawlerComInfoQueryResponse;
+import com.jzg.quotation.huanong.crawler.entity.response.HuaNongCrawlerModelsQueryResponse;
+import com.jzg.quotation.huanong.crawler.entity.response.HuaNongCrawlerUserTypeAndProxyInfoQueryResponse;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -901,7 +901,7 @@ public class HuaNongCrawlerQuotedPriceRequest implements Serializable, HuaNongHe
                 this.staffName = "";
                 this.teamCode = handlerListDTO.getTeamCode();
                 this.teamName = handlerListDTO.getTeamName();
-                this.channelSource = channelSource;
+                this.channelSource = "";
                 this.channelSourceName = "";
 
                 this.producerCode = "";

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerRequestBaseHead.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerRequestBaseHead.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.request;
+package com.jzg.quotation.huanong.crawler.entity.request;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerSaveRequest.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerSaveRequest.java

@@ -1,7 +1,7 @@
-package com.jzg.quote.huanong.crawler.entity.request;
+package com.jzg.quotation.huanong.crawler.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.jzg.quote.huanong.enums.dictionary.Risk;
+import com.jzg.quotation.huanong.enums.dictionary.Risk;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerSubmitRequest.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerSubmitRequest.java

@@ -1,7 +1,7 @@
-package com.jzg.quote.huanong.crawler.entity.request;
+package com.jzg.quotation.huanong.crawler.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.jzg.quote.huanong.crawler.entity.po.HuaNongCrawlerOrder;
+import com.jzg.quotation.huanong.crawler.entity.po.HuaNongCrawlerOrder;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerUserTypeAndProxyInfoQueryRequest.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerUserTypeAndProxyInfoQueryRequest.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.request;
+package com.jzg.quotation.huanong.crawler.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerVerificationCodeRequest.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerVerificationCodeRequest.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.request;
+package com.jzg.quotation.huanong.crawler.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongHead.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongHead.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.request;
+package com.jzg.quotation.huanong.crawler.entity.request;
 
 /**
  * @description: head 接口

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/response/HuaNongCrawlerActualValueResponse.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/response/HuaNongCrawlerActualValueResponse.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.response;
+package com.jzg.quotation.huanong.crawler.entity.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/response/HuaNongCrawlerBaseResponseHead.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/response/HuaNongCrawlerBaseResponseHead.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.response;
+package com.jzg.quotation.huanong.crawler.entity.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/response/HuaNongCrawlerCatalogQueryResponse.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/response/HuaNongCrawlerCatalogQueryResponse.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.response;
+package com.jzg.quotation.huanong.crawler.entity.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/response/HuaNongCrawlerComInfoQueryResponse.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/response/HuaNongCrawlerComInfoQueryResponse.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.response;
+package com.jzg.quotation.huanong.crawler.entity.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/response/HuaNongCrawlerDocumentsPrintResponse.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/response/HuaNongCrawlerDocumentsPrintResponse.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.response;
+package com.jzg.quotation.huanong.crawler.entity.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/response/HuaNongCrawlerFileSubmitResponse.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/response/HuaNongCrawlerFileSubmitResponse.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.response;
+package com.jzg.quotation.huanong.crawler.entity.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/response/HuaNongCrawlerFileUploadResponse.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/response/HuaNongCrawlerFileUploadResponse.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.response;
+package com.jzg.quotation.huanong.crawler.entity.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/response/HuaNongCrawlerFindBusinessesResponse.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/response/HuaNongCrawlerFindBusinessesResponse.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.response;
+package com.jzg.quotation.huanong.crawler.entity.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/response/HuaNongCrawlerFtpDownloadResponse.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/response/HuaNongCrawlerFtpDownloadResponse.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.response;
+package com.jzg.quotation.huanong.crawler.entity.response;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/response/HuaNongCrawlerLoginResponse.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/response/HuaNongCrawlerLoginResponse.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.response;
+package com.jzg.quotation.huanong.crawler.entity.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/response/HuaNongCrawlerModelsQueryResponse.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/response/HuaNongCrawlerModelsQueryResponse.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.response;
+package com.jzg.quotation.huanong.crawler.entity.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jzg.quotation.commons.filter.CarModelsFilter;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/response/HuaNongCrawlerNewImageQueryResponse.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/response/HuaNongCrawlerNewImageQueryResponse.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.response;
+package com.jzg.quotation.huanong.crawler.entity.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/response/HuaNongCrawlerQuotedPriceResponse.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/response/HuaNongCrawlerQuotedPriceResponse.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.response;
+package com.jzg.quotation.huanong.crawler.entity.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/response/HuaNongCrawlerSaveResponse.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/response/HuaNongCrawlerSaveResponse.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.response;
+package com.jzg.quotation.huanong.crawler.entity.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/response/HuaNongCrawlerSubmitResponse.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/response/HuaNongCrawlerSubmitResponse.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.response;
+package com.jzg.quotation.huanong.crawler.entity.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/response/HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/response/HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.response;
+package com.jzg.quotation.huanong.crawler.entity.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/response/HuaNongCrawlerVerificationCodeResponse.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/response/HuaNongCrawlerVerificationCodeResponse.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.entity.response;
+package com.jzg.quotation.huanong.crawler.entity.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/properties/HuaNongCrawlerProperties.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/properties/HuaNongCrawlerProperties.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.properties;
+package com.jzg.quotation.huanong.crawler.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/repository/HuaNongCrawlerOrderRepository.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/repository/HuaNongCrawlerOrderRepository.java

@@ -1,7 +1,7 @@
-package com.jzg.quote.huanong.crawler.repository;
+package com.jzg.quotation.huanong.crawler.repository;
 
 import com.jzg.quotation.commons.repository.BaseRepository;
-import com.jzg.quote.huanong.crawler.entity.po.HuaNongCrawlerOrder;
+import com.jzg.quotation.huanong.crawler.entity.po.HuaNongCrawlerOrder;
 import org.springframework.stereotype.Repository;
 
 

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/service/HuaNongCrawlerGetToken.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/service/HuaNongCrawlerGetToken.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.service;
+package com.jzg.quotation.huanong.crawler.service;
 
 
 public interface HuaNongCrawlerGetToken {

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/service/HuaNongCrawlerOrderService.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/service/HuaNongCrawlerOrderService.java

@@ -1,6 +1,6 @@
-package com.jzg.quote.huanong.crawler.service;
+package com.jzg.quotation.huanong.crawler.service;
 
-import com.jzg.quote.huanong.crawler.entity.po.HuaNongCrawlerOrder;
+import com.jzg.quotation.huanong.crawler.entity.po.HuaNongCrawlerOrder;
 
 public interface HuaNongCrawlerOrderService {
 

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/service/HuaNongCrawlerQuoteProcessService.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/service/HuaNongCrawlerQuoteProcessService.java

@@ -1,8 +1,8 @@
-package com.jzg.quote.huanong.crawler.service;
+package com.jzg.quotation.huanong.crawler.service;
 
 import com.jzg.commons.entity.quote.vo.image.InsuranceImageVo;
-import com.jzg.quote.huanong.crawler.entity.HuaNongCrawlerConfigureParameters;
-import com.jzg.quote.huanong.crawler.entity.request.HuaNongCrawlerQuotedPriceRequest;
+import com.jzg.quotation.huanong.crawler.entity.HuaNongCrawlerConfigureParameters;
+import com.jzg.quotation.huanong.crawler.entity.request.HuaNongCrawlerQuotedPriceRequest;
 
 import java.util.List;
 

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/service/HuaNongCrawlerRequest.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/service/HuaNongCrawlerRequest.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.service;
+package com.jzg.quotation.huanong.crawler.service;
 
 import com.jzg.quotation.commons.service.QuotationCrawlerBaseService;
 

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/service/impl/HuaNongCrawlerGetTokenImpl.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/service/impl/HuaNongCrawlerGetTokenImpl.java

@@ -1,10 +1,10 @@
-package com.jzg.quote.huanong.crawler.service.impl;
+package com.jzg.quotation.huanong.crawler.service.impl;
 
 
 import com.jzg.commons.util.StringUtils;
-import com.jzg.quote.huanong.crawler.component.HuaNongCrawlerCacheComponent;
-import com.jzg.quote.huanong.crawler.service.HuaNongCrawlerGetToken;
-import com.jzg.quote.huanong.crawler.service.HuaNongCrawlerQuoteProcessService;
+import com.jzg.quotation.huanong.crawler.component.HuaNongCrawlerCacheComponent;
+import com.jzg.quotation.huanong.crawler.service.HuaNongCrawlerGetToken;
+import com.jzg.quotation.huanong.crawler.service.HuaNongCrawlerQuoteProcessService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/service/impl/HuaNongCrawlerOrderServiceImpl.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/service/impl/HuaNongCrawlerOrderServiceImpl.java

@@ -1,8 +1,8 @@
-package com.jzg.quote.huanong.crawler.service.impl;
+package com.jzg.quotation.huanong.crawler.service.impl;
 
-import com.jzg.quote.huanong.crawler.entity.po.HuaNongCrawlerOrder;
-import com.jzg.quote.huanong.crawler.repository.HuaNongCrawlerOrderRepository;
-import com.jzg.quote.huanong.crawler.service.HuaNongCrawlerOrderService;
+import com.jzg.quotation.huanong.crawler.entity.po.HuaNongCrawlerOrder;
+import com.jzg.quotation.huanong.crawler.repository.HuaNongCrawlerOrderRepository;
+import com.jzg.quotation.huanong.crawler.service.HuaNongCrawlerOrderService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/service/impl/HuaNongCrawlerQuoteProcessServiceImpl.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/service/impl/HuaNongCrawlerQuoteProcessServiceImpl.java

@@ -1,16 +1,16 @@
-package com.jzg.quote.huanong.crawler.service.impl;
+package com.jzg.quotation.huanong.crawler.service.impl;
 
 import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.component.DistributedLockUtil;
 import com.jzg.commons.entity.quote.vo.image.InsuranceImageVo;
 import com.jzg.quotation.commons.service.ExteriorUtilsRequest;
-import com.jzg.quote.huanong.crawler.component.HuaNongCrawlerCacheComponent;
-import com.jzg.quote.huanong.crawler.component.HuaNongCrawlerRequestComponent;
-import com.jzg.quote.huanong.crawler.constant.enums.ReturnCode;
-import com.jzg.quote.huanong.crawler.entity.HuaNongCrawlerConfigureParameters;
-import com.jzg.quote.huanong.crawler.entity.request.*;
-import com.jzg.quote.huanong.crawler.entity.response.*;
-import com.jzg.quote.huanong.crawler.service.HuaNongCrawlerQuoteProcessService;
+import com.jzg.quotation.huanong.crawler.component.HuaNongCrawlerCacheComponent;
+import com.jzg.quotation.huanong.crawler.component.HuaNongCrawlerRequestComponent;
+import com.jzg.quotation.huanong.crawler.constant.enums.ReturnCode;
+import com.jzg.quotation.huanong.crawler.entity.HuaNongCrawlerConfigureParameters;
+import com.jzg.quotation.huanong.crawler.entity.request.*;
+import com.jzg.quotation.huanong.crawler.entity.response.*;
+import com.jzg.quotation.huanong.crawler.service.HuaNongCrawlerQuoteProcessService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
@@ -40,9 +40,10 @@ public class HuaNongCrawlerQuoteProcessServiceImpl implements HuaNongCrawlerQuot
     public void login(String username, String password, boolean isFirst) {
         try {
             distributedLockUtil.executeWithLock(HuaNongCrawlerCacheComponent.LOGIN_LOCKOUT + username, () -> authorization(username, password, isFirst), 20, 30);
-        } catch (Exception ignored) {
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new SystemException("登录失败");
         }
-        throw new SystemException("登录失败");
     }
 
     private boolean isLoginSuccessful(HuaNongCrawlerLoginResponse response) {

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/service/impl/HuaNongCrawlerRequestImpl.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/service/impl/HuaNongCrawlerRequestImpl.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.service.impl;
+package com.jzg.quotation.huanong.crawler.service.impl;
 
 import com.jzg.commons.entity.quote.vo.AttributionInformationVo;
 import com.jzg.commons.entity.quote.vo.CarInfoVo;
@@ -10,19 +10,19 @@ import com.jzg.quotation.commons.constant.InsuranceCode;
 import com.jzg.commons.entity.quote.vo.base.LoginBase;
 import com.jzg.quotation.commons.filter.CarModelsFilterUtils;
 import com.jzg.quotation.commons.standard.conversion.ConfigureParametersConversion;
-import com.jzg.quote.huanong.crawler.build.HuaNongCrawlerQuoteResultsVoBuild;
-import com.jzg.quote.huanong.crawler.component.HuaNongCrawlerCacheComponent;
-import com.jzg.quote.huanong.crawler.component.HuaNongCrawlerRequestComponent;
-import com.jzg.quote.huanong.crawler.entity.HuaNongCrawlerConfigureParameters;
-import com.jzg.quote.huanong.crawler.entity.po.HuaNongCrawlerOrder;
-import com.jzg.quote.huanong.crawler.entity.request.*;
-import com.jzg.quote.huanong.crawler.entity.response.HuaNongCrawlerModelsQueryResponse;
-import com.jzg.quote.huanong.crawler.entity.response.HuaNongCrawlerQuotedPriceResponse;
-import com.jzg.quote.huanong.crawler.entity.response.HuaNongCrawlerSubmitResponse;
-import com.jzg.quote.huanong.crawler.service.HuaNongCrawlerGetToken;
-import com.jzg.quote.huanong.crawler.service.HuaNongCrawlerOrderService;
-import com.jzg.quote.huanong.crawler.service.HuaNongCrawlerQuoteProcessService;
-import com.jzg.quote.huanong.crawler.service.HuaNongCrawlerRequest;
+import com.jzg.quotation.huanong.crawler.build.HuaNongCrawlerQuoteResultsVoBuild;
+import com.jzg.quotation.huanong.crawler.component.HuaNongCrawlerCacheComponent;
+import com.jzg.quotation.huanong.crawler.component.HuaNongCrawlerRequestComponent;
+import com.jzg.quotation.huanong.crawler.entity.HuaNongCrawlerConfigureParameters;
+import com.jzg.quotation.huanong.crawler.entity.po.HuaNongCrawlerOrder;
+import com.jzg.quotation.huanong.crawler.entity.request.*;
+import com.jzg.quotation.huanong.crawler.entity.response.HuaNongCrawlerModelsQueryResponse;
+import com.jzg.quotation.huanong.crawler.entity.response.HuaNongCrawlerQuotedPriceResponse;
+import com.jzg.quotation.huanong.crawler.entity.response.HuaNongCrawlerSubmitResponse;
+import com.jzg.quotation.huanong.crawler.service.HuaNongCrawlerGetToken;
+import com.jzg.quotation.huanong.crawler.service.HuaNongCrawlerOrderService;
+import com.jzg.quotation.huanong.crawler.service.HuaNongCrawlerQuoteProcessService;
+import com.jzg.quotation.huanong.crawler.service.HuaNongCrawlerRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
 

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/utils/RequestEncryptor.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/utils/RequestEncryptor.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.crawler.utils;
+package com.jzg.quotation.huanong.crawler.utils;
 
 import cn.hutool.core.codec.Base64;
 import cn.hutool.crypto.SecureUtil;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/enums/dictionary/Risk.java → tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/enums/dictionary/Risk.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huanong.enums.dictionary;
+package com.jzg.quotation.huanong.enums.dictionary;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

tenant/insurance/quotation-summary/pom.xml

@@ -95,6 +95,12 @@
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.jzg</groupId>
+            <artifactId>quotation-huanong</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
 
         <!-- thymeleaf 模版类 -->
         <dependency>

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlSchemeServiceImpl.java

@@ -309,7 +309,9 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
     @Override
     public List<PtlAgreementInsCompanyVo> ruleFilterCompany(SchemeRuleFilterVo schemeRuleFilterVo){
         //根据权限获取所有保司
-        HttpResult<List<EsmInsCompany>> companyListResult = esmInsCompanyClient.getUserCompany(baseController.getUserSystemCode());
+        String systemCode = "WWW001";
+        HttpResult<List<EsmInsCompany>> companyListResult = esmInsCompanyClient.getUserCompany(systemCode);
+//        HttpResult<List<EsmInsCompany>> companyListResult = esmInsCompanyClient.getUserCompany(baseController.getUserSystemCode());
         AssertionUtils.isFail(companyListResult.getCode()!=200,companyListResult.getMsg());
         List<EsmInsCompany> companyList = companyListResult.getData();
         //根据基本规则 能源、车辆类型、使用性质获取方案