From fee8fbb72f73cc11075b07bf457ce2dd2a9ce19e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 05 Jul 2024 11:15:47 +0800
Subject: [PATCH] 无诈代码优化

---
 src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 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 18e4ac9..6481e39 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
@@ -113,8 +113,6 @@
 	}
 
 	@Override
-	@Transactional(rollbackFor = Exception.class)
-	@DS("slave_1")
 	public boolean SynchronizeData(EcOrderParamDTO ecOrderParamDTO) {
 		processPages(100, ecOrderParamDTO);
 		return true;
@@ -122,25 +120,30 @@
 
 	public void processPages(int pageSize, EcOrderParamDTO ecOrderParamDTO) {
 		QueryWrapper<EcOrder> ecOrderQueryWrapper = new QueryWrapper<>();
-		ecOrderQueryWrapper.between("import_time", ecOrderParamDTO.getStartTime(), ecOrderParamDTO.getEndTime());
+		if (ecOrderParamDTO.getStartTime() != null) {
+			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 = page(page, objectQueryWrapper);
+			IPage<EcOrder> resultPage = baseMapper.selectPage(page, objectQueryWrapper);
 			List<EcOrder> records = resultPage.getRecords();
 			List<ECallEventTwoEntity> recordEntityList = BeanUtil.copy(records, ECallEventTwoEntity.class);
-			recordEntityList.forEach(ecOrderEntity -> {
-				// 点落面 设置警格网格信息
-				setGridInfo(ecOrderEntity);
-			});
-			boolean b = ecOrderService.saveBatch(recordEntityList);
+			boolean b = ecOrderService.saveOrUpdateBatch(recordEntityList);
 			System.out.println("更新第" + pageNum + "页" + b);
 		}
 	}
 
+	@Override
+	@DS("master")
+	public boolean saveEcOrder(List<ECallEventTwoEntity> recordEntityList) {
+		return false;
+	}
+
+
 	/**
 	 * 设置警格网格信息
 	 *

--
Gitblit v1.9.3