提交

lifengge
1 parent e0f80c90
Showing 5 changed files with 12 additions and 8 deletions
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/FamilyServiceImpl.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaHouseholdServiceImpl.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MinorServiceImpl.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MrSchoolServiceImpl.java
@@ -90,13 +90,13 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
             System.out.println("未成年人数据批量新增总条数" + resultMinor.size());
             System.out.println("学籍信息数据批量新增总条数" + resultSchools.size());
             long startTime2 = System.currentTimeMillis();
-//            minorService.insertBatch(resultMinor,departs);
+            minorService.insertBatch(resultMinor,departs);
             System.out.println("未成年人数据批量新增所用时间" + (System.currentTimeMillis() - startTime2) / 1000 + "秒");
             long startTime1 = System.currentTimeMillis();
-//            familyService.insertBatch(resultFamily,departs);
+            familyService.insertBatch(resultFamily,departs);
             System.out.println("家庭成员数据批量新增所用时间" + (System.currentTimeMillis() - startTime1) / 1000 + "秒");
             long startTime3 = System.currentTimeMillis();
-//            schoolService.insertBatch(resultSchools,);
+            schoolService.insertBatch(resultSchools,departs);
             System.out.println("学籍信息入库时间" + (System.currentTimeMillis() - startTime3) / 1000 + "秒");
             long startTime4 = System.currentTimeMillis();
             getSourceData();
@@ -525,10 +525,10 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
                                 minor.setAddress(m.getAddress());
                             }
                             if (oConvertUtils.isNotEmpty(m.getSchool())) {
-                                minor.setAddress(m.getSchool());
+                                minor.setSchoolName(m.getSchool());
                             }
                             if (oConvertUtils.isNotEmpty(m.getAdmissionDate())) {
-                                minor.setAddress(m.getAdmissionDate());
+                                minor.setStartYear(m.getAdmissionDate());
                             }
                             minor.setIdentity(m.getIdentity());
                             minor.setCreateTime(creatTime);
@@ -75,7 +75,7 @@ public class FamilyServiceImpl extends ServiceImpl&lt;FamilyMapper, Family&gt; impleme
 	public void updateStudentWithThreads(List<Family> list) {
 		// 线程数量
-		final Integer threadCount = 15;
+		final Integer threadCount = 1;
 		//每个线程处理的数据量
 		final Integer dataPartionLength = (list.size() + threadCount - 1) / threadCount;
@@ -31,7 +31,10 @@ public class GaHouseholdServiceImpl extends ServiceImpl&lt;GaHouseholdMapper, GaHou
     public Map<String, Family> getGaHouseholds(Map<String, String> gaDemographics) {
         Map<String, Family> familyMap = new HashMap<>();
         try {
+            long startTime = System.currentTimeMillis();
             List<Family> families = gaHouseholdMapper.getGaHouseholds();
+            System.out.println("数据查询时间" + (System.currentTimeMillis() - startTime) / 1000 + "秒");
+            long startTime2 = System.currentTimeMillis();
             if (oConvertUtils.isNotEmpty(families)) {
                 families.parallelStream().forEach(g -> {
                     if (oConvertUtils.isNotEmpty(g) && oConvertUtils.isNotEmpty(g.getIdentity())) {
@@ -39,6 +42,7 @@ public class GaHouseholdServiceImpl extends ServiceImpl&lt;GaHouseholdMapper, GaHou
                     }
                 });
             }
+            System.out.println("数据处理时间" + (System.currentTimeMillis() - startTime2) / 1000 + "秒");
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -167,7 +167,7 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; implements
 	public void updateStudentWithThreads(List<Minor> list) {
 		// 线程数量
-		final Integer threadCount = 15;
+		final Integer threadCount = 1;
 		//每个线程处理的数据量
 		final Integer dataPartionLength = (list.size() + threadCount - 1) / threadCount;
@@ -90,7 +90,7 @@ public class MrSchoolServiceImpl extends ServiceImpl&lt;MrSchoolMapper, MrSchool&gt; i
     public void updateStudentWithThreads(List<MrSchool> list) {
         // 线程数量
-        final Integer threadCount = 15;
+        final Integer threadCount = 1;
         //每个线程处理的数据量
         final Integer dataPartionLength = (list.size() + threadCount - 1) / threadCount;