修改 nai 模块的位置

src/main/java/com/ydtech/config/SwaggerConfig.java

@@ -28,7 +28,7 @@ public class SwaggerConfig {
     public Docket adminApi() {
         // 添加请求参数，我们这里把token作为请求头部参数传入后端
         ParameterBuilder parameterBuilder = new ParameterBuilder();
-        List<Parameter> parameters = new ArrayList<Parameter>();
+        List<Parameter> parameters = new ArrayList<>();
         parameterBuilder.name("Authorization")
                 .description("令牌")
                 .modelRef(new ModelRef("string"))
@@ -81,7 +81,7 @@ public class SwaggerConfig {
     public Docket fncApi() {
         // 添加请求参数，我们这里把token作为请求头部参数传入后端
         ParameterBuilder parameterBuilder = new ParameterBuilder();
-        List<Parameter> parameters = new ArrayList<Parameter>();
+        List<Parameter> parameters = new ArrayList<>();
         parameterBuilder.name("Authorization")
                 .description("令牌")
                 .modelRef(new ModelRef("string"))
@@ -107,7 +107,7 @@ public class SwaggerConfig {
     public Docket insApi() {
         // 添加请求参数，我们这里把token作为请求头部参数传入后端
         ParameterBuilder parameterBuilder = new ParameterBuilder();
-        List<Parameter> parameters = new ArrayList<Parameter>();
+        List<Parameter> parameters = new ArrayList<>();
         parameterBuilder.name("Authorization")
                 .description("令牌")
                 .modelRef(new ModelRef("string"))
@@ -133,7 +133,7 @@ public class SwaggerConfig {
     public Docket invApi() {
         // 添加请求参数，我们这里把token作为请求头部参数传入后端
         ParameterBuilder parameterBuilder = new ParameterBuilder();
-        List<Parameter> parameters = new ArrayList<Parameter>();
+        List<Parameter> parameters = new ArrayList<>();
         parameterBuilder.name("Authorization")
                 .description("令牌")
                 .modelRef(new ModelRef("string"))
@@ -185,7 +185,7 @@ public class SwaggerConfig {
     public Docket orderApi() {
         // 添加请求参数，我们这里把token作为请求头部参数传入后端
         ParameterBuilder parameterBuilder = new ParameterBuilder();
-        List<Parameter> parameters = new ArrayList<Parameter>();
+        List<Parameter> parameters = new ArrayList<>();
         parameterBuilder.name("Authorization")
                 .description("令牌")
                 .modelRef(new ModelRef("string"))
@@ -222,7 +222,7 @@ public class SwaggerConfig {
         parameters.add(parameterBuilder.build());
         return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo())
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("com.ydtech.nai"))
+                .apis(RequestHandlerSelectors.basePackage("com.ydtech.modules.nai"))
                 .paths(PathSelectors.any())
                 .build()
                 .groupName("nai")

src/main/java/com/ydtech/modules/ins/controller/InsFileController.java

@@ -10,9 +10,9 @@ import com.ydtech.modules.ins.service.InsFileLogService;
 import com.ydtech.modules.ins.service.InsOrderService;
 import com.ydtech.modules.ins.model.vo.CharacterUtils;
 import com.ydtech.modules.ins.model.vo.FileException;
-import com.ydtech.nai.httpvo.HeadMessage;
-import com.ydtech.nai.httpvo.HeadVO;
-import com.ydtech.nai.httpvo.InsurancePolicyPrintHeadVO;
+import com.ydtech.modules.nai.httpvo.HeadMessage;
+import com.ydtech.modules.nai.httpvo.HeadVO;
+import com.ydtech.modules.nai.httpvo.InsurancePolicyPrintHeadVO;
 import com.ydtech.utils.HeadUtils;
 import com.ydtech.utils.HttpsPostUtil;
 import org.slf4j.Logger;

src/main/java/com/ydtech/modules/ins/controller/InsOrderController.java

@@ -18,7 +18,7 @@ import com.ydtech.modules.ins.service.*;
 import com.ydtech.modules.ins.model.vo.OrderPayVo;
 import com.ydtech.modules.ins.model.vo.OrderPaymentVo;
 import com.ydtech.modules.ins.model.vo.OrderVo;
-import com.ydtech.nai.httpvo.*;
+import com.ydtech.modules.nai.httpvo.*;
 import com.ydtech.utils.HeadUtils;
 import com.ydtech.utils.HttpsPostUtil;
 import com.ydtech.utils.Base64Utils;

src/main/java/com/ydtech/modules/ins/dao/InsCompanyFeeDao.java

@@ -2,9 +2,7 @@ package com.ydtech.modules.ins.dao;
 
 import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.ins.model.InsCompanyFee;
-import com.ydtech.modules.ins.model.InsFeeDetail;
-import com.ydtech.nai.excelvo.OfflineExcelVO;
-import com.ydtech.nai.httpvo.excel.InsCompanyFeeExcel;
+import com.ydtech.modules.nai.httpvo.excel.InsCompanyFeeExcel;
 
 import java.util.List;
 

src/main/java/com/ydtech/modules/ins/dao/InsOrderDao.java

@@ -2,7 +2,7 @@ package com.ydtech.modules.ins.dao;
 
 import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.ins.model.InsOrder;
-import com.ydtech.nai.httpvo.PayinfoVO;
+import com.ydtech.modules.nai.httpvo.PayinfoVO;
 
 import java.util.List;
 

src/main/java/com/ydtech/modules/ins/dao/impl/InsCompanyFeeDaoImpl.java

@@ -4,8 +4,7 @@ import com.github.drinkjava2.jdialects.Dialect;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.ins.dao.InsCompanyFeeDao;
 import com.ydtech.modules.ins.model.InsCompanyFee;
-import com.ydtech.nai.excelvo.OfflineExcelVO;
-import com.ydtech.nai.httpvo.excel.InsCompanyFeeExcel;
+import com.ydtech.modules.nai.httpvo.excel.InsCompanyFeeExcel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.jdbc.core.JdbcTemplate;

src/main/java/com/ydtech/modules/ins/dao/impl/InsOrderDaoImpl.java

@@ -5,7 +5,7 @@ import com.github.drinkjava2.jdialects.Dialect;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.ins.dao.InsOrderDao;
 import com.ydtech.modules.ins.model.InsOrder;
-import com.ydtech.nai.httpvo.PayinfoVO;
+import com.ydtech.modules.nai.httpvo.PayinfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;

src/main/java/com/ydtech/nai/controller/ChinaCoalInterface.java → src/main/java/com/ydtech/modules/nai/controller/ChinaCoalInterface.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.controller;
+package com.ydtech.modules.nai.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -16,7 +16,7 @@ import com.ydtech.modules.ins.model.vo.KindInfoVo;
 import com.ydtech.modules.ins.model.vo.QuoteKindRespVo;
 import com.ydtech.modules.ins.model.vo.QuoteRespVo;
 import com.ydtech.modules.ins.model.vo.QuoteRiskRespVo;
-import com.ydtech.nai.httpvo.*;
+import com.ydtech.modules.nai.httpvo.*;
 import com.ydtech.utils.HttpsPostUtil;
 import com.ydtech.utils.idgen.IdGenerate;
 import io.swagger.annotations.Api;

src/main/java/com/ydtech/nai/controller/ExcelCeController.java → src/main/java/com/ydtech/modules/nai/controller/ExcelCeController.java

@@ -1,18 +1,13 @@
-package com.ydtech.nai.controller;
+package com.ydtech.modules.nai.controller;
 
 import com.ydtech.core.page.*;
-import com.ydtech.modules.admin.model.SysDept;
-import com.ydtech.modules.esm.model.EsmAgreement;
-import com.ydtech.modules.esm.model.EsmAgreementCheck;
-import com.ydtech.modules.esm.model.EsmAgreementProdCheck;
-import com.ydtech.modules.esm.model.EsmAgreementProdfeeCheck;
 import com.ydtech.modules.ins.service.InsCompanyFeeService;
-import com.ydtech.nai.excelvo.OfflineExcelVO;
-import com.ydtech.nai.excelvo.SettlementVO;
-import com.ydtech.nai.httpvo.excel.InsCompanyFeeExcel;
-import com.ydtech.nai.service.ExcelService;
-import com.ydtech.nai.utils.ExcelUtil;
-import com.ydtech.nai.utils.ExcelUtils;
+import com.ydtech.modules.nai.httpvo.excel.InsCompanyFeeExcel;
+import com.ydtech.modules.nai.service.ExcelService;
+import com.ydtech.modules.nai.utils.ExcelUtil;
+import com.ydtech.modules.nai.excelvo.OfflineExcelVO;
+import com.ydtech.modules.nai.excelvo.SettlementVO;
+import com.ydtech.modules.nai.utils.ExcelUtils;
 import org.apache.commons.collections4.ListUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,7 +24,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Stream;
 
 /**
  * @ClassName ExcelCeController

src/main/java/com/ydtech/nai/dao/ExcelDao.java → src/main/java/com/ydtech/modules/nai/dao/ExcelDao.java

@@ -1,8 +1,8 @@
-package com.ydtech.nai.dao;
+package com.ydtech.modules.nai.dao;
 
 import com.ydtech.core.page.PageResult;
-import com.ydtech.nai.excelvo.OfflineExcelVO;
-import com.ydtech.nai.excelvo.SettlementVO;
+import com.ydtech.modules.nai.excelvo.OfflineExcelVO;
+import com.ydtech.modules.nai.excelvo.SettlementVO;
 
 import java.util.List;
 

src/main/java/com/ydtech/nai/dao/impl/ExcelDaoImpl.java → src/main/java/com/ydtech/modules/nai/dao/impl/ExcelDaoImpl.java

@@ -1,11 +1,11 @@
-package com.ydtech.nai.dao.impl;
+package com.ydtech.modules.nai.dao.impl;
 
 import com.github.drinkjava2.jdialects.Dialect;
 import com.ydtech.core.page.PageResult;
-import com.ydtech.nai.dao.ExcelDao;
-import com.ydtech.nai.excelvo.ExcelSumVO;
-import com.ydtech.nai.excelvo.OfflineExcelVO;
-import com.ydtech.nai.excelvo.SettlementVO;
+import com.ydtech.modules.nai.dao.ExcelDao;
+import com.ydtech.modules.nai.excelvo.ExcelSumVO;
+import com.ydtech.modules.nai.excelvo.OfflineExcelVO;
+import com.ydtech.modules.nai.excelvo.SettlementVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.JdbcTemplate;

src/main/java/com/ydtech/nai/excelvo/ExcelSumVO.java → src/main/java/com/ydtech/modules/nai/excelvo/ExcelSumVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.excelvo;
+package com.ydtech.modules.nai.excelvo;
 
 import lombok.Data;
 

src/main/java/com/ydtech/nai/excelvo/FinanceVO.java → src/main/java/com/ydtech/modules/nai/excelvo/FinanceVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.excelvo;
+package com.ydtech.modules.nai.excelvo;
 
 /**
  * @ClassName FinanceVO

src/main/java/com/ydtech/nai/excelvo/OfflineExcelVO.java → src/main/java/com/ydtech/modules/nai/excelvo/OfflineExcelVO.java

@@ -1,7 +1,7 @@
-package com.ydtech.nai.excelvo;
+package com.ydtech.modules.nai.excelvo;
 
 import cn.afterturn.easypoi.excel.entity.params.ExcelBaseEntity;
-import com.ydtech.nai.httpvo.excel.Excel;
+import com.ydtech.modules.nai.httpvo.excel.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/ydtech/nai/excelvo/SettlementVO.java → src/main/java/com/ydtech/modules/nai/excelvo/SettlementVO.java

@@ -1,11 +1,7 @@
-package com.ydtech.nai.excelvo;
+package com.ydtech.modules.nai.excelvo;
 
-import com.google.common.base.Objects;
-import com.ydtech.nai.httpvo.ExcelHeader;
-import lombok.AllArgsConstructor;
+import com.ydtech.modules.nai.httpvo.ExcelHeader;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 
 import java.util.Date;
 

src/main/java/com/ydtech/nai/httpvo/ArtificialVO.java → src/main/java/com/ydtech/modules/nai/httpvo/ArtificialVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 import lombok.Data;
 

src/main/java/com/ydtech/nai/httpvo/BusinessDataVO.java → src/main/java/com/ydtech/modules/nai/httpvo/BusinessDataVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 import java.util.List;
 

src/main/java/com/ydtech/nai/httpvo/CheckSMScodeHeadVO.java → src/main/java/com/ydtech/modules/nai/httpvo/CheckSMScodeHeadVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 import java.util.List;
 

src/main/java/com/ydtech/nai/httpvo/ContractMainVO.java → src/main/java/com/ydtech/modules/nai/httpvo/ContractMainVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName ContractMainVO

src/main/java/com/ydtech/nai/httpvo/ContractVO.java → src/main/java/com/ydtech/modules/nai/httpvo/ContractVO.java

@@ -1,7 +1,6 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @ClassName ContractVO

src/main/java/com/ydtech/nai/httpvo/CoverageVO.java → src/main/java/com/ydtech/modules/nai/httpvo/CoverageVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName CoverageVO

src/main/java/com/ydtech/nai/httpvo/CustomerVO.java → src/main/java/com/ydtech/modules/nai/httpvo/CustomerVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName CustomerVO

src/main/java/com/ydtech/nai/httpvo/DeliveryInfoVO.java → src/main/java/com/ydtech/modules/nai/httpvo/DeliveryInfoVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName DeliveryInfoVO

src/main/java/com/ydtech/nai/httpvo/ExcelHeader.java → src/main/java/com/ydtech/modules/nai/httpvo/ExcelHeader.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 import java.lang.annotation.*;
 

src/main/java/com/ydtech/nai/httpvo/HeadMessage.java → src/main/java/com/ydtech/modules/nai/httpvo/HeadMessage.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName HeadMessage

src/main/java/com/ydtech/nai/httpvo/HeadVO.java → src/main/java/com/ydtech/modules/nai/httpvo/HeadVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName head

src/main/java/com/ydtech/nai/httpvo/ImageBeanListVO.java → src/main/java/com/ydtech/modules/nai/httpvo/ImageBeanListVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName ImageBeanListVO

src/main/java/com/ydtech/nai/httpvo/InsurancePolicyPrintHeadVO.java → src/main/java/com/ydtech/modules/nai/httpvo/InsurancePolicyPrintHeadVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName InsurancePolicyPrintHeadVO

src/main/java/com/ydtech/nai/httpvo/InsurancePolicyPrintVO.java → src/main/java/com/ydtech/modules/nai/httpvo/InsurancePolicyPrintVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 import java.util.List;
 

src/main/java/com/ydtech/nai/httpvo/InsuredObjectVO.java → src/main/java/com/ydtech/modules/nai/httpvo/InsuredObjectVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName InsuredObjectVO

src/main/java/com/ydtech/nai/httpvo/ItemsListVO.java → src/main/java/com/ydtech/modules/nai/httpvo/ItemsListVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName ItemsListVO

src/main/java/com/ydtech/nai/httpvo/KindListVO.java → src/main/java/com/ydtech/modules/nai/httpvo/KindListVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName KindListVO

src/main/java/com/ydtech/nai/httpvo/ModelsQueryHeadVO.java → src/main/java/com/ydtech/modules/nai/httpvo/ModelsQueryHeadVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName ModelsQueryVO

src/main/java/com/ydtech/nai/httpvo/NodeBeanlistVO.java → src/main/java/com/ydtech/modules/nai/httpvo/NodeBeanlistVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 import java.util.List;
 

src/main/java/com/ydtech/nai/httpvo/OfferVO.java → src/main/java/com/ydtech/modules/nai/httpvo/OfferVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 import com.ydtech.modules.ins.model.vo.KindInfoVo;
 

src/main/java/com/ydtech/nai/httpvo/OrderStatusHeadVO.java → src/main/java/com/ydtech/modules/nai/httpvo/OrderStatusHeadVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName OrderStatusVO

src/main/java/com/ydtech/nai/httpvo/OrderStatusVO.java → src/main/java/com/ydtech/modules/nai/httpvo/OrderStatusVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName OrderStatusHeadVO

src/main/java/com/ydtech/nai/httpvo/PayinfoVO.java → src/main/java/com/ydtech/modules/nai/httpvo/PayinfoVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 import com.alibaba.fastjson.JSONObject;
 

src/main/java/com/ydtech/nai/httpvo/PlantFormMessageBeanVO.java → src/main/java/com/ydtech/modules/nai/httpvo/PlantFormMessageBeanVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName PlantFormMessageBeanVO

src/main/java/com/ydtech/nai/httpvo/PolicyCarVO.java → src/main/java/com/ydtech/modules/nai/httpvo/PolicyCarVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 import org.joda.time.DateTime;
 

src/main/java/com/ydtech/nai/httpvo/PolicyLocationVO.java → src/main/java/com/ydtech/modules/nai/httpvo/PolicyLocationVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName PolicyLocationVO

src/main/java/com/ydtech/nai/httpvo/QuotedPriceHeadVO.java → src/main/java/com/ydtech/modules/nai/httpvo/QuotedPriceHeadVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName QuotedPriceHeadVO

src/main/java/com/ydtech/nai/httpvo/RenewalQueryHeadVO.java → src/main/java/com/ydtech/modules/nai/httpvo/RenewalQueryHeadVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName RenewalQueryHeadVO

src/main/java/com/ydtech/nai/httpvo/RenewalQueryVO.java → src/main/java/com/ydtech/modules/nai/httpvo/RenewalQueryVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName RenewalQueryVO

src/main/java/com/ydtech/nai/httpvo/SimpleStadarCarVO.java → src/main/java/com/ydtech/modules/nai/httpvo/SimpleStadarCarVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName SimpleStadarCarVO

src/main/java/com/ydtech/nai/httpvo/SubmitHeadVO.java → src/main/java/com/ydtech/modules/nai/httpvo/SubmitHeadVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName SubmitVO

src/main/java/com/ydtech/nai/httpvo/SubmitStatusQueryHeadVO.java → src/main/java/com/ydtech/modules/nai/httpvo/SubmitStatusQueryHeadVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName SubmitStatusQueryHeadVO

src/main/java/com/ydtech/nai/httpvo/SubmitStatusQueryVO.java → src/main/java/com/ydtech/modules/nai/httpvo/SubmitStatusQueryVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName SubmitStatusQueryVO

src/main/java/com/ydtech/nai/httpvo/SubmitVO.java → src/main/java/com/ydtech/modules/nai/httpvo/SubmitVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName SubmitVO

src/main/java/com/ydtech/nai/httpvo/UnderwritingVO.java → src/main/java/com/ydtech/modules/nai/httpvo/UnderwritingVO.java

@@ -1,6 +1,4 @@
-package com.ydtech.nai.httpvo;
-
-import org.joda.time.DateTime;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName UnderwritingVO

src/main/java/com/ydtech/nai/httpvo/UploadImageHeadVO.java → src/main/java/com/ydtech/modules/nai/httpvo/UploadImageHeadVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 import java.util.List;
 

src/main/java/com/ydtech/nai/httpvo/UploadImageVO.java → src/main/java/com/ydtech/modules/nai/httpvo/UploadImageVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 import java.util.List;
 

src/main/java/com/ydtech/nai/httpvo/ValidSMScodeHeadVO.java → src/main/java/com/ydtech/modules/nai/httpvo/ValidSMScodeHeadVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName ValidSMScodeVO

src/main/java/com/ydtech/nai/httpvo/ValidSMScodeVO.java → src/main/java/com/ydtech/modules/nai/httpvo/ValidSMScodeVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName ValidSMScodeVO

src/main/java/com/ydtech/nai/httpvo/ZMCarInfoVO.java → src/main/java/com/ydtech/modules/nai/httpvo/ZMCarInfoVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 import java.util.Date;
 

src/main/java/com/ydtech/nai/httpvo/ZMInsuredPersonInfoVO.java → src/main/java/com/ydtech/modules/nai/httpvo/ZMInsuredPersonInfoVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName ZMInsuredPersonInfoVO

src/main/java/com/ydtech/nai/httpvo/ZMOwnerInfoVO.java → src/main/java/com/ydtech/modules/nai/httpvo/ZMOwnerInfoVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName ZMOwnerInfoVO

src/main/java/com/ydtech/nai/httpvo/ZMPolicyHolderInfoVO.java → src/main/java/com/ydtech/modules/nai/httpvo/ZMPolicyHolderInfoVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 /**
  * @ClassName ZMPolicyHolderInfoVO

src/main/java/com/ydtech/nai/httpvo/ZMRiskListVO.java → src/main/java/com/ydtech/modules/nai/httpvo/ZMRiskListVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo;
+package com.ydtech.modules.nai.httpvo;
 
 import java.util.Date;
 

src/main/java/com/ydtech/nai/httpvo/excel/Excel.java → src/main/java/com/ydtech/modules/nai/httpvo/excel/Excel.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo.excel;
+package com.ydtech.modules.nai.httpvo.excel;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/com/ydtech/nai/httpvo/excel/InsCompanyFeeExcel.java → src/main/java/com/ydtech/modules/nai/httpvo/excel/InsCompanyFeeExcel.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.httpvo.excel;
+package com.ydtech.modules.nai.httpvo.excel;
 
 import cn.afterturn.easypoi.excel.entity.params.ExcelBaseEntity;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/ydtech/nai/service/ExcelService.java → src/main/java/com/ydtech/modules/nai/service/ExcelService.java

@@ -1,6 +1,6 @@
-package com.ydtech.nai.service;
+package com.ydtech.modules.nai.service;
 
-import com.ydtech.nai.dao.ExcelDao;
+import com.ydtech.modules.nai.dao.ExcelDao;
 import org.springframework.stereotype.Service;
 
 @Service

src/main/java/com/ydtech/nai/service/impl/ExcelServiceImpl.java → src/main/java/com/ydtech/modules/nai/service/impl/ExcelServiceImpl.java

@@ -1,8 +1,7 @@
-package com.ydtech.nai.service.impl;
+package com.ydtech.modules.nai.service.impl;
 
-import com.ydtech.nai.dao.ExcelDao;
-import com.ydtech.nai.dao.impl.ExcelDaoImpl;
-import com.ydtech.nai.service.ExcelService;
+import com.ydtech.modules.nai.dao.impl.ExcelDaoImpl;
+import com.ydtech.modules.nai.service.ExcelService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/ydtech/nai/utils/ExcelUtil.java → src/main/java/com/ydtech/modules/nai/utils/ExcelUtil.java

@@ -1,4 +1,4 @@
-package com.ydtech.nai.utils;
+package com.ydtech.modules.nai.utils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -15,7 +15,7 @@ import java.util.Set;
 
 import javax.servlet.http.HttpServletResponse;
 
-import com.ydtech.nai.httpvo.excel.Excel;
+import com.ydtech.modules.nai.httpvo.excel.Excel;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.DVConstraint;

src/main/java/com/ydtech/nai/utils/ExcelUtils.java → src/main/java/com/ydtech/modules/nai/utils/ExcelUtils.java

@@ -1,8 +1,8 @@
-package com.ydtech.nai.utils;
+package com.ydtech.modules.nai.utils;
 
 import com.alibaba.fastjson.JSON;
-import com.ydtech.nai.excelvo.OfflineExcelVO;
-import com.ydtech.nai.excelvo.SettlementVO;
+import com.ydtech.modules.nai.excelvo.OfflineExcelVO;
+import com.ydtech.modules.nai.excelvo.SettlementVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFCell;
@@ -18,7 +18,6 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @ClassName ExcelUtils

src/main/java/com/ydtech/modules/order/entity/po/InsRenewal.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.order.entity.po;
 
-import cn.hutool.json.JSONArray;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -9,7 +10,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.ydtech.modules.order.entity.vo.InsRenewalVo;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * 保险续保
@@ -18,6 +21,7 @@ import lombok.Data;
  */
 @TableName(value = "ins_renewal")
 @Data
+@NoArgsConstructor
 public class InsRenewal implements Serializable {
     /**
      *
@@ -57,4 +61,14 @@ public class InsRenewal implements Serializable {
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
+
+
+    public InsRenewal(InsRenewalVo insRenewalVo) {
+        this.companyId = insRenewalVo.getCompanyId();
+        this.url = insRenewalVo.getUrl();
+        this.isOpen = insRenewalVo.getIsOpen();
+        this.configure = JSON.parseArray(JSON.toJSONString(insRenewalVo.getConfigure()));
+        this.namesimple = insRenewalVo.getNamesimple();
+    }
+
 }

src/main/java/com/ydtech/modules/order/entity/vo/InsRenewalVo.java

@@ -1,12 +1,13 @@
 package com.ydtech.modules.order.entity.vo;
 
-import cn.hutool.json.JSONArray;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.ydtech.modules.esm.model.vo.EsmInsAttributionTemplateVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author wenks
@@ -15,40 +16,26 @@ import java.io.Serializable;
  * @date 2023/5/26 11:20
  */
 @Data
+@ApiModel("续保")
 public class InsRenewalVo implements Serializable {
 
     private static final long serialVersionUID = -5511337516850645137L;
 
-    /**
-     * 保险公司Id
-     */
     @NotBlank(message = "保险公司id不能为空")
-    @TableField(value = "company_id")
+    @ApiModelProperty (value = "保险公司Id")
     private String companyId;
 
-    /**
-     * 续保请求url
-     */
-    @TableField(value = "url")
+    @ApiModelProperty (value = "续保请求url")
     @NotBlank(message = "续保请求url不能为空")
     private String url;
 
-    /**
-     * 是否开启(1开启,0关闭)
-     */
-    @TableField(value = "is_open")
+    @ApiModelProperty (value = "是否开启(1开启,0关闭)")
     private Integer isOpen;
 
-    /**
-     * 配置参数
-     */
-    @TableField(value = "configure", typeHandler = FastjsonTypeHandler.class)
-    private JSONArray configure;
+    @ApiModelProperty (value = "配置参数")
+    private List<EsmInsAttributionTemplateVo> configure;
 
-    /**
-     * 缩写
-     */
-    @TableField(value = "namesimple")
+    @ApiModelProperty (value = "缩写")
     @NotBlank(message = "缩写不能为空")
     private String namesimple;
 

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

@@ -70,8 +70,7 @@ public class InsRenewalServiceImpl extends ServiceImpl<InsRenewalMapper, InsRene
     @Override
     public HttpResult manageSave(InsRenewalVo insRenewalVo) {
         esmInsCompanyService.isExists(insRenewalVo.getCompanyId());
-        InsRenewal insRenewal = new InsRenewal();
-        BeanUtils.copyProperties(insRenewalVo, insRenewal);
+        InsRenewal insRenewal = new InsRenewal(insRenewalVo);
         baseMapper.insert(insRenewal);
         return HttpResult.ok(insRenewal);
     }
@@ -79,8 +78,7 @@ public class InsRenewalServiceImpl extends ServiceImpl<InsRenewalMapper, InsRene
     @Override
     public HttpResult manageRevise(Integer id, InsRenewalVo insRenewalVo) {
         esmInsCompanyService.isExists(insRenewalVo.getCompanyId());
-        InsRenewal insRenewal = new InsRenewal();
-        BeanUtils.copyProperties(insRenewalVo, insRenewal);
+        InsRenewal insRenewal = new InsRenewal(insRenewalVo);
         insRenewal.setId(id);
         baseMapper.updateById(insRenewal);
         return HttpResult.ok(insRenewal);

src/main/java/com/ydtech/nai/controller/test.java

@@ -1,80 +0,0 @@
-package com.ydtech.nai.controller;
-
-import com.ydtech.nai.excelvo.OfflineExcelVO;
-import com.ydtech.nai.excelvo.SettlementVO;
-import org.apache.commons.collections4.ListUtils;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @ClassName test
- * @Description: TODO
- * @Author
- * @Date 2021/7/7
- **/
-public class test {
-   /* public static void main(String[] args) {
-
-        List<SettlementVO> list = new ArrayList<>();
-        SettlementVO settlementVO = new SettlementVO();
-        SettlementVO settlementVO2 = new SettlementVO();
-        settlementVO2.setPolicyNo("6140401033020210010402");
-        settlementVO2.setLicenseNo("晋K8922D2");
-        settlementVO2.setMount("1232");
-        list.add(settlementVO2);
-        settlementVO.setPolicyNo("6140401033020210010401");
-        settlementVO.setLicenseNo("晋K8922D");
-        settlementVO.setMount("123");
-        list.add(settlementVO);
-        List<SettlementVO> list1 = new ArrayList<>();
-        SettlementVO settlementVO1 = new SettlementVO();
-        settlementVO1.setPolicyNo("6140401033020210010401");
-        settlementVO1.setLicenseNo("晋K8922D");
-        settlementVO1.setMount("123");
-
-        list1.add(settlementVO1);
-        System.out.println("list====" + list);
-        List<SettlementVO> settlementVOS = ListUtils.removeAll(list, list1);
-        System.out.println("settlementVOS====" + settlementVOS);
-        System.out.println("list1====" + list1);
-        if (list1.removeAll(list)) {
-            System.out.println("删除成功！");
-
-            System.out.println(list);
-
-        } else {
-            System.out.println("删除失败！");
-
-            System.out.println(list);
-
-        }
-
-    }
-*/
-
-
-    /* public static void main(String[] args) {
-         List<String> words = Arrays.asList("a", "a", "b", "c", "d", "d", "e", "f", "f", "f", "g");
-         ArrayList<String> wordsList = new ArrayList<>(words);
-         System.out.println(wordsList);
-         List<String> listWithoutDuplicates = wordsList.stream().distinct().collect(Collectors.toList());
-         System.out.println(listWithoutDuplicates);
-     }*/
-    public static void main(String[] args) {
-        String str1 = "1";
-
-        String str2 = "0.95";
-
-
-        BigDecimal num1 = new BigDecimal(str1);
-
-        BigDecimal num2 = new BigDecimal(str2);
-        num1.add(num2);
-        System.out.println(num1);
-    }
-
-}

src/main/java/com/ydtech/utils/HeadUtils.java

@@ -1,6 +1,6 @@
 package com.ydtech.utils;
 
-import com.ydtech.nai.httpvo.HeadVO;
+import com.ydtech.modules.nai.httpvo.HeadVO;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

src/main/java/com/ydtech/utils/HttpsPostUtil.java

@@ -3,7 +3,7 @@ package com.ydtech.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.ydtech.nai.httpvo.*;
+import com.ydtech.modules.nai.httpvo.HeadMessage;
 import com.ydtech.utils.RSA.RSAUtils;
 import org.apache.commons.text.StringEscapeUtils;
 import org.apache.http.HttpEntity;
@@ -32,7 +32,6 @@ import java.security.cert.X509Certificate;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**

src/main/java/com/ydtech/utils/excel/ExcelUtils.java

@@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSON;
 
 import com.ydtech.modules.esm.model.vo.EsmSocialSecurityExcelVO;
 import com.ydtech.modules.inv.model.InvInvoiceInfo;
-import com.ydtech.nai.excelvo.OfflineExcelVO;
-import com.ydtech.nai.excelvo.SettlementVO;
+import com.ydtech.modules.nai.excelvo.OfflineExcelVO;
+import com.ydtech.modules.nai.excelvo.SettlementVO;
 import com.ydtech.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.hssf.usermodel.HSSFCell;