diff --git a/src/main/java/com/xydl/cac/entity/constants/Constants.java b/src/main/java/com/xydl/cac/entity/constants/Constants.java index f9a133d..08fe4ef 100644 --- a/src/main/java/com/xydl/cac/entity/constants/Constants.java +++ b/src/main/java/com/xydl/cac/entity/constants/Constants.java @@ -22,4 +22,6 @@ public class Constants { public static String DateTime = "datetime"; public static String Miss = "miss"; + public static final Integer I2BatchSize = 500; + } diff --git a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java index dd241ad..f434504 100644 --- a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java @@ -26,6 +26,8 @@ import java.util.Date; import java.util.List; import java.util.Map; +import static com.xydl.cac.entity.constants.Constants.I2BatchSize; + @Service @Slf4j @Transactional(rollbackFor = Exception.class) @@ -263,7 +265,7 @@ public class DataServiceImpl implements DataService { @Override public List> getLatestData(String tableName, Integer devId, List points, Date start) throws Exception { ConditionModel model = new ConditionModel(); - model.setPageSize(500); + model.setPageSize(I2BatchSize); model.setPageNum(1); model.setStartTime(start); model.setExcludeStartTime(true); diff --git a/src/main/java/com/xydl/cac/task/I2syncTask.java b/src/main/java/com/xydl/cac/task/I2syncTask.java index b7e890d..17c8cf0 100644 --- a/src/main/java/com/xydl/cac/task/I2syncTask.java +++ b/src/main/java/com/xydl/cac/task/I2syncTask.java @@ -22,6 +22,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import static com.xydl.cac.entity.constants.Constants.I2BatchSize; + @Service @Slf4j public class I2syncTask { @@ -135,7 +137,7 @@ public class I2syncTask { log.info("I2syncTask.syncOneSensor 同步导出" + sensor.getName() + "(" + sensor.getSensorCode() + ") " + count + "条数据,最后数据时间" + DateUtil.format(record.getLastDTime())); - if (count >= 1000) { + if (count >= I2BatchSize) { dataList.clear(); this.syncOneSensor(sensor, config, fieldList, points); }