修改

src/main/java/com/ydtech/modules/order/entity/InsAreaCompanyCarUserInfo.java

@@ -61,6 +61,10 @@ public class InsAreaCompanyCarUserInfo implements Serializable {
     @TableField(value = "mobile")
     private String mobile;
 
+    //用户类型
+    @TableField(value = "user_type")
+    private Integer userType;
+
     //同车主
     @TableField(exist = false)
     private boolean Owner;

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

@@ -69,6 +69,10 @@ public class InsOrdersCarUserInfo implements Serializable {
     @TableField(exist = false)
     private boolean insuranceHolder;
 
+    //类型
+    @TableField(value = "user_type")
+    private Integer userType;
+
 //    //创建时间
 //    @TableField(value = "create_time")
 //    private Date createTime;

src/main/java/com/ydtech/modules/order/service/InsAreaCompanyCarUserInfoService.java

@@ -6,6 +6,7 @@ import com.ydtech.modules.order.entity.InsAreaCompanyCarUserInfo;
 import com.ydtech.modules.order.entity.InsOrders;
 
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * 子订单用户信息(InsAreaCompanyCarInfo)表服务接口
@@ -18,5 +19,6 @@ public interface InsAreaCompanyCarUserInfoService extends IService<InsAreaCompan
     HashMap<String, String> getCarUserInfo(InsOrders insOrders);
     HashMap<String,String> getCarUserInfo(InsAreaCompanyCarInfo insAreaCompanyCarInfo);
 
+    List<InsAreaCompanyCarUserInfo> getCarUserInfo(String companyId);
 
 }

src/main/java/com/ydtech/modules/order/service/InsOrdersCarUserInfoService.java

@@ -31,12 +31,10 @@ public interface InsOrdersCarUserInfoService extends IService<InsOrdersCarUserIn
 
     /**
      * 获取orders表的 车主 投保 被保人信息
-     * @param ownerId
-     * @param applyId
-     * @param insureId
+     * @param orderNo
      * @return
      */
-    HashMap<String,InsOrdersCarUserInfo> getOrdersCarUserInfo(String ownerId, String applyId, String insureId);
+    HashMap<String,InsOrdersCarUserInfo> getOrdersCarUserInfo(String orderNo);
 }
 
 

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

@@ -78,4 +78,10 @@ public class InsAreaCompanyCarUserInfoServiceImpl extends ServiceImpl<InsAreaCom
     public HashMap<String, String> getCarUserInfo(InsAreaCompanyCarInfo insAreaCompanyCarInfo) {
         return null;
     }
+
+    @Override
+    public List<InsAreaCompanyCarUserInfo> getCarUserInfo(String companyId) {
+        List<InsAreaCompanyCarUserInfo> list = insAreaCompanyCarUserInfoService.list(new LambdaQueryWrapper<InsAreaCompanyCarUserInfo>().eq(InsAreaCompanyCarUserInfo::getCompanyId, companyId));
+        return list;
+    }
 }

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

@@ -98,30 +98,25 @@ public class InsOrdersCarUserInfoServiceImpl extends ServiceImpl<InsOrdersCarUse
     }
 
     @Override
