Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quote/hengbang/crawler/build/HbCrawlerQuoteResultVoBuild.java → tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quotation/hengbang/crawler/build/HbCrawlerQuoteResultVoBuild.java

@@ -1,10 +1,10 @@
-package com.jzg.quote.hengbang.crawler.build;
+package com.jzg.quotation.hengbang.crawler.build;
 
 import com.jzg.commons.entity.quote.vo.KindInfoVo;
 import com.jzg.commons.entity.quote.vo.RiskInfoVo;
 import com.jzg.commons.entity.quote.vo.aggregated.QuoteResultsVo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
-import com.jzg.quote.hengbang.crawler.entity.response.HbCrawlerProposalResponse;
+import com.jzg.quotation.hengbang.crawler.entity.response.HbCrawlerProposalResponse;
 
 import java.util.List;
 import java.util.Map;

tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quote/hengbang/crawler/component/HengBangCrawlerRequestComponent.java → tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quotation/hengbang/crawler/component/HengBangCrawlerRequestComponent.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.component;
+package com.jzg.quotation.hengbang.crawler.component;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jzg.commons.exception.SystemException;
@@ -7,13 +7,13 @@ import com.jzg.quotation.commons.component.RequestComponent;
 import com.jzg.quotation.commons.constant.CacheConstant;
 import com.jzg.quotation.commons.service.ExteriorUtilsRequest;
 import com.jzg.quotation.commons.utils.RequestObjectConversion;
-import com.jzg.quote.hengbang.crawler.constant.RequestConstant;
-import com.jzg.quote.hengbang.crawler.constant.enums.RequestUrl;
-import com.jzg.quote.hengbang.crawler.entity.dto.HbEncDTO;
-import com.jzg.quote.hengbang.crawler.entity.request.*;
-import com.jzg.quote.hengbang.crawler.entity.response.*;
-import com.jzg.quote.hengbang.crawler.properties.HengBangCrawlerProperties;
-import com.jzg.quote.hengbang.crawler.utils.HengBangAESUtil;
+import com.jzg.quotation.hengbang.crawler.constant.RequestConstant;
+import com.jzg.quotation.hengbang.crawler.constant.enums.RequestUrl;
+import com.jzg.quotation.hengbang.crawler.entity.dto.HbEncDTO;
+import com.jzg.quotation.hengbang.crawler.entity.request.*;
+import com.jzg.quotation.hengbang.crawler.entity.response.*;
+import com.jzg.quotation.hengbang.crawler.properties.HengBangCrawlerProperties;
+import com.jzg.quotation.hengbang.crawler.utils.HengBangAESUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RMap;
@@ -57,53 +57,14 @@ public class HengBangCrawlerRequestComponent {
         if (frequency <= 0) {
             throw new SystemException("验证码异常");
         }
-        HbCrawlerCaptchaRequest captchaRequest = new HbCrawlerCaptchaRequest();
         // 请求
-        HbCrawlerCaptchaResponse HbCrawlerCaptchaResponse = requestComponent.objectPost(RequestUrl.VERIFY_CODE.getRequestUrl(hbCrawlerProperties.getBaseUrl()), JSONObject.toJSONString(captchaRequest), "", HbCrawlerCaptchaResponse.class);
+        HbCrawlerCaptchaResponse HbCrawlerCaptchaResponse = requestComponent.objectPost(RequestUrl.VERIFY_CODE.getRequestUrl(hbCrawlerProperties.getBaseUrl()), new HbCrawlerCaptchaRequest(), "", HbCrawlerCaptchaResponse.class);
         // 识别验证码
         String s = exteriorUtilsRequest.captchaIdentify(HbCrawlerCaptchaResponse.getVerifyImg());
-        try {
-            int i = processCaptcha(s);
-            s = String.valueOf(i);
-        } catch (Exception e) {
-            frequency = frequency - 1;
-            return captcha(frequency);
-        }
         HbCrawlerCaptchaResponse.setVerifyCode(s);
         return HbCrawlerCaptchaResponse;
     }
 
-    public int processCaptcha(String res) {
-        // 检查字符串长度是否足够，并且第三个字符不是'='
-        if (res.length() >= 3 && res.charAt(2) != '=') {
-            char operator = res.charAt(1);
-            try {
-                int operand1 = Integer.parseInt(res.substring(0, 1));
-                int operand2 = Integer.parseInt(res.substring(2, 3));
-                // 注意：这里假设操作符和操作数都是有效的，实际应用中应该添加更多的错误处理
-
-                switch (operator) {
-                    case '+':
-                    case 'f': // 通常'f'不是加法运算符，但根据原代码保留
-                        return operand1 + operand2;
-                    case 'x':
-                    case 'X':
-                    case '4': // 通常'4'不是乘法运算符，但保留以匹配原代码
-                    case '9': // 通常'9'也不是乘法运算符，但保留以匹配原代码
-                        return operand1 * operand2;
-                    case '-':
-                    case 'e': // 通常'e'不是减法运算符，但根据原代码保留
-                    case '=': // 通常'='不是减法运算符，但根据原代码保留
-                    case '2': // 通常'2'也不是减法运算符，但根据原代码保留
-                        return operand1 - operand2;
-                    // 如果操作符不匹配，则获取新的验证码图片（模拟）
-                }
-            } catch (NumberFormatException ignored) {
-            }
-        }
-        throw new SystemException("");
-    }
-
     /**
      * 登录次数
      *
@@ -117,7 +78,7 @@ public class HengBangCrawlerRequestComponent {
         HbCrawlerCaptchaResponse captchaResponse = captcha(RequestConstant.REQUEST_NUMBER);
         // 登录存入缓存当中
         HbCrawlerAuthenticateRequest authenticateRequest = new HbCrawlerAuthenticateRequest(captchaResponse, username, password);
-        ResponseEntity<HbCrawlerAuthenticateResponse> responseEntity = requestComponent.objectPost(RequestUrl.AUTHENTICATE.getRequestUrl(hbCrawlerProperties.getBaseUrl()), JSONObject.toJSONString(authenticateRequest), HbCrawlerAuthenticateResponse.class);
+        ResponseEntity<HbCrawlerAuthenticateResponse> responseEntity = requestComponent.objectPost(RequestUrl.AUTHENTICATE.getRequestUrl(hbCrawlerProperties.getBaseUrl()), authenticateRequest, HbCrawlerAuthenticateResponse.class);
         HbCrawlerAuthenticateResponse authenticateResponse = Optional.of(responseEntity)
                 .map(ResponseEntity::getBody)
                 .orElseThrow();

tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quote/hengbang/crawler/constant/RequestConstant.java → tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quotation/hengbang/crawler/constant/RequestConstant.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.constant;
+package com.jzg.quotation.hengbang.crawler.constant;
 
 /**
  * @description: 常量

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

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

tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quote/hengbang/crawler/entity/HengBangCrawlerConfigureParameters.java → tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quotation/hengbang/crawler/entity/HengBangCrawlerConfigureParameters.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.entity;
+package com.jzg.quotation.hengbang.crawler.entity;
 
 import com.jzg.quotation.commons.standard.ConfigureParameters;
 import lombok.Data;

tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quote/hengbang/crawler/entity/dto/HbEncDTO.java → tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quotation/hengbang/crawler/entity/dto/HbEncDTO.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.entity.dto;
+package com.jzg.quotation.hengbang.crawler.entity.dto;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.entity.po;
+package com.jzg.quotation.hengbang.crawler.entity.po;
 
 import lombok.Data;
 import org.springframework.data.annotation.Id;

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

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.entity.request;
+package com.jzg.quotation.hengbang.crawler.entity.request;
 
 import java.io.Serializable;
 

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

@@ -1,8 +1,8 @@
-package com.jzg.quote.hengbang.crawler.entity.request;
+package com.jzg.quotation.hengbang.crawler.entity.request;
 
 import cn.hutool.crypto.digest.DigestUtil;
 import com.jzg.commons.text.CharsetKit;
-import com.jzg.quote.hengbang.crawler.entity.response.HbCrawlerCaptchaResponse;
+import com.jzg.quotation.hengbang.crawler.entity.response.HbCrawlerCaptchaResponse;
 import lombok.Data;
 
 import java.io.Serial;

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

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.entity.request;
+package com.jzg.quotation.hengbang.crawler.entity.request;
 
 import com.jzg.commons.entity.quote.vo.KindInfoVo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;

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

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.entity.request;
+package com.jzg.quotation.hengbang.crawler.entity.request;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.entity.request;
+package com.jzg.quotation.hengbang.crawler.entity.request;
 
 import lombok.Data;
 

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

@@ -1,7 +1,7 @@
-package com.jzg.quote.hengbang.crawler.entity.request;
+package com.jzg.quotation.hengbang.crawler.entity.request;
 
 import com.jzg.commons.entity.quote.vo.CarInfoVo;
-import com.jzg.quote.hengbang.crawler.entity.response.HbCrawlerQueryCarResponse;
+import com.jzg.quotation.hengbang.crawler.entity.response.HbCrawlerQueryCarResponse;
 import lombok.Data;
 
 import java.io.Serial;

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

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.entity.request;
+package com.jzg.quotation.hengbang.crawler.entity.request;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.entity.request;
+package com.jzg.quotation.hengbang.crawler.entity.request;
 
 import lombok.Data;
 

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

@@ -1,5 +1,6 @@
-package com.jzg.quote.hengbang.crawler.entity.request;
+package com.jzg.quotation.hengbang.crawler.entity.request;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -29,9 +30,7 @@ public class HbCrawlerQueryCarRequest extends HbBaseRequest {
     private static final long serialVersionUID = 2573166312583296895L;
 
     public HbCrawlerQueryCarRequest(String brand, String modelCode, Integer VehicleStyleUniqueId) {
-        this.cbitData.Brand = brand;
-        this.cbitData.ModelCode = modelCode;
-        this.cbitData.VehicleStyleUniqueId = VehicleStyleUniqueId;
+        this.cbitData = new CbitDataDTO(brand, modelCode, VehicleStyleUniqueId);
         this.pageNo = 0;
         this.pageSize = 5;
     }
@@ -43,6 +42,7 @@ public class HbCrawlerQueryCarRequest extends HbBaseRequest {
     private Integer pageSize;
 
     @Data
+    @AllArgsConstructor
     @NoArgsConstructor
     public static class CbitDataDTO implements Serializable {
         @Serial

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

@@ -1,11 +1,11 @@
-package com.jzg.quote.hengbang.crawler.entity.request;
+package com.jzg.quotation.hengbang.crawler.entity.request;
 
 import com.jzg.commons.entity.quote.vo.CarInfoVo;
 import com.jzg.commons.entity.quote.vo.CustomerInfoVo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
-import com.jzg.quote.hengbang.crawler.entity.HengBangCrawlerConfigureParameters;
-import com.jzg.quote.hengbang.crawler.entity.dto.HbEncDTO;
-import com.jzg.quote.hengbang.crawler.entity.response.HbCrawlerQueryCarResponse;
+import com.jzg.quotation.hengbang.crawler.entity.HengBangCrawlerConfigureParameters;
+import com.jzg.quotation.hengbang.crawler.entity.dto.HbEncDTO;
+import com.jzg.quotation.hengbang.crawler.entity.response.HbCrawlerQueryCarResponse;
 import lombok.Data;
 
 import java.io.Serial;

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

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.entity.request;
+package com.jzg.quotation.hengbang.crawler.entity.request;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quotation/hengbang/crawler/entity/response/HbBaseResponse.java

@@ -0,0 +1,14 @@
+package com.jzg.quotation.hengbang.crawler.entity.response;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @description:
+ * @author: shenwd
+ * @date: 2025/4/7 15:45
+ **/
+public class HbBaseResponse implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 8468085174218499877L;
+}

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

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.entity.response;
+package com.jzg.quotation.hengbang.crawler.entity.response;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.entity.response;
+package com.jzg.quotation.hengbang.crawler.entity.response;
 
 import lombok.Data;
 

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

@@ -1,7 +1,9 @@
-package com.jzg.quote.hengbang.crawler.entity.response;
+package com.jzg.quotation.hengbang.crawler.entity.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
 import java.io.Serial;
 
@@ -10,9 +12,12 @@ import java.io.Serial;
  * @author: shenwd
  * @date: 2025/4/7 15:45
  **/
+@EqualsAndHashCode(callSuper = true)
 @Data
 @AllArgsConstructor
+@NoArgsConstructor
 public class HbCrawlerCaptchaResponse extends HbBaseResponse{
+
     @Serial
     private static final long serialVersionUID = -8992172251538749662L;
 

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

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.entity.response;
+package com.jzg.quotation.hengbang.crawler.entity.response;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.entity.response;
+package com.jzg.quotation.hengbang.crawler.entity.response;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.entity.response;
+package com.jzg.quotation.hengbang.crawler.entity.response;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.entity.response;
+package com.jzg.quotation.hengbang.crawler.entity.response;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.entity.response;
+package com.jzg.quotation.hengbang.crawler.entity.response;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.entity.response;
+package com.jzg.quotation.hengbang.crawler.entity.response;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.entity.response;
+package com.jzg.quotation.hengbang.crawler.entity.response;
 
 import com.jzg.quotation.commons.filter.CarModelsFilter;
 import lombok.Data;

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

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

tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quote/hengbang/crawler/properties/HengBangCrawlerProperties.java → tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quotation/hengbang/crawler/properties/HengBangCrawlerProperties.java

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

tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quote/hengbang/crawler/repository/HbCrawlerOrderReposiroty.java → tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quotation/hengbang/crawler/repository/HbCrawlerOrderReposiroty.java

@@ -1,6 +1,6 @@
-package com.jzg.quote.hengbang.crawler.repository;
+package com.jzg.quotation.hengbang.crawler.repository;
 
-import com.jzg.quote.hengbang.crawler.entity.po.HbCrawlerOrder;
+import com.jzg.quotation.hengbang.crawler.entity.po.HbCrawlerOrder;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.mongodb.repository.Query;
 

tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quote/hengbang/crawler/service/HbCrawlerOrderService.java → tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quotation/hengbang/crawler/service/HbCrawlerOrderService.java

@@ -1,6 +1,6 @@
-package com.jzg.quote.hengbang.crawler.service;
+package com.jzg.quotation.hengbang.crawler.service;
 
-import com.jzg.quote.hengbang.crawler.entity.po.HbCrawlerOrder;
+import com.jzg.quotation.hengbang.crawler.entity.po.HbCrawlerOrder;
 
 /**
  * @description: 恒邦财险 mongodb中操作数据

tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quote/hengbang/crawler/service/HengBangCrawlerRequest.java → tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quotation/hengbang/crawler/service/HengBangCrawlerRequest.java

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

tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quote/hengbang/crawler/service/Impl/HbCrawlerOrderServiceImpl.java → tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quotation/hengbang/crawler/service/Impl/HbCrawlerOrderServiceImpl.java

@@ -1,8 +1,8 @@
-package com.jzg.quote.hengbang.crawler.service.Impl;
+package com.jzg.quotation.hengbang.crawler.service.Impl;
 
-import com.jzg.quote.hengbang.crawler.entity.po.HbCrawlerOrder;
-import com.jzg.quote.hengbang.crawler.repository.HbCrawlerOrderReposiroty;
-import com.jzg.quote.hengbang.crawler.service.HbCrawlerOrderService;
+import com.jzg.quotation.hengbang.crawler.entity.po.HbCrawlerOrder;
+import com.jzg.quotation.hengbang.crawler.repository.HbCrawlerOrderReposiroty;
+import com.jzg.quotation.hengbang.crawler.service.HbCrawlerOrderService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quote/hengbang/crawler/service/Impl/HengBangCrawlerRequestImpl.java → tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quotation/hengbang/crawler/service/Impl/HengBangCrawlerRequestImpl.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.service.Impl;
+package com.jzg.quotation.hengbang.crawler.service.Impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.crypto.digest.DigestUtil;
@@ -8,25 +8,25 @@ import com.jzg.commons.entity.quote.vo.CarInfoVo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.commons.entity.quote.vo.RiskInfoVo;
 import com.jzg.commons.entity.quote.vo.aggregated.*;
+import com.jzg.commons.entity.quote.vo.base.LoginBase;
+import com.jzg.commons.entity.quote.vo.image.InsuranceImageVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.annotation.QuoteCrawlerService;
 import com.jzg.quotation.commons.constant.InsuranceCode;
-import com.jzg.commons.entity.quote.vo.base.LoginBase;
-import com.jzg.commons.entity.quote.vo.image.InsuranceImageVo;
 import com.jzg.quotation.commons.filter.CarModelsFilterUtils;
 import com.jzg.quotation.commons.standard.conversion.ConfigureParametersConversion;
-import com.jzg.quote.hengbang.crawler.build.HbCrawlerQuoteResultVoBuild;
-import com.jzg.quote.hengbang.crawler.component.HengBangCrawlerRequestComponent;
-import com.jzg.quote.hengbang.crawler.constant.RequestConstant;
-import com.jzg.quote.hengbang.crawler.constant.enums.RequestUrl;
-import com.jzg.quote.hengbang.crawler.entity.HengBangCrawlerConfigureParameters;
-import com.jzg.quote.hengbang.crawler.entity.dto.HbEncDTO;
-import com.jzg.quote.hengbang.crawler.entity.po.HbCrawlerOrder;
-import com.jzg.quote.hengbang.crawler.entity.request.*;
-import com.jzg.quote.hengbang.crawler.entity.response.*;
-import com.jzg.quote.hengbang.crawler.properties.HengBangCrawlerProperties;
-import com.jzg.quote.hengbang.crawler.service.HbCrawlerOrderService;
-import com.jzg.quote.hengbang.crawler.service.HengBangCrawlerRequest;
+import com.jzg.quotation.hengbang.crawler.build.HbCrawlerQuoteResultVoBuild;
+import com.jzg.quotation.hengbang.crawler.component.HengBangCrawlerRequestComponent;
+import com.jzg.quotation.hengbang.crawler.constant.RequestConstant;
+import com.jzg.quotation.hengbang.crawler.constant.enums.RequestUrl;
+import com.jzg.quotation.hengbang.crawler.entity.HengBangCrawlerConfigureParameters;
+import com.jzg.quotation.hengbang.crawler.entity.dto.HbEncDTO;
+import com.jzg.quotation.hengbang.crawler.entity.po.HbCrawlerOrder;
+import com.jzg.quotation.hengbang.crawler.entity.request.*;
+import com.jzg.quotation.hengbang.crawler.entity.response.*;
+import com.jzg.quotation.hengbang.crawler.properties.HengBangCrawlerProperties;
+import com.jzg.quotation.hengbang.crawler.service.HbCrawlerOrderService;
+import com.jzg.quotation.hengbang.crawler.service.HengBangCrawlerRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
 
@@ -48,6 +48,7 @@ public class HengBangCrawlerRequestImpl implements HengBangCrawlerRequest {
     private final HbCrawlerOrderService hbCrawlerOrderService;
 
     private final HengBangCrawlerProperties hbCrawlerProperties;
+
     /**
      * 登录
      * @param loginBase 登录信息
@@ -136,7 +137,7 @@ public class HengBangCrawlerRequestImpl implements HengBangCrawlerRequest {
 
         HbCrawlerPayUrlResponse payUrlResponse = hbCrawlerRequestComponent.getPayUrl(hbCrawlerOrder.getPlyappno(), headers);
         PaymentLinkResultsVo paymentLinkResultsVo = new PaymentLinkResultsVo();
-        paymentLinkResultsVo.setPayLinkStatus("0".equals(payUrlResponse.getShowSms()) ? true : false);
+        paymentLinkResultsVo.setPayLinkStatus("0".equals(payUrlResponse.getShowSms()));
         paymentLinkResultsVo.setPaymentLink(payUrlResponse.getPayUrl());
 
         return paymentLinkResultsVo;
@@ -148,9 +149,11 @@ public class HengBangCrawlerRequestImpl implements HengBangCrawlerRequest {
      */
     @Override
     public void uploadImage(InsuranceUploadImageVo insuranceUploadImageVo) {
-        AttributionInformationVo attributionInformationVo = insuranceUploadImageVo.getOrder().getAttributionInformationVo();
+        AttributionInformationVo attributionInformationVo = insuranceUploadImageVo.getOrder()
+                .getAttributionInformationVo();
         HttpHeaders headers = hbCrawlerRequestComponent.getHeaders(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
-        HbCrawlerOrder hbCrawlerOrder = hbCrawlerOrderService.findByOrdersNo(insuranceUploadImageVo.getOrder().getOrdersNo());
+        HbCrawlerOrder hbCrawlerOrder = hbCrawlerOrderService.findByOrdersNo(insuranceUploadImageVo.getOrder()
+                .getOrdersNo());
         //暂时将图片默认为01,06,09,投保业务-旧车-其他资料
         Integer fileNum = 0;
         StringBuilder fileBuff = new StringBuilder();
@@ -163,19 +166,19 @@ public class HengBangCrawlerRequestImpl implements HengBangCrawlerRequest {
                 List<InsuranceImageVo.ImageDTO> imageBase64List = insuranceImageVo.getImageBase64List();
                 if (imageBase64List != null && !imageBase64List.isEmpty()) {
                     for (InsuranceImageVo.ImageDTO imageBase64 : imageBase64List) {
-                        if (fileBuff.length() > 0) {
+                        if (!fileBuff.isEmpty()) {
                             fileBuff.append("||");
                         }
                         fileBuff.append(imageBase64.getImageBase64Str());
-                        if (fileType.length() > 0) {
+                        if (!fileType.isEmpty()) {
                             fileType.append("||");
                         }
                         fileType.append(RequestConstant.IMAGE_TYPE);
-                        if (mark3.length() > 0) {
+                        if (!mark3.isEmpty()) {
                             mark3.append(",");
                         }
                         mark3.append(mark3Num++);
-                        fileNum+=1;
+                        fileNum += 1;
                     }
                 }
             }
@@ -204,13 +207,18 @@ public class HengBangCrawlerRequestImpl implements HengBangCrawlerRequest {
         getPolicyRequest.setCarMark(parameters.getLicenseNo());
         HbCrawlerGetPolicyResponse policyResponse = hbCrawlerRequestComponent.getPolicy(getPolicyRequest, headers);
         List<String> downloadUrls = new ArrayList<>();
-        List<HbCrawlerGetPolicyResponse.ResponseBodyDTO.ContentDTO> contentDTOList = policyResponse.getResponseBody().getContent();
+        List<HbCrawlerGetPolicyResponse.ResponseBodyDTO.ContentDTO> contentDTOList = policyResponse.getResponseBody()
+                .getContent();
         if (contentDTOList != null && !contentDTOList.isEmpty()) {
             contentDTOList.forEach(contentDTO -> {
                 //获取参数sign的值
                 String sign = getSign(contentDTO.getPOLICY_CATEGORY(), contentDTO.getBUSINESS_NO());
                 StringBuilder downloadUrl = new StringBuilder(RequestUrl.DOWNLOAD_POLICY.getRequestUrl(hbCrawlerProperties.getBaseUrl()));
-                downloadUrl.append(contentDTO.getPOLICY_CATEGORY()).append("/").append(contentDTO.getBUSINESS_NO()).append("?sign=").append(sign);
+                downloadUrl.append(contentDTO.getPOLICY_CATEGORY())
+                        .append("/")
+                        .append(contentDTO.getBUSINESS_NO())
+                        .append("?sign=")
+                        .append(sign);
                 downloadUrls.add(downloadUrl.toString());
             });
         }

tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quote/hengbang/crawler/utils/HengBangAESUtil.java → tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quotation/hengbang/crawler/utils/HengBangAESUtil.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.hengbang.crawler.utils;
+package com.jzg.quotation.hengbang.crawler.utils;
 
 import com.jzg.commons.text.CharsetKit;
 

tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quote/hengbang/crawler/entity/response/HbBaseResponse.java

@@ -1,11 +0,0 @@
-package com.jzg.quote.hengbang.crawler.entity.response;
-
-import java.io.Serializable;
-
-/**
- * @description:
- * @author: shenwd
- * @date: 2025/4/7 15:45
- **/
-public class HbBaseResponse implements Serializable {
-}

tenant/insurance/quotation-summary/pom.xml

@@ -101,7 +101,11 @@
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-
+        <dependency>
+            <groupId>com.jzg</groupId>
+            <artifactId>quotation-hengbang</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>com.jzg</groupId>
             <artifactId>quotation-ansheng</artifactId>