diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java
index 76e2afc..62a2043 100644
--- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java
+++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java
@@ -74,6 +74,7 @@ public class AnalyzeController extends JeecgController<GaDemographic, IGaDemogra
     private final List<MrSchool> resultSchools = new ArrayList<>();//分析后学籍的信息
     private static final int corePoolSize = Runtime.getRuntime().availableProcessors();
     private static final ThreadPoolExecutor executor = new ThreadPoolExecutor(corePoolSize, corePoolSize + 1, 10L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(1000));
+    private String random_number="00000000";
 
 
     @AutoLog(value = "来源数据管理-分页列表查询")
@@ -90,13 +91,13 @@ public class AnalyzeController extends JeecgController<GaDemographic, IGaDemogra
             System.out.println("未成年人数据批量新增总条数" + resultMinor.size());
             System.out.println("学籍信息数据批量新增总条数" + resultSchools.size());
             long startTime2 = System.currentTimeMillis();
-            minorService.insertBatch(resultMinor,departs);
+            minorService.insertBatch(resultMinor);
             System.out.println("未成年人数据批量新增所用时间" + (System.currentTimeMillis() - startTime2) / 1000 + "秒");
             long startTime1 = System.currentTimeMillis();
-            familyService.insertBatch(resultFamily,departs);
+            familyService.insertBatch(resultFamily);
             System.out.println("家庭成员数据批量新增所用时间" + (System.currentTimeMillis() - startTime1) / 1000 + "秒");
             long startTime3 = System.currentTimeMillis();
-            schoolService.insertBatch(resultSchools,departs);
+            schoolService.insertBatch(resultSchools);
             System.out.println("学籍信息入库时间" + (System.currentTimeMillis() - startTime3) / 1000 + "秒");
             long startTime4 = System.currentTimeMillis();
             getSourceData();
@@ -114,53 +115,52 @@ public class AnalyzeController extends JeecgController<GaDemographic, IGaDemogra
         try {
             System.out.println("开始数据分析");
             long startTime = System.currentTimeMillis();
-            ExecutorService pool = Executors.newFixedThreadPool(50);
-            CompletableFuture<Map<String, GaPunishVo>> f1 = CompletableFuture.supplyAsync(() -> gaPunishService.queryAll(), executor);
-            CompletableFuture<List<SpecialStudentVo>> f2 = CompletableFuture.supplyAsync(() -> specialStudentService.queryList(), executor);
-            CompletableFuture<List<String>> f3 = CompletableFuture.supplyAsync(() -> mzOrphanService.getIdentityS(), executor);
-            CompletableFuture<List<String>> f4 = CompletableFuture.supplyAsync(() -> mzUnsupportedService.getIdentityS(), executor);
-            CompletableFuture<List<String>> f5 = CompletableFuture.supplyAsync(() -> mzLeftBehindChildrenService.getIdentityS(), executor);
-            CompletableFuture<List<String>> f6 = CompletableFuture.supplyAsync(() -> mzAdoptionService.getIdentityS(), executor);
-            CompletableFuture<List<MrSchool>> f7 = CompletableFuture.supplyAsync(() -> highSchoolService.getList(), executor);
-            CompletableFuture<List<MrSchool>> f8 = CompletableFuture.supplyAsync(() -> primarySchoolService.getList(), executor);
-//            CompletableFuture<Map<String,String>> f9 = CompletableFuture.supplyAsync(() -> gaDemographicService.getIdentityS(), executor);
+//            ExecutorService pool = Executors.newFixedThreadPool(8);
+//            CompletableFuture<Map<String, GaPunishVo>> f1 = CompletableFuture.supplyAsync(() -> gaPunishService.queryAll(), executor);
+//            CompletableFuture<List<SpecialStudentVo>> f2 = CompletableFuture.supplyAsync(() -> specialStudentService.queryList(), executor);
+//            CompletableFuture<List<String>> f3 = CompletableFuture.supplyAsync(() -> mzOrphanService.getIdentityS(), executor);
+//            CompletableFuture<List<String>> f4 = CompletableFuture.supplyAsync(() -> mzUnsupportedService.getIdentityS(), executor);
+//            CompletableFuture<List<String>> f5 = CompletableFuture.supplyAsync(() -> mzLeftBehindChildrenService.getIdentityS(), executor);
+//            CompletableFuture<List<String>> f6 = CompletableFuture.supplyAsync(() -> mzAdoptionService.getIdentityS(), executor);
+//            CompletableFuture<List<MrSchool>> f7 = CompletableFuture.supplyAsync(() -> highSchoolService.getList(), executor);
+//            CompletableFuture<List<MrSchool>> f8 = CompletableFuture.supplyAsync(() -> primarySchoolService.getList(), executor);
             //行政处罚数据
-//            Map<String,GaPunishVo> gaPunishVos = gaPunishService.queryAll();
-            Map<String, GaPunishVo> gaPunishVos = new HashMap<>();
-            gaPunishVos.putAll(f1.get());
-//            List<SpecialStudentVo> specialStudentVos = specialStudentService.queryList();
-            List<SpecialStudentVo> specialStudentVos = new ArrayList<>();
-            specialStudentVos.addAll(f2.get());
+            Map<String,GaPunishVo> gaPunishVos = gaPunishService.queryAll();
+//            Map<String, GaPunishVo> gaPunishVos = new HashMap<>();
+//            gaPunishVos.putAll(f1.get());
+            List<SpecialStudentVo> specialStudentVos = specialStudentService.queryList();
+//            List<SpecialStudentVo> specialStudentVos = new ArrayList<>();
+//            specialStudentVos.addAll(f2.get());
             //孤儿数据
-//            List<String> mzOrphans  = mzOrphanService.getIdentityS();
-            List<String> mzOrphans = new ArrayList<>();
-            mzOrphans.addAll(f3.get());
+            List<String> mzOrphans  = mzOrphanService.getIdentityS();
+//            List<String> mzOrphans = new ArrayList<>();
+//            mzOrphans.addAll(f3.get());
             //无人抚养
-//            List<String> mzUnsupporteds =  mzUnsupportedService.getIdentityS();
-            List<String> mzUnsupporteds = new ArrayList<>();
-            mzUnsupporteds.addAll(f4.get());
+            List<String> mzUnsupporteds =  mzUnsupportedService.getIdentityS();
+//            List<String> mzUnsupporteds = new ArrayList<>();
+//            mzUnsupporteds.addAll(f4.get());
             //留守儿童
-//            List<String> mzLeftBehinds =mzLeftBehindChildrenService.getIdentityS();
-            List<String> mzLeftBehinds = new ArrayList<>();
-            mzLeftBehinds.addAll(f5.get());
+            List<String> mzLeftBehinds =mzLeftBehindChildrenService.getIdentityS();
+//            List<String> mzLeftBehinds = new ArrayList<>();
+//            mzLeftBehinds.addAll(f5.get());
             //领养
-//            List<String> mzAdoptions =mzAdoptionService.getIdentityS();
-            List<String> mzAdoptions = new ArrayList<>();
-            mzAdoptions.addAll(f6.get());
+            List<String> mzAdoptions =mzAdoptionService.getIdentityS();
+//            List<String> mzAdoptions = new ArrayList<>();
+//            mzAdoptions.addAll(f6.get());
             //获取初高中学生信息
-//            List<MrSchool> highSchools = highSchoolService.getList();
-            List<MrSchool> highSchools = new ArrayList<>();
-            highSchools.addAll(f7.get());
+            List<MrSchool> highSchools = highSchoolService.getList();
+//            List<MrSchool> highSchools = new ArrayList<>();
+//            highSchools.addAll(f7.get());
             //获取幼小学生信息
-//            List<MrSchool> primarySchools = primarySchoolService.getList();
-            List<MrSchool> primarySchools = new ArrayList<>();
-            primarySchools.addAll(f8.get());
+            List<MrSchool> primarySchools = primarySchoolService.getList();
+//            List<MrSchool> primarySchools = new ArrayList<>();
+//            primarySchools.addAll(f8.get());
             //人口基本信息小于18岁
 //            Map<String,String> gaDemographics =gaDemographicService.getIdentityS();
 //            Map<String,String> gaDemographics =new HashMap<>();
 //            gaDemographics.putAll(f9.get());
             //关闭线程池
-            pool.shutdown();
+//            pool.shutdown();
             Map<String, String> gaDemographics = gaDemographicService.getIdentityS();
             System.out.println("线程池查询用时" + (System.currentTimeMillis() - startTime) / 1000 + "秒");
             long startTime1 = System.currentTimeMillis();
@@ -311,7 +311,7 @@ public class AnalyzeController extends JeecgController<GaDemographic, IGaDemogra
             //初高中学生信息和人口基本信息的交集
             List<MrSchool> highSchoolIntersection = new ArrayList<>();
             if (oConvertUtils.isNotEmpty(highSchools)) {
-                highSchools.parallelStream().forEach(h -> {
+                highSchools.stream().forEach(h -> {
                     if (oConvertUtils.isNotEmpty(gaDemographics) && oConvertUtils.isNotEmpty(gaDemographics.get(h.getIdentity()))) {
                         if (h.getIdentity().equals(gaDemographics.get(h.getIdentity()))) {
                             //交集
@@ -355,7 +355,7 @@ public class AnalyzeController extends JeecgController<GaDemographic, IGaDemogra
             //幼小学生信息和人口基本信息的交集
             List<MrSchool> primarySchoolIntersection = new ArrayList<>();
             if (oConvertUtils.isNotEmpty(primarySchools)) {
-                primarySchools.parallelStream().forEach(p -> {
+                primarySchools.stream().forEach(p -> {
                     if (oConvertUtils.isNotEmpty(gaDemographics) && oConvertUtils.isNotEmpty(p) && oConvertUtils.isNotEmpty(gaDemographics.get(p.getIdentity()))) {
                         if (p.getIdentity().equals(gaDemographics.get(p.getIdentity()))) {
                             //交集
@@ -391,8 +391,8 @@ public class AnalyzeController extends JeecgController<GaDemographic, IGaDemogra
             System.out.println("处理有人口基本信息但没有学籍信息的数据开始***********************" + gaDemographicDifference.size());
             Map<String, Minor> minorMap = new HashMap<>();
             if (oConvertUtils.isNotEmpty(gaDemographicDifference) && oConvertUtils.isNotEmpty(gaHouseholds)) {
-                gaDemographicDifference.parallelStream().forEach(idCard -> {
-                    if (oConvertUtils.isNotEmpty(idCard) && oConvertUtils.isNotEmpty(gaHouseholds.get(idCard))) {
+                gaDemographicDifference.stream().forEach(idCard -> {
+                    if (oConvertUtils.isNotEmpty(idCard) && oConvertUtils.isNotEmpty(gaHouseholds.get(idCard)) && IDNumberUtil.checkID(idCard)) {
                         Minor minor = new Minor();
                         minor.setSchool(Minor.SCHOOL_STATUS_YES);
                         minor.setName(gaHouseholds.get(idCard).getName());
@@ -440,7 +440,7 @@ public class AnalyzeController extends JeecgController<GaDemographic, IGaDemogra
             System.out.println("交集数据里的所属单位开始" + (System.currentTimeMillis() - startTime) / 1000);
             if (oConvertUtils.isNotEmpty(intersection) && oConvertUtils.isNotEmpty(departs) && departs.size() > 0) {
                 for (SysDepart d : departs) {
-                    intersection.parallelStream().forEach(i -> {
+                    intersection.stream().forEach(i -> {
                         if (oConvertUtils.isNotEmpty(i) && oConvertUtils.isNotEmpty(i.getSchool()) && oConvertUtils.isNotEmpty(d) && oConvertUtils.isNotEmpty(d.getCommonCode())) {
                             if (d.getCommonCode().contains(i.getSchool())) {
                                 i.setSysOrgCode(d.getOrgCode());
@@ -452,8 +452,8 @@ public class AnalyzeController extends JeecgController<GaDemographic, IGaDemogra
             System.out.println("交集数据里的所属单位结束总数"+intersection.size()+"交集数据里的所属单位结束" + (System.currentTimeMillis() - startTime) / 1000);
             Date creatDate = new Date();
             if (oConvertUtils.isNotEmpty(intersection)) {
-                intersection.parallelStream().forEach(i -> {
-                    if (oConvertUtils.isNotEmpty(i) && oConvertUtils.isNotEmpty(i.getIdentity())) {
+                intersection.stream().forEach(i -> {
+                    if (oConvertUtils.isNotEmpty(i) && oConvertUtils.isNotEmpty(i.getIdentity()) && IDNumberUtil.checkID(i.getIdentity())) {
                         Minor minor = new Minor();
                         //身份证号
                         String idCard = i.getIdentity();
@@ -507,9 +507,9 @@ public class AnalyzeController extends JeecgController<GaDemographic, IGaDemogra
             Date creatTime = new Date();
             if (oConvertUtils.isNotEmpty(difference) && oConvertUtils.isNotEmpty(departs) && departs.size() > 0) {
                 for (SysDepart d : departs) {
-                    difference.parallelStream().forEach(m -> {
+                    difference.stream().forEach(m -> {
                         Minor minor = new Minor();
-                        if (oConvertUtils.isNotEmpty(m)) {
+                        if (oConvertUtils.isNotEmpty(m) && oConvertUtils.isNotEmpty(m.getIdentity())  && IDNumberUtil.checkID(m.getIdentity())) {
                             if (oConvertUtils.isNotEmpty(d) && oConvertUtils.isNotEmpty(d.getCommonCode()) && oConvertUtils.isNotEmpty(m.getSchool())) {
                                 if (d.getCommonCode().contains(m.getSchool()) && oConvertUtils.isNotEmpty(minorMap.get(m.getIdentity()))) {
                                     minor.setSysOrgCode(d.getOrgCode());
@@ -692,9 +692,24 @@ public class AnalyzeController extends JeecgController<GaDemographic, IGaDemogra
             //户号-与监护人
             Map<String, Family> guardians = new HashMap<>();
             if (oConvertUtils.isNotEmpty(gaHouseholds)) {
+                int i=0;
                 for (Map.Entry<String, Family> m : gaHouseholds.entrySet()) {
                     String mapKey = m.getKey();
                     Family family = m.getValue();
+                    if (oConvertUtils.isNotEmpty(family)) {
+                        i=i+1;
+                        if (oConvertUtils.isNotEmpty(gaPunishVos) && oConvertUtils.isNotEmpty(gaPunishVos.get(mapKey))) {
+                            family.setCrime(Family.IS_CRIME);
+                            if (oConvertUtils.isNotEmpty(gaPunishVos.get(mapKey).getAjmc())) {
+                                family.setOther(gaPunishVos.get(mapKey).getAjmc());
+                            }
+                            if (oConvertUtils.isNotEmpty(gaPunishVos.get(mapKey).getSldwmc())) {
+                                family.setReason(gaPunishVos.get(mapKey).getSldwmc());
+                            }
+                        } else {
+                            family.setCrime(Family.IS_NOT_CRIME);
+                        }
+                    }
                     if (oConvertUtils.isNotEmpty(family) && oConvertUtils.isNotEmpty(family.getHouseholdNum()) && oConvertUtils.isNotEmpty(family.getIdentity())) {
                         String houseNum = family.getHouseholdNum();
                         List<Family> list = new ArrayList<>();
@@ -715,19 +730,6 @@ public class AnalyzeController extends JeecgController<GaDemographic, IGaDemogra
                         }
                         familyMaps.put(houseNum, list);
                     }
-                    if (oConvertUtils.isNotEmpty(family)) {
-                        if (oConvertUtils.isNotEmpty(gaPunishVos) && oConvertUtils.isNotEmpty(gaPunishVos.get(mapKey))) {
-                            family.setCrime(Family.IS_CRIME);
-                            if (oConvertUtils.isNotEmpty(gaPunishVos.get(mapKey).getAjmc())) {
-                                family.setOther(gaPunishVos.get(mapKey).getAjmc());
-                            }
-                            if (oConvertUtils.isNotEmpty(gaPunishVos.get(mapKey).getSldwmc())) {
-                                family.setReason(gaPunishVos.get(mapKey).getSldwmc());
-                            }
-                        } else {
-                            family.setCrime(Family.IS_NOT_CRIME);
-                        }
-                    }
                 }
             }
 
diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Family.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Family.java
index e0ff080..48f8d30 100644
--- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Family.java
+++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Family.java
@@ -30,10 +30,9 @@ public class Family implements Serializable {
     public static  final Integer IS_CRIME=1;//是
     public static  final Integer IS_NOT_CRIME=0;//否
 
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MrSchool.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MrSchool.java
index a716d58..7dab017 100644
--- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MrSchool.java
+++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MrSchool.java
@@ -32,7 +32,7 @@ public class MrSchool implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private String id;
 	/**创建人*/
diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/PrimarySchoolMapper.xml b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/PrimarySchoolMapper.xml
index 3c21b1d..8554505 100644
--- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/PrimarySchoolMapper.xml
+++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/PrimarySchoolMapper.xml
@@ -5,17 +5,17 @@
     <resultMap id="mrSchool" type="org.jeecg.modules.system.entity.MrSchool">
         <result column="name" property="name"/>
         <result column="identity" property="identity"/>
-        <result column="class_name" property="className"/>
+        <result column="className" property="className"/>
         <result column="address" property="address"/>
         <result column="school" property="school"/>
         <result column="phone" property="phone"/>
-        <result column="admission_date" property="admissionDate"/>
-        <result column="member_one" property="memberOne"/>
-        <result column="connect_one" property="connectOne"/>
-        <result column="phone_one" property="phoneOne"/>
-        <result column="member_two" property="memberTwo"/>
-        <result column="connect_two" property="connectTwo"/>
-        <result column="phone_two" property="phoneTwo"/>
+        <result column="admissionDate" property="admissionDate"/>
+        <result column="memberOne" property="memberOne"/>
+        <result column="connectOne" property="connectOne"/>
+        <result column="phoneOne" property="phoneOne"/>
+        <result column="memberTwo" property="memberTwo"/>
+        <result column="connectTwo" property="connectTwo"/>
+        <result column="phoneTwo" property="phoneTwo"/>
     </resultMap>
 
     <select id="getList" resultMap="mrSchool">
diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IFamilyService.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IFamilyService.java
index f222ba0..f206e2f 100644
--- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IFamilyService.java
+++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IFamilyService.java
@@ -18,5 +18,5 @@ public interface IFamilyService extends IService<Family> {
 	public List<Family> selectByMainId(String mainId);
 
 
-	public Integer insertBatch(List<Family> list,List<SysDepart> departs);
+	public Integer insertBatch(List<Family> list);
 }
diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMinorService.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMinorService.java
index 801ff50..d0e9cd7 100644
--- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMinorService.java
+++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMinorService.java
@@ -40,5 +40,5 @@ public interface IMinorService extends IService<Minor> {
 	public void delBatchMain (Collection<? extends Serializable> idList);
 
 
-	public Integer insertBatch(List<Minor> list,List<SysDepart> departs);
+	public Integer insertBatch(List<Minor> list);
 }
diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMrSchoolService.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMrSchoolService.java
index 45b4c73..9457b0e 100644
--- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMrSchoolService.java
+++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMrSchoolService.java
@@ -13,5 +13,5 @@ import java.util.List;
  * @Version: V1.0
  */
 public interface IMrSchoolService extends IService<MrSchool> {
-    public Integer insertBatch(List<MrSchool> list,List<SysDepart> departs);
+    public Integer insertBatch(List<MrSchool> list);
 }
diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/FamilyServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/FamilyServiceImpl.java
index 45fd4ce..4fe8517 100644
--- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/FamilyServiceImpl.java
+++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/FamilyServiceImpl.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.system.service.impl;
 
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.system.entity.Family;
 import org.jeecg.modules.system.entity.Minor;
 import org.jeecg.modules.system.entity.SysDepart;
@@ -19,6 +20,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 
@@ -44,38 +46,49 @@ public class FamilyServiceImpl extends ServiceImpl<FamilyMapper, Family> impleme
 	public List<Family> selectByMainId(String mainId) {
 		return familyMapper.selectByMainId(mainId);
 	}
-	//分段大小
-	private int splitSize = 100000;
+
+	private Integer random_number=00000000;
+
 	/**
 	 * 批量新增
 	 * @param list
 	 * @return
 	 */
 	@Override
-	public Integer insertBatch(List<Family> list,List<SysDepart> departs) {
+	@Transactional
+	public Integer insertBatch(List<Family> list) {
+//		if(oConvertUtils.isNotEmpty(list)){
+//			for(int i=0;i<list.size();i++){
+//				String id=System.currentTimeMillis()+String.valueOf((random_number+i));
+//				System.out.println(id);
+//				list.get(i).setId(id);
+//			}
+//		}
 		updateStudentWithThreads(list);
 		return list.size();
 	}
 	private void  addBatch(List<Family> list, CountDownLatch threadLatch){
-		TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
+//		TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
 		System.out.println("子线程：" + Thread.currentThread().getName());
 		try {
 			list.forEach(s -> {
-				String newTeacher = "TNO_" + new Random().nextInt(100);
-				familyMapper.insert(s);
+				if(oConvertUtils.isNotEmpty(s)){
+					familyMapper.insert(s);
+				}
 			});
-			dataSourceTransactionManager.commit(transactionStatus);
+//			familyMapper.insertBatch(list);
+//			dataSourceTransactionManager.commit(transactionStatus);
 			threadLatch.countDown();
 		} catch (Throwable e) {
 			e.printStackTrace();
-			dataSourceTransactionManager.rollback(transactionStatus);
+//			dataSourceTransactionManager.rollback(transactionStatus);
 		}
 	}
 
 
 	public void updateStudentWithThreads(List<Family> list) {
 		// 线程数量
-		final Integer threadCount = 1;
+		final Integer threadCount = 10;
 
 		//每个线程处理的数据量
 		final Integer dataPartionLength = (list.size() + threadCount - 1) / threadCount;
diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaHouseholdServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaHouseholdServiceImpl.java
index 6525f83..894d1b1 100644
--- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaHouseholdServiceImpl.java
+++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaHouseholdServiceImpl.java
@@ -36,7 +36,7 @@ public class GaHouseholdServiceImpl extends ServiceImpl<GaHouseholdMapper, GaHou
             System.out.println("数据查询时间" + (System.currentTimeMillis() - startTime) / 1000 + "秒");
             long startTime2 = System.currentTimeMillis();
             if (oConvertUtils.isNotEmpty(families)) {
-                families.parallelStream().forEach(g -> {
+                families.stream().forEach(g -> {
                     if (oConvertUtils.isNotEmpty(g) && oConvertUtils.isNotEmpty(g.getIdentity())) {
                         familyMap.put(g.getIdentity(), g);
                     }
diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MinorServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MinorServiceImpl.java
index 3826f92..05194c8 100644
--- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MinorServiceImpl.java
+++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MinorServiceImpl.java
@@ -2,6 +2,7 @@ package org.jeecg.modules.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import javassist.bytecode.analysis.Executor;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.system.entity.Family;
 import org.jeecg.modules.system.entity.Minor;
 import org.jeecg.modules.system.entity.SysDepart;
@@ -47,9 +48,7 @@ public class MinorServiceImpl extends ServiceImpl<MinorMapper, Minor> implements
 	@Resource
 	private TransactionDefinition transactionDefinition;
 
-
-	//分段大小
-	private int splitSize = 100000;
+	private Integer random_number=00000000;
 	
 	@Override
 	@Transactional
@@ -120,54 +119,41 @@ public class MinorServiceImpl extends ServiceImpl<MinorMapper, Minor> implements
 	}
 
 	@Override
-	public Integer insertBatch(List<Minor> list,List<SysDepart> departs) {
+	@Transactional
+	public Integer insertBatch(List<Minor> list) {
+		if(oConvertUtils.isNotEmpty(list)){
+			for(int i=0;i<list.size();i++){
+				String id=System.currentTimeMillis()+String.valueOf((random_number+i));
+				list.get(i).setId(id);
+			}
+		}
 		updateStudentWithThreads(list);
 		return list.size();
 	}
 
-	/**
-	 * 将list集合平均分成几等份
-	 *
-	 * @param num  分的份数
-	 * @param list 需要分的集合
-	 */
-	private List splitList(List list, Integer num) {
-		int listSize = list.size(); //list 长度
-		List<List> splitLists = new ArrayList<>();
-		List stringlist = new ArrayList<>();
-		for ( int i = 0; i < listSize; i++ ) {
-			stringlist.add(list.get(i));
-			if ( ((i + 1) % num == 0) || (i + 1 == listSize) ) {
-				splitLists.add(stringlist);
-				stringlist = new ArrayList<>();
-			}
-		}
-		return splitLists;
-	}
 
 	private void  addBatch(List<Minor> list, CountDownLatch threadLatch){
-		TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
+//		TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
 		System.out.println("子线程：" + Thread.currentThread().getName());
 		try {
 			list.forEach(s -> {
-				// 更新教师信息
-				// String teacher = s.getTeacher();
-				String newTeacher = "TNO_" + new Random().nextInt(100);
-//				s.setTeacher(newTeacher);
-				minorMapper.insert(s);
+				if(oConvertUtils.isNotEmpty(s)){
+					minorMapper.insert(s);
+				}
 			});
-			dataSourceTransactionManager.commit(transactionStatus);
+//			minorMapper.insertBatch(list);
+//			dataSourceTransactionManager.commit(transactionStatus);
 			threadLatch.countDown();
 		} catch (Throwable e) {
 			e.printStackTrace();
-			dataSourceTransactionManager.rollback(transactionStatus);
+//			dataSourceTransactionManager.rollback(transactionStatus);
 		}
 	}
 
 
 	public void updateStudentWithThreads(List<Minor> list) {
 		// 线程数量
-		final Integer threadCount = 1;
+		final Integer threadCount = 10;
 
 		//每个线程处理的数据量
 		final Integer dataPartionLength = (list.size() + threadCount - 1) / threadCount;
diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MrSchoolServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MrSchoolServiceImpl.java
index 37c8d19..18f81e5 100644
--- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MrSchoolServiceImpl.java
+++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MrSchoolServiceImpl.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.system.service.impl;
 
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.system.entity.Minor;
 import org.jeecg.modules.system.entity.MrSchool;
 import org.jeecg.modules.system.entity.SysDepart;
@@ -11,6 +12,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -39,58 +41,48 @@ public class MrSchoolServiceImpl extends ServiceImpl<MrSchoolMapper, MrSchool> i
     @Resource
     private TransactionDefinition transactionDefinition;
 
-    //分段大小
-    private int splitSize = 100000;
+    private Integer random_number=00000000;
+
 
     @Override
-    public Integer insertBatch(List<MrSchool> list,List<SysDepart> departs) {
+    @Transactional
+    public Integer insertBatch(List<MrSchool> list) {
+        if(oConvertUtils.isNotEmpty(list)){
+            for(int i=0;i<list.size();i++){
+                String id=System.currentTimeMillis()+String.valueOf((random_number+i));
+                list.get(i).setId(id);
+            }
+        }
         updateStudentWithThreads(list);
         return list.size();
     }
 
-    /**
-     * 将list集合平均分成几等份
-     *
-     * @param num  分的份数
-     * @param list 需要分的集合
-     */
-    private List splitList(List list, Integer num) {
-        int listSize = list.size(); //list 长度
-        List<List> splitLists = new ArrayList<>();
-        List stringlist = new ArrayList<>();
-        for ( int i = 0; i < listSize; i++ ) {
-            stringlist.add(list.get(i));
-            if ( ((i + 1) % num == 0) || (i + 1 == listSize) ) {
-                splitLists.add(stringlist);
-                stringlist = new ArrayList<>();
-            }
-        }
-        return splitLists;
-    }
+//    public static void main(String[] args){
+//        System.out.println(System.currentTimeMillis()+"00000000"+1);
+//    }
 
     private void  addBatch(List<MrSchool> list, CountDownLatch threadLatch){
-        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
+//        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
         System.out.println("子线程：" + Thread.currentThread().getName());
         try {
             list.forEach(s -> {
-                // 更新教师信息
-                // String teacher = s.getTeacher();
-                String newTeacher = "TNO_" + new Random().nextInt(100);
-//				s.setTeacher(newTeacher);
-                schoolMapper.insert(s);
+                if(oConvertUtils.isNotEmpty(s)){
+//                    s.setId();
+                    schoolMapper.insert(s);
+                }
             });
-            dataSourceTransactionManager.commit(transactionStatus);
+//            dataSourceTransactionManager.commit(transactionStatus);
             threadLatch.countDown();
         } catch (Throwable e) {
             e.printStackTrace();
-            dataSourceTransactionManager.rollback(transactionStatus);
+//            dataSourceTransactionManager.rollback(transactionStatus);
         }
     }
 
 
     public void updateStudentWithThreads(List<MrSchool> list) {
         // 线程数量
-        final Integer threadCount = 1;
+        final Integer threadCount = 10;
 
         //每个线程处理的数据量
         final Integer dataPartionLength = (list.size() + threadCount - 1) / threadCount;