-    public HashMap<String, InsOrdersCarUserInfo> getOrdersCarUserInfo(String ownerId, String applyId, String insureId) {
+    public HashMap<String, InsOrdersCarUserInfo> getOrdersCarUserInfo(String orderNo) {
         HashMap<String,InsOrdersCarUserInfo> result = new HashMap<>();
-        List<String> userIds = new ArrayList<>();
-        userIds.add(ownerId);
-        userIds.add(applyId);
-        userIds.add(insureId);
-        List<String> uniqueUserIds = userIds.stream().distinct().collect(Collectors.toList());
-        List<InsOrdersCarUserInfo> insOrdersCarUserInfos = this.list(new LambdaQueryWrapper<>(new InsOrdersCarUserInfo()).in(InsOrdersCarUserInfo::getId, uniqueUserIds));
+        List<InsOrdersCarUserInfo> insOrdersCarUserInfos = this.list(new LambdaQueryWrapper<>(new InsOrdersCarUserInfo()).eq(InsOrdersCarUserInfo::getOrderNo, orderNo));
         insOrdersCarUserInfos.forEach(item->{
-            if(item.getId().equals(ownerId)){
+            if(item.getUserType() == 1){
                 JSONObject jsonObject = new JSONObject();
                 InsOrdersCarUserInfo tempCarInfo = JSONObject.parseObject(jsonObject.toJSONString(item),InsOrdersCarUserInfo.class);
                 tempCarInfo.setIdentifyValidDate(tempCarInfo.getIdentifyValidDate().substring(0,10));
                 tempCarInfo.setIdentifyValidEndDate(tempCarInfo.getIdentifyValidEndDate().substring(0,10));
                 result.put("ownerInfo",tempCarInfo);
             }
-            if(item.getId().equals(applyId)){
+            if(item.getUserType() == 2){
                 JSONObject jsonObject = new JSONObject();
                 InsOrdersCarUserInfo tempCarInfo = JSONObject.parseObject(jsonObject.toJSONString(item),InsOrdersCarUserInfo.class);
                 tempCarInfo.setIdentifyValidDate(tempCarInfo.getIdentifyValidDate().substring(0,10));
                 tempCarInfo.setIdentifyValidEndDate(tempCarInfo.getIdentifyValidEndDate().substring(0,10));
                 result.put("applyInfo",tempCarInfo);
             }
-            if(item.getId().equals(insureId)){
+            if(item.getUserType() == 3){
                 JSONObject jsonObject = new JSONObject();
                 InsOrdersCarUserInfo tempCarInfo = JSONObject.parseObject(jsonObject.toJSONString(item),InsOrdersCarUserInfo.class);
                 tempCarInfo.setIdentifyValidDate(tempCarInfo.getIdentifyValidDate().substring(0,10));

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

@@ -591,9 +591,11 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         InsAreaCompanyCarInfo carInfo = insAreaCompanyCarInfoService.getById(iac.getCarInfoId());
         orderAndAreaCompany.setCarinfo(JSONObject.parseObject(JSON.toJSONString(carInfo)));
         //查找车辆用户信息
-        InsAreaCompanyCarUserInfo ownerInfo = insAreaCompanyCarUserInfoService.getById(iac.getOwnerId());
-        InsAreaCompanyCarUserInfo applyInfo;
-        orderAndAreaCompany.setOwnerinfo(JSONObject.parseObject(JSON.toJSONString(ownerInfo)));
+
+        List<InsAreaCompanyCarUserInfo> companyCarUserInfos = insAreaCompanyCarUserInfoService.getCarUserInfo(iac.getCompanyId());
+//        companyCarUserInfos.stream().filter(x-> x.getUser)
+
+//        orderAndAreaCompany.setOwnerinfo(JSONObject.parseObject(JSON.toJSONString(ownerInfo)));
         List<String> userIds = new ArrayList<>();
         userIds.add(iac.getOwnerId());
         userIds.add(iac.getApplyId());
@@ -694,7 +696,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         insOrdersEditingVo.setCarinfo(insOrdersCarInfo);
 
         //获取车主信
-        HashMap<String, InsOrdersCarUserInfo> ordersCarUserInfo = insOrdersCarUserInfoService.getOrdersCarUserInfo(insOrders.getOwnerId(), insOrders.getApplyId(), insOrders.getInsureId());
+        HashMap<String, InsOrdersCarUserInfo> ordersCarUserInfo = insOrdersCarUserInfoService.getOrdersCarUserInfo(insOrders.getOrderno());
 
         InsOrdersCarUserInfo ownerInfo = ordersCarUserInfo.get("ownerInfo");
         insOrdersEditingVo.setOwnerinfo(ownerInfo);

src/main/java/com/ydtech/modules/xxl/handler/SyncCarInfoHandler.java

@@ -87,8 +87,14 @@ public class SyncCarInfoHandler {
         try {
             //全局存储 用户信息
             List<InsOrdersCarUserInfo> globalInsOrdersCarUserInfos = new ArrayList<>();
-            List<InsOrdersOld> page = insOrdersOldService.list();
-            page.forEach(item -> {
+            long count = insOrdersOldService.count();
+            long i1 = count / 1000;
+            long yu = count % 1000;
+            if(yu > 0)
+                i1++;
+            for(int kk=1;kk<=i1 ;kk++)
+            {
+                Page<InsOrdersOld> page = insOrdersOldService.page(new Page<>(kk,1000));
                 List<InsOrders> insOrdersList = new ArrayList<>();
                 //需要保存的车主用户数据
                 List<InsOrdersCarUserInfo> insOrdersCarUserInfos = new ArrayList<>();
@@ -96,92 +102,111 @@ public class SyncCarInfoHandler {
                 List<InsOrdersRisk> insOrdersRisks = new ArrayList<>();
                 List<InsOrdersKind> insOrdersKinds = new ArrayList<>();
                 List<InsOrdersTax> insOrdersTaxes = new ArrayList<>();
+                page.getRecords().forEach(item -> {
+
+
+                    InsOrders insOrders = new InsOrders();
+                    BeanUtils.copyProperties(item, insOrders);
+                    JSONObject ownerInfo = item.getOwnerinfo();
+                    JSONObject applyinfo = item.getApplyinfo();
+                    JSONObject insureInfo = item.getInsureinfo();
+                    JSONObject carInfo = item.getCarinfo();
+                    JSONArray risk = item.getRisk();
+                    JSONArray kind = item.getKing();
+                    JSONObject tax = item.getVehicleAndVesselTax();
+                    //新增 车辆信息
+                    InsOrdersCarInfo insOrdersCarInfo = JSONObject.parseObject(carInfo.toJSONString(), InsOrdersCarInfo.class);
+                    insOrdersCarInfo.setId(IdGenerate.nextId());
+                    insOrdersCarInfo.setOrderNo(insOrders.getOrderno());
+                    insOrdersCarInfo.setRegisterDate(validateAndFormatDate(insOrdersCarInfo.getRegisterDate()));
+                    insOrdersCarInfo.setIssueDate(validateAndFormatDate(insOrdersCarInfo.getIssueDate()));
+                    insOrders.setCarInfoId(insOrdersCarInfo.getId());
+                    insOrdersCarInfos.add(insOrdersCarInfo);
+//                    insOrdersCarInfoService.save(insOrdersCarInfo);
+
+                    //车主信息
+                    InsOrdersCarUserInfo owner = JSONObject.parseObject(ownerInfo.toJSONString(), InsOrdersCarUserInfo.class);
+                    owner.setId(IdGenerate.nextId());
+                    owner.setIdentifyValidDate(validateAndFormatDate(owner.getIdentifyValidDate()));
+                    owner.setIdentifyValidEndDate(validateAndFormatDate(owner.getIdentifyValidEndDate()));
+                    owner.setGender(String.valueOf(IdcardUtil.getGenderByIdCard(owner.getIdentifyNumber()) == 1?"男":"女"));
+                    owner.setAge(String.valueOf(IdcardUtil.getAgeByIdCard(owner.getIdentifyNumber())));
+                    owner.setOrderNo(insOrders.getOrderno());
+                    owner.setUserType(1);
+                    insOrders.setOwnerId(owner.getId());
+                    insOrdersCarUserInfos.add(owner);
+//                    insOrdersCarUserInfoService.save(owner);
+
+                    //投保人
+                    InsOrdersCarUserInfo apply = JSONObject.parseObject(applyinfo.toJSONString(), InsOrdersCarUserInfo.class);
+                    apply.setId(IdGenerate.nextId());
+                    apply.setIdentifyValidDate(validateAndFormatDate(apply.getIdentifyValidDate()));
+                    apply.setIdentifyValidEndDate(validateAndFormatDate(apply.getIdentifyValidEndDate()));
+                    apply.setGender(String.valueOf(IdcardUtil.getGenderByIdCard(apply.getIdentifyNumber()) == 1?"男":"女"));
+                    apply.setAge(String.valueOf(IdcardUtil.getAgeByIdCard(apply.getIdentifyNumber())));
+                    apply.setOrderNo(insOrders.getOrderno());
+                    apply.setUserType(2);
+                    insOrders.setApplyId(apply.getId());
+                    insOrdersCarUserInfos.add(apply);
+//                    insOrdersCarUserInfoService.save(apply);
+
+                    //被保人信息
+                    InsOrdersCarUserInfo insure = JSONObject.parseObject(insureInfo.toJSONString(), InsOrdersCarUserInfo.class);
+                    insure.setId(IdGenerate.nextId());
+                    insure.setIdentifyValidDate(validateAndFormatDate(insure.getIdentifyValidDate()));
+                    insure.setIdentifyValidEndDate(validateAndFormatDate(insure.getIdentifyValidEndDate()));
+                    insure.setGender(String.valueOf(IdcardUtil.getGenderByIdCard(insure.getIdentifyNumber()) == 1?"男":"女"));
+                    insure.setAge(String.valueOf(IdcardUtil.getAgeByIdCard(insure.getIdentifyNumber())));
+                    insure.setOrderNo(insOrders.getOrderno());
+                    insure.setUserType(3);
+                    insOrders.setInsureId(insure.getId());
+                    insOrdersCarUserInfos.add(insure);
+//                    insOrdersCarUserInfoService.save(insure);
+
+                    //risk
+                    for (int i = 0; i < risk.size(); i++) {
+                        JSONObject jsonObject = risk.getJSONObject(i);
+                        RiskInfoVo riskInfoVo = jsonObject.toJavaObject(RiskInfoVo.class);
+                        InsOrdersRisk insOrdersRisk = new InsOrdersRisk(riskInfoVo, insOrders.getOrderno());
+                        insOrdersRisk.setId(IdGenerate.nextId());
+                        insOrdersRisk.setStartDate(validateAndFormatDate(insOrdersRisk.getStartDate()));
+                        insOrdersRisk.setEndDate(validateAndFormatDate(insOrdersRisk.getEndDate()));
+                        insOrdersRisks.add(insOrdersRisk);
+                    }
+//                    insOrdersRiskService.saveBatch(insOrdersRisks);
+
+                    //kind
+                    for (int i = 0; i < kind.size(); i++) {
+                        JSONObject jsonObject = kind.getJSONObject(i);
+                        KindInfoVo javaObject = jsonObject.toJavaObject(KindInfoVo.class);
+                        InsOrdersKind insOrdersKind = new InsOrdersKind(javaObject, insOrders.getOrderno());
+                        insOrdersKind.setId(IdGenerate.nextId());
+                        insOrdersKinds.add(insOrdersKind);
+                    }
+//                    insOrdersKindService.saveBatch(insOrdersKinds);
 
-                InsOrders insOrders = new InsOrders();
-                BeanUtils.copyProperties(item, insOrders);
-                JSONObject ownerInfo = item.getOwnerinfo();
-                JSONObject applyinfo = item.getApplyinfo();
-                JSONObject insureInfo = item.getInsureinfo();
-                JSONObject carInfo = item.getCarinfo();
-                JSONArray risk = item.getRisk();
-                JSONArray kind = item.getKing();
-                JSONObject tax = item.getVehicleAndVesselTax();
-                //新增 车辆信息
-                InsOrdersCarInfo insOrdersCarInfo = JSONObject.parseObject(carInfo.toJSONString(), InsOrdersCarInfo.class);
-                insOrdersCarInfo.setId(IdGenerate.nextId());
-                insOrdersCarInfo.setOrderNo(insOrders.getOrderno());
-                insOrdersCarInfo.setRegisterDate(validateAndFormatDate(insOrdersCarInfo.getRegisterDate()));
-                insOrdersCarInfo.setIssueDate(validateAndFormatDate(insOrdersCarInfo.getIssueDate()));
-                insOrders.setCarInfoId(insOrdersCarInfo.getId());
-                insOrdersCarInfoService.save(insOrdersCarInfo);
-
-                //车主信息
-                InsOrdersCarUserInfo owner = JSONObject.parseObject(ownerInfo.toJSONString(), InsOrdersCarUserInfo.class);
-                owner.setId(IdGenerate.nextId());
-                owner.setIdentifyValidDate(validateAndFormatDate(owner.getIdentifyValidDate()));
-                owner.setIdentifyValidEndDate(validateAndFormatDate(owner.getIdentifyValidEndDate()));
-                owner.setGender(String.valueOf(IdcardUtil.getGenderByIdCard(owner.getIdentifyNumber()) == 1?"男":"女"));
-                owner.setAge(String.valueOf(IdcardUtil.getAgeByIdCard(owner.getIdentifyNumber())));
-                owner.setOrderNo(insOrders.getOrderno());
-                insOrders.setOwnerId(owner.getId());
-                insOrdersCarUserInfoService.save(owner);
-
-                //投保人
-                InsOrdersCarUserInfo apply = JSONObject.parseObject(applyinfo.toJSONString(), InsOrdersCarUserInfo.class);
-                apply.setId(IdGenerate.nextId());
-                apply.setIdentifyValidDate(validateAndFormatDate(apply.getIdentifyValidDate()));
-                apply.setIdentifyValidEndDate(validateAndFormatDate(apply.getIdentifyValidEndDate()));
-                apply.setGender(String.valueOf(IdcardUtil.getGenderByIdCard(apply.getIdentifyNumber()) == 1?"男":"女"));
-                apply.setAge(String.valueOf(IdcardUtil.getAgeByIdCard(apply.getIdentifyNumber())));
-                apply.setOrderNo(insOrders.getOrderno());
-                insOrders.setApplyId(apply.getId());
-                insOrdersCarUserInfoService.save(apply);
-
-                //被保人信息
-                InsOrdersCarUserInfo insure = JSONObject.parseObject(insureInfo.toJSONString(), InsOrdersCarUserInfo.class);
-                insure.setId(IdGenerate.nextId());
-                insure.setIdentifyValidDate(validateAndFormatDate(insure.getIdentifyValidDate()));
-                insure.setIdentifyValidEndDate(validateAndFormatDate(insure.getIdentifyValidEndDate()));
-                insure.setGender(String.valueOf(IdcardUtil.getGenderByIdCard(insure.getIdentifyNumber()) == 1?"男":"女"));
-                insure.setAge(String.valueOf(IdcardUtil.getAgeByIdCard(insure.getIdentifyNumber())));
-                insure.setOrderNo(insOrders.getOrderno());
-                insOrders.setInsureId(insure.getId());
-                insOrdersCarUserInfoService.save(insure);
-
-                //risk
-                for (int i = 0; i < risk.size(); i++) {
-                    JSONObject jsonObject = risk.getJSONObject(i);
-                    RiskInfoVo riskInfoVo = jsonObject.toJavaObject(RiskInfoVo.class);
-                    InsOrdersRisk insOrdersRisk = new InsOrdersRisk(riskInfoVo, insOrders.getOrderno());
-                    insOrdersRisk.setId(IdGenerate.nextId());
-                    insOrdersRisk.setStartDate(validateAndFormatDate(insOrdersRisk.getStartDate()));
-                    insOrdersRisk.setEndDate(validateAndFormatDate(insOrdersRisk.getEndDate()));
-                    insOrdersRisks.add(insOrdersRisk);
-                }
-                insOrdersRiskService.saveBatch(insOrdersRisks);
-
-                //kind
-                for (int i = 0; i < kind.size(); i++) {
-                    JSONObject jsonObject = kind.getJSONObject(i);
-                    KindInfoVo javaObject = jsonObject.toJavaObject(KindInfoVo.class);
-                    InsOrdersKind insOrdersKind = new InsOrdersKind(javaObject, insOrders.getOrderno());
-                    insOrdersKind.setId(IdGenerate.nextId());
-                    insOrdersKinds.add(insOrdersKind);
-                }
-                insOrdersKindService.saveBatch(insOrdersKinds);
-
-                //tax
-                if (item.getVehicleAndVesselTax() != null) {
-                    InsOrdersTax insOrdersTax = validateAndFormatTaxDate(item.getVehicleAndVesselTax());
-                    insOrdersTax.setOrderNo(insOrders.getOrderno());
+                    //tax
+                    if (tax != null) {
+                        InsOrdersTax insOrdersTax = validateAndFormatTaxDate(item.getVehicleAndVesselTax());
+                        insOrdersTax.setOrderNo(insOrders.getOrderno());
 //                InsOrdersTax insOrdersTax = insOrdersOld.getVehicleAndVesselTax().toJavaObject(InsOrdersTax.class);
-                    if (!Objects.isNull(insOrdersTax)) {
-                        insOrdersTaxes.add(insOrdersTax);
+                        if (!Objects.isNull(insOrdersTax)) {
+                            insOrdersTaxes.add(insOrdersTax);
+                        }
                     }
-                }
+
+                    insOrdersList.add(insOrders);
+//                    insOrdersTaxService.saveBatch(insOrdersTaxes);
+//                    insOrdersService.save(insOrders);
+                });
+                insOrdersService.saveBatch(insOrdersList);
+                insOrdersCarInfoService.saveBatch(insOrdersCarInfos);
+                insOrdersCarUserInfoService.saveBatch(insOrdersCarUserInfos);
+                insOrdersRiskService.saveBatch(insOrdersRisks);
+                insOrdersKindService.saveBatch(insOrdersKinds);
                 insOrdersTaxService.saveBatch(insOrdersTaxes);
-                insOrdersService.save(insOrders);
-            });
+            }
+
         }catch(Exception e){
             System.out.printf("出现异常");
             System.out.printf(e.getMessage());

src/main/java/com/ydtech/modules/xxl/handler/SyncInsAreaCompany.java

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Component;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,96 +71,116 @@ public class SyncInsAreaCompany {
     @XxlJob("SyncInsAreaCompany")
     public void SyncInsAreaCompany() throws IOException, InterruptedException {
         long count = insAreaCompanyOldService.count();
+        long i1 = count / 1000;
+        long yu = count % 1000;
+        if(yu > 0)
+            i1++;
         //查出全部数据
-        List<InsAreaCompanyVo> list = insAreaCompanyOldService.queryAll(new Page(1,count));
-        list.forEach(insAreaCompanyOld->{
-            InsOrders insOrders = insOrdersService.getOne(new LambdaQueryWrapper<>(InsOrders.class).eq(InsOrders::getOrderno, insAreaCompanyOld.getOrderno()));
-            if(insOrders != null) {
-                InsAreaCompany insAreaCompany = new InsAreaCompany();
-                if (Objects.isNull(insAreaCompanyOld)) {
-                    System.out.printf("insAreaCompanyOld is null");
-                }
-                BeanUtils.copyProperties(insAreaCompanyOld, insAreaCompany);
-                //1 处理车主信息
-                InsOrdersCarInfo ordersCarInfo = insOrdersCarInfoService.getById(insAreaCompanyOld.getCarInfoId());
-                InsAreaCompanyCarInfo carInfo = new InsAreaCompanyCarInfo();
-                BeanUtils.copyProperties(ordersCarInfo, carInfo);
-                carInfo.setId(IdGenerate.nextId());
-                insAreaCompany.setCarInfoId(carInfo.getId());
-                carInfo.setCompanyId(insAreaCompany.getId());
-                insAreaCompanyCarInfoService.saveOrUpdate(carInfo);
-
-                //2 处理车险用户信息
-                List<String> userIds = new ArrayList<>();
-                userIds.add(insOrders.getOwnerId());
-                userIds.add(insOrders.getApplyId());
-                userIds.add(insOrders.getInsureId());
-                List<InsOrdersCarUserInfo> userInfoList = insOrdersCarUserInfoService.list(new LambdaQueryWrapper<>(InsOrdersCarUserInfo.class).in(InsOrdersCarUserInfo::getId, userIds));
-
-                List<InsAreaCompanyCarUserInfo> insAreaCompanyCarUserInfos = new ArrayList<>();
-                userInfoList.forEach(item -> {
-                    String id = item.getId();
-                    InsAreaCompanyCarUserInfo userInfo = new InsAreaCompanyCarUserInfo();
-                    BeanUtils.copyProperties(item, userInfo);
-                    userInfo.setCompanyId(insAreaCompany.getId());
-                    if (id.equals(insOrders.getOwnerId())) {
-                        insAreaCompany.setOwnerId(userInfo.getId());
-                    }
-                    if (id.equals(insOrders.getApplyId())) {
-                        insAreaCompany.setApplyId(userInfo.getId());
+        for(int kk=1;kk<=i1 ;kk++) {
+            List<InsAreaCompanyVo> list = insAreaCompanyOldService.queryAll(new Page(kk, 1000));
+            List<InsAreaCompany> insAreaCompanies = new ArrayList<>();
+            List<InsAreaCompanyCarInfo> insAreaCompanyCarInfos = new ArrayList<>();
+            List<InsAreaCompanyCarUserInfo> insAreaCompanyCarUserInfos = new ArrayList<>();
+            List<InsAreaCompanyRisk> insAreaCompanyRisks = new ArrayList<>();
+            List<InsAreaCompanyKind> insAreaCompanyKinds = new ArrayList<>();
+            List<InsAreaCompanyTaxArrears> insAreaCompanyTaxArrears = new ArrayList<>();
+
+
+            list.forEach(insAreaCompanyOld -> {
+                InsOrders insOrders = insOrdersService.getOne(new LambdaQueryWrapper<>(InsOrders.class).eq(InsOrders::getOrderno, insAreaCompanyOld.getOrderno()));
+                if (insOrders != null) {
+                    InsAreaCompany insAreaCompany = new InsAreaCompany();
+                    if (Objects.isNull(insAreaCompanyOld)) {
+                        System.out.printf("insAreaCompanyOld is null");
                     }
-                    if (id.equals(insOrders.getInsureId())) {
-                        insAreaCompany.setInsureId(userInfo.getId());
+                    BeanUtils.copyProperties(insAreaCompanyOld, insAreaCompany);
+                    //1 处理车主信息
+                    InsOrdersCarInfo ordersCarInfo = insOrdersCarInfoService.getById(insAreaCompanyOld.getCarInfoId());
+                    InsAreaCompanyCarInfo carInfo = new InsAreaCompanyCarInfo();
+                    BeanUtils.copyProperties(ordersCarInfo, carInfo);
+                    carInfo.setId(IdGenerate.nextId());
+                    insAreaCompany.setCarInfoId(carInfo.getId());
+                    carInfo.setCompanyId(insAreaCompany.getId());
+                    insAreaCompanyCarInfos.add(carInfo);
+//                    insAreaCompanyCarInfoService.saveOrUpdate(carInfo);
+
+                    //2 处理车险用户信息
+                    HashMap<String, InsOrdersCarUserInfo> userInfoList = insOrdersCarUserInfoService.getOrdersCarUserInfo(insOrders.getOrderno());
+                    InsOrdersCarUserInfo ownerOrderInfo = userInfoList.get("ownerInfo");
+                    InsAreaCompanyCarUserInfo ownerAreaCompanyCarUserInfo = new InsAreaCompanyCarUserInfo();
+                    BeanUtils.copyProperties(ownerOrderInfo, ownerAreaCompanyCarUserInfo);
+                    ownerAreaCompanyCarUserInfo.setId(IdGenerate.nextId());
+                    ownerAreaCompanyCarUserInfo.setCompanyId(insAreaCompany.getId());
+                    insAreaCompanyCarUserInfos.add(ownerAreaCompanyCarUserInfo);
+
+
+                    InsOrdersCarUserInfo applyOrderInfo = userInfoList.get("applyInfo");
+                    InsAreaCompanyCarUserInfo applyAreaCompanyCarUserInfo = new InsAreaCompanyCarUserInfo();
+                    BeanUtils.copyProperties(applyOrderInfo, applyAreaCompanyCarUserInfo);
+                    applyAreaCompanyCarUserInfo.setId(IdGenerate.nextId());
+                    applyAreaCompanyCarUserInfo.setCompanyId(insAreaCompany.getId());
+                    insAreaCompanyCarUserInfos.add(applyAreaCompanyCarUserInfo);
+
+
+                    InsOrdersCarUserInfo insureOrderInfo = userInfoList.get("insureInfo");
+                    InsAreaCompanyCarUserInfo insureAreaCompanyCarUserInfo = new InsAreaCompanyCarUserInfo();
+                    BeanUtils.copyProperties(insureOrderInfo, insureAreaCompanyCarUserInfo);
+                    insureAreaCompanyCarUserInfo.setId(IdGenerate.nextId());
+                    insureAreaCompanyCarUserInfo.setCompanyId(insAreaCompany.getId());
+                    insAreaCompanyCarUserInfos.add(insureAreaCompanyCarUserInfo);
+
+
+//                    insAreaCompanyCarUserInfoService.saveOrUpdateBatch(insAreaCompanyCarUserInfos);
+
+                    //3 处理 risk
+                    if (insAreaCompanyOld.getRiskinfo() != null) {
+                        insAreaCompanyOld.getRiskinfo().forEach(riskObj -> {
+                            InsAreaCompanyRisk insAreaCompanyRisk = new InsAreaCompanyRisk();
+                            JSONObject risk = (JSONObject) riskObj;
+                            insAreaCompanyRisk = JSONObject.parseObject(risk.toJSONString(), InsAreaCompanyRisk.class);
+                            insAreaCompanyRisk.setId(IdGenerate.nextId());
+                            insAreaCompanyRisk.setCompanyId(insAreaCompany.getId());
+                            insAreaCompanyRisks.add(insAreaCompanyRisk);
+                        });
+//                        insAreaCompanyRiskService.saveBatch(insAreaCompanyRisks);
                     }
 
-                    insAreaCompanyCarUserInfos.add(userInfo);
-                });
-                insAreaCompanyCarUserInfoService.saveOrUpdateBatch(insAreaCompanyCarUserInfos);
-
-                //3 处理 risk
-                List<InsAreaCompanyRisk> insAreaCompanyRisks = new ArrayList<>();
-                if (insAreaCompanyOld.getRiskinfo() != null) {
-                    insAreaCompanyOld.getRiskinfo().forEach(riskObj -> {
-                        InsAreaCompanyRisk insAreaCompanyRisk = new InsAreaCompanyRisk();
-                        JSONObject risk = (JSONObject) riskObj;
-                        insAreaCompanyRisk = JSONObject.parseObject(risk.toJSONString(), InsAreaCompanyRisk.class);
-                        insAreaCompanyRisk.setId(IdGenerate.nextId());
-                        insAreaCompanyRisk.setCompanyId(insAreaCompany.getId());
-                        insAreaCompanyRisks.add(insAreaCompanyRisk);
-                    });
-                    insAreaCompanyRiskService.saveBatch(insAreaCompanyRisks);
+                    //4 处理 kind
+                    if (insAreaCompanyOld.getKindinfo() != null) {
+
+                        insAreaCompanyOld.getKindinfo().forEach(kindObj -> {
+                            InsAreaCompanyKind insAreaCompanyKind = new InsAreaCompanyKind();
+                            JSONObject kind = (JSONObject) kindObj;
+                            insAreaCompanyKind = JSONObject.parseObject(kind.toJSONString(), InsAreaCompanyKind.class);
+                            insAreaCompanyKind.setId(IdGenerate.nextId());
+                            insAreaCompanyKind.setCompanyId(insAreaCompany.getId());
+                            insAreaCompanyKinds.add(insAreaCompanyKind);
+                        });
+                    }
+                    //5 处理 task
+//                    List<InsAreaCompanyTaxArrears> insAreaCompanyTaxArrears = new ArrayList<>();
+                    if (insAreaCompanyOld.getTaxArrears() != null) {
+                        insAreaCompanyOld.getTaxArrears().forEach(taskObj -> {
+                            InsAreaCompanyTaxArrears insAreaCompanyTaxArrear = new InsAreaCompanyTaxArrears();
+                            JSONObject task = (JSONObject) taskObj;
+                            insAreaCompanyTaxArrear = JSONObject.parseObject(task.toJSONString(), InsAreaCompanyTaxArrears.class);
+                            insAreaCompanyTaxArrear.setId(IdGenerate.nextId());
+                            insAreaCompanyTaxArrear.setCompanyId(insAreaCompany.getId());
+                            insAreaCompanyTaxArrears.add(insAreaCompanyTaxArrear);
+                        });
+                    }
+                    insAreaCompanies.add(insAreaCompany);
                 }
+            });
 
-                //4 处理 kind
-                List<InsAreaCompanyKind> insAreaCompanyKinds = new ArrayList<>();
-                if (insAreaCompanyOld.getKindinfo() != null) {
-
-                    insAreaCompanyOld.getKindinfo().forEach(kindObj -> {
-                        InsAreaCompanyKind insAreaCompanyKind = new InsAreaCompanyKind();
-                        JSONObject kind = (JSONObject) kindObj;
-                        insAreaCompanyKind = JSONObject.parseObject(kind.toJSONString(), InsAreaCompanyKind.class);
-                        insAreaCompanyKind.setId(IdGenerate.nextId());
-                        insAreaCompanyKind.setCompanyId(insAreaCompany.getId());
-                        insAreaCompanyKinds.add(insAreaCompanyKind);
-                    });
-                    insAreaCompanyKindService.saveBatch(insAreaCompanyKinds);
-                }
-                //5 处理 task
-                List<InsAreaCompanyTaxArrears> insAreaCompanyTaxArrears = new ArrayList<>();
-                if (insAreaCompanyOld.getTaxArrears() != null) {
-                    insAreaCompanyOld.getTaxArrears().forEach(taskObj -> {
-                        InsAreaCompanyTaxArrears insAreaCompanyTaxArrear = new InsAreaCompanyTaxArrears();
-                        JSONObject task = (JSONObject) taskObj;
-                        insAreaCompanyTaxArrear = JSONObject.parseObject(task.toJSONString(), InsAreaCompanyTaxArrears.class);
-                        insAreaCompanyTaxArrear.setId(IdGenerate.nextId());
-                        insAreaCompanyTaxArrear.setCompanyId(insAreaCompany.getId());
-                        insAreaCompanyTaxArrears.add(insAreaCompanyTaxArrear);
-                    });
-                    insAreaCompanyTaxArrearsService.saveBatch(insAreaCompanyTaxArrears);
-                }
-                insAreaCompanyService.saveOrUpdate(insAreaCompany);
-            }
-        });
+            insAreaCompanyService.saveBatch(insAreaCompanies);
+            insAreaCompanyCarInfoService.saveBatch(insAreaCompanyCarInfos);
+            insAreaCompanyCarUserInfoService.saveBatch(insAreaCompanyCarUserInfos);
+            insAreaCompanyRiskService.saveBatch(insAreaCompanyRisks);
+            insAreaCompanyKindService.saveBatch(insAreaCompanyKinds);
+            insAreaCompanyTaxArrearsService.saveBatch(insAreaCompanyTaxArrears);
+
+        }
 
     }
 }