From 96916fb34cdc4907a194d0bafae22a5e2bf378bf Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Tue, 02 Jul 2024 17:40:20 +0800
Subject: [PATCH] 获取楼盘相关集合数据查询调整(改成sql会导致内存溢出)

---
 src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java b/src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java
index 7639b48..18e4ac9 100644
--- a/src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java
+++ b/src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java
@@ -1,6 +1,7 @@
 package org.springblade.modules.eCallEventTwo.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -22,6 +23,7 @@
 import org.springblade.modules.police.service.IPoliceAffairsGridService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -111,19 +113,23 @@
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
+	@DS("slave_1")
 	public boolean SynchronizeData(EcOrderParamDTO ecOrderParamDTO) {
 		processPages(100, ecOrderParamDTO);
 		return true;
 	}
 
 	public void processPages(int pageSize, EcOrderParamDTO ecOrderParamDTO) {
-		long count = count(new QueryWrapper<>());
+		QueryWrapper<EcOrder> ecOrderQueryWrapper = new QueryWrapper<>();
+		ecOrderQueryWrapper.between("import_time", ecOrderParamDTO.getStartTime(), ecOrderParamDTO.getEndTime());
+		long count = count(ecOrderQueryWrapper);
 		int totalPages = (int) Math.ceil((double) count / pageSize); // 计算总页数
 
 		for (int pageNum = 1; pageNum <= totalPages; pageNum++) {
 			Page<EcOrder> page = new Page<>(pageNum, pageSize);
 			QueryWrapper<EcOrder> objectQueryWrapper = new QueryWrapper<>();
-			IPage<EcOrder> resultPage = baseMapper.selectPage(page, objectQueryWrapper);
+			IPage<EcOrder> resultPage = page(page, objectQueryWrapper);
 			List<EcOrder> records = resultPage.getRecords();
 			List<ECallEventTwoEntity> recordEntityList = BeanUtil.copy(records, ECallEventTwoEntity.class);
 			recordEntityList.forEach(ecOrderEntity -> {

--
Gitblit v1.9.3