合并分支

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/utils/DateUtils.java → tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/utils/DateUtil.java

@@ -18,12 +18,12 @@ import java.util.Locale;
  *
  * @author MrBird
  */
-public class DateUtils {
+public class DateUtil {
 
     /**
      * log日志
      */
-    private static final Logger logger = LoggerFactory.getLogger(DateUtils.class);
+    private static final Logger logger = LoggerFactory.getLogger(DateUtil.class);
 
     public static final String FULL_TIME_PATTERN = "yyyyMMddHHmmss";
 

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

@@ -3,7 +3,7 @@ package com.jzg.quotation.hengbang.crawler.entity.request;
 import cn.hutool.core.collection.CollUtil;
 import com.jzg.commons.entity.quote.vo.KindInfoVo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
-import com.jzg.quotation.commons.utils.DateUtils;
+import com.jzg.quotation.commons.utils.DateUtil;
 import lombok.Data;
 
 import java.io.Serial;
@@ -75,17 +75,17 @@ public class HbCrawlerCalculationRequest extends HbBaseRequest{
         this.clauseType = "2";
         List<KindInfoVo> kindInfoVoList = quoteVo.getKindInfoVo();
         this.risktype = "0";
-        this.begintimeBi = DateUtils.toUtcDateTime(quoteVo.getCiRiskInfoVo().getStartDate());
+        this.begintimeBi = DateUtil.toUtcDateTime(quoteVo.getCiRiskInfoVo().getStartDate());
         if(CollUtil.isNotEmpty(kindInfoVoList)){
             this.epersonliabilityList = getEpersonliabilityList(kindInfoVoList);
-            this.begintimeBi = DateUtils.toUtcDateTime(quoteVo.getBiRiskInfoVo().getStartDate());
+            this.begintimeBi = DateUtil.toUtcDateTime(quoteVo.getBiRiskInfoVo().getStartDate());
             this.risktype = "2";
         }else{
 //            this.begintimeBi = DateUtil.toUtcDateTime(quoteVo.getCiRiskInfoVo().getStartDate());
             this.epersonliabilityList = new ArrayList<>();
         }
         if(Objects.nonNull(quoteVo.getCiRiskInfoVo())){
-            this.begintimeCi = DateUtils.toUtcDateTime(quoteVo.getCiRiskInfoVo().getStartDate());
+            this.begintimeCi = DateUtil.toUtcDateTime(quoteVo.getCiRiskInfoVo().getStartDate());
             this.risktype = "1";
         }
         this.plyappno = plyappno;

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

@@ -19,7 +19,6 @@ import com.jzg.quotation.commons.annotation.QuoteCrawlerService;
 import com.jzg.quotation.commons.constant.InsuranceCode;
 import com.jzg.quotation.commons.filter.CarModelsFilterUtils;
 import com.jzg.quotation.commons.standard.conversion.ConfigureParametersConversion;
-import com.jzg.quotation.commons.utils.DateUtils;
 import com.jzg.quotation.hengbang.crawler.build.HbCrawlerQuoteResultVoBuild;
 import com.jzg.quotation.hengbang.crawler.component.HengBangCrawlerRequestComponent;
 import com.jzg.quotation.hengbang.crawler.constant.RequestConstant;

tenant/insurance/quotation-yongcheng/src/main/java/com/jzg/quotation/yongcheng/api/entity/request/QuoteRequest.java

@@ -12,7 +12,7 @@ import com.jzg.commons.util.IDCardUtils;
 import com.jzg.commons.constants.quote.enums.quote.VehicleUseCode;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.quotation.commons.utils.DateTimeUtil;
-import com.jzg.quotation.commons.utils.DateUtils;
+import com.jzg.quotation.commons.utils.DateUtil;
 import com.jzg.quotation.yongcheng.api.entity.YcBuildData;
 import com.jzg.quotation.yongcheng.api.entity.dto.CarInsDateDto;
 import com.jzg.quotation.yongcheng.api.entity.response.ModelsQueryResponse;
@@ -329,7 +329,7 @@ public class QuoteRequest {
                 base.setRenewalFlagJQ("0");
                 //续保标志(商业)  0 非续保   1 续保
                 base.setRenewalFlagSY("0");
-                base.setOperateDate(DateUtils.getDateFormat(new Date(), DateUtils.FULL_TIME_SPLIT_PATTERN));
+                base.setOperateDate(DateUtil.getDateFormat(new Date(), DateUtil.FULL_TIME_SPLIT_PATTERN));
                 base.setCBsnsTyp("19002");
                 base.setInsuredName(insuredPersonInfo.getName());
                 base.setTaxFlag("1");
@@ -337,7 +337,7 @@ public class QuoteRequest {
                 base.setRenewalFlagSY("0");
                 base.setCSlsCde(ycConfigureParameters.getSalesmanNo());
                 base.setOperatorCode(ycConfigureParameters.getOperatorCode());
-                base.setTIssueTm(DateUtils.getDateFormat(new Date(), "yyyy-MM-dd"));
+                base.setTIssueTm(DateUtil.getDateFormat(new Date(), "yyyy-MM-dd"));
                 base.setCChaType(ycConfigureParameters.getCChaType());
 
 

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quotation/zhongmei/crawler/component/ZmCrawlerRequestComponent.java

@@ -10,7 +10,7 @@ import com.jzg.quotation.commons.constant.CacheConstant;
 import com.jzg.commons.entity.quote.vo.image.InsuranceImageVo;
 import com.jzg.quotation.commons.service.ExteriorUtilsRequest;
 import com.jzg.quotation.commons.standard.CrawlerRequestUrlStandard;
-import com.jzg.quotation.commons.utils.DateUtils;
+import com.jzg.quotation.commons.utils.DateUtil;
 import com.jzg.quotation.commons.utils.RequestObjectConversion;
 import com.jzg.quotation.zhongmei.api.constant.enums.ImageTypeEnum;
 import com.jzg.quotation.zhongmei.api.entity.BaseRequestHead;
@@ -728,7 +728,7 @@ public class ZmCrawlerRequestComponent {
 
         Document submitXml = XmlUtil.readXML(xmlStr);
 
-        String currentDateTime = DateUtils.getDateFormat(new Date(), DateUtils.FULL_TIME_SPLIT_PATTERN);
+        String currentDateTime = DateUtil.getDateFormat(new Date(), DateUtil.FULL_TIME_SPLIT_PATTERN);
         NodeList childNodes = submitXml.getDocumentElement().getChildNodes();
         Node pageInfoNode = childNodes.item(1);
         Node vTreeNode = childNodes.item(2);

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quotation/zhongmei/crawler/entity/Request/ZmCrawlerActualValueRequest.java

@@ -1,7 +1,7 @@
 package com.jzg.quotation.zhongmei.crawler.entity.Request;
 
 import com.jzg.commons.entity.quote.vo.CarInfoVo;
-import com.jzg.quotation.commons.utils.DateUtils;
+import com.jzg.quotation.commons.utils.DateUtil;
 import com.jzg.quotation.zhongmei.api.entity.BaseRequestHead;
 import com.jzg.quotation.zhongmei.api.entity.request.BaseRequest;
 import com.jzg.quotation.zhongmei.crawler.constant.enums.ZmCrawlerTransCode;
@@ -85,7 +85,7 @@ public class ZmCrawlerActualValueRequest extends BaseRequest {
     public ZmCrawlerActualValueRequest(CarInfoVo carInfoVo, BaseRequestHead head) {
         this.setHead(head);
         this.approvedPassengersCapacity = Integer.parseInt(carInfoVo.getSeatCount());
-        this.validDate = DateUtils.getDateFormat(new Date(), DateUtils.FULL_TIME_SPLIT_PATTERN);
+        this.validDate = DateUtil.getDateFormat(new Date(), DateUtil.FULL_TIME_SPLIT_PATTERN);
         this.purchasePrice = Integer.parseInt(carInfoVo.getPurchasePrice());
         this.motorUsageTypeCode = carInfoVo.getCarNatureCode();
         if(carInfoVo.getEnergyTypeCode().equals("0")){

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quotation/zhongmei/crawler/entity/Request/ZmCrawlerQuotedPriceRequest.java

@@ -5,7 +5,7 @@ import com.jzg.commons.constants.InsuranceRisk;
 import com.jzg.commons.entity.quote.vo.*;
 import com.jzg.commons.constants.quote.enums.quote.PropertyCode;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
-import com.jzg.quotation.commons.utils.DateUtils;
+import com.jzg.quotation.commons.utils.DateUtil;
 import com.jzg.quotation.commons.utils.TimeProcessing;
 import com.jzg.quotation.zhongmei.api.constant.TransCode;
 import com.jzg.quotation.zhongmei.api.constant.enums.ContractEnum;
@@ -91,7 +91,7 @@ public class ZmCrawlerQuotedPriceRequest extends BaseRequest {
 
         public List<ContractDTO> buildContractList(QuoteVo quoteVo) {
             List<ContractDTO> contracts = new ArrayList<>();
-            String date = DateUtils.getDateFormat(new Date(), DateUtils.FULL_TIME_SPLIT_PATTERN);
+            String date = DateUtil.getDateFormat(new Date(), DateUtil.FULL_TIME_SPLIT_PATTERN);
             ContractDTO ciContract = buildCiContract(quoteVo, date);
             ContractDTO biContract = buildBiContract(quoteVo, date);
             if(Objects.nonNull(ciContract)){