liujc hai 1 ano
pai
achega
967ce43a6c

+ 3 - 3
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImGroup.java

@@ -34,7 +34,7 @@ public class ImGroup extends BaseEntity {
 	/** 乐团群 MUSIC,班级群 CLASS,训练营 TRAINING 学校SCHOOL*/
 	private String type;
 
-	private String importFlag;
+	private Boolean importFlag;
 
 	public enum GroupTypeEnum implements BaseEnum<String,GroupTypeEnum> {
 		NORMAL("NORMAL", "普通班级", "https://oss.dayaedu.com/default-images/mec/NORMAL.png"),
@@ -196,11 +196,11 @@ public class ImGroup extends BaseEntity {
 		return this.updateTime;
 	}
 
-	public String getImportFlag() {
+	public Boolean getImportFlag() {
 		return importFlag;
 	}
 
-	public void setImportFlag(String importFlag) {
+	public void setImportFlag(Boolean importFlag) {
 		this.importFlag = importFlag;
 	}
 

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImGroupPlus.java

@@ -71,7 +71,7 @@ public class ImGroupPlus implements Serializable {
 
 
     @TableField(value = "import_flag_")
-    private String importFlag;
+    private Boolean importFlag;
 
     //群类型
     @TableField(value = "group_type_")

+ 6 - 6
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupServiceImpl.java

@@ -899,8 +899,12 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         queryInfo.setImportFlag(false);
         PageInfo<ImGroup> imGroupPageInfo = this.queryPage(queryInfo);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        int total = imGroupPageInfo.getTotal();
         int importImGroupCount = 0;
-        while (!imGroupPageInfo.getRows().isEmpty()) {
+        int num = (int) Math.ceil(total / 100);
+        for (int i = 0; i <=num ; i++) {
+
+            imGroupPageInfo = this.queryPage(queryInfo);
             List<ImGroup> rows = imGroupPageInfo.getRows();
             try {
                 if (StringUtils.isNotEmpty(startTime)) {
@@ -923,11 +927,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             groupTransfer(rows);
             importImGroupCount += rows.size();
             log.info("------------------------------- import im group --------------------------------------------");
-            log.info("import im group success count:{}/{}", importImGroupCount, imGroupPageInfo.getTotal());
-
-            page++;
-            queryInfo.setPage(page);
-            imGroupPageInfo = this.queryPage(queryInfo);
+            log.info("import im group success count:{}/{}", importImGroupCount, total);
         }
         log.info("-------------------- import im group finished and success! -------------------------------");
     }