From e9b990b1885c10d7b35f610a115feef56b3db016 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 03 Jul 2024 19:02:24 +0800
Subject: [PATCH] 代码优化

---
 src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 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 2ff5910..5562c6f 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;
@@ -113,6 +114,7 @@
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
+	@DS("slave_1")
 	public boolean SynchronizeData(EcOrderParamDTO ecOrderParamDTO) {
 		processPages(100, ecOrderParamDTO);
 		return true;
@@ -120,25 +122,34 @@
 
 	public void processPages(int pageSize, EcOrderParamDTO ecOrderParamDTO) {
 		QueryWrapper<EcOrder> ecOrderQueryWrapper = new QueryWrapper<>();
-		ecOrderQueryWrapper.between("import_time", ecOrderParamDTO.getStartTime(), ecOrderParamDTO.getEndTime());
-		long count = baseMapper.selectCount(ecOrderQueryWrapper);
+		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 = 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 -> {
 				// 点落面 设置警格网格信息
 				setGridInfo(ecOrderEntity);
 			});
-			boolean b = ecOrderService.saveBatch(recordEntityList);
+			boolean b = saveEcOrder(recordEntityList);
 			System.out.println("更新第" + pageNum + "页" + b);
 		}
 	}
 
+	@Override
+	@DS("master")
+	public boolean saveEcOrder(List<ECallEventTwoEntity> recordEntityList) {
+		return ecOrderService.saveOrUpdateBatch(recordEntityList);
+	}
+
+
 	/**
 	 * 设置警格网格信息
 	 *

--
Gitblit v1.9.3