From 2ac772b03ecc56547e727b772049a07dcc6735f1 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 05 Jul 2024 11:16:09 +0800
Subject: [PATCH] 代码优化

---
 src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 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 6481e39..73c37b8 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
@@ -4,8 +4,10 @@
 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.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,10 +25,10 @@
 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;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -120,7 +122,7 @@
 
 	public void processPages(int pageSize, EcOrderParamDTO ecOrderParamDTO) {
 		QueryWrapper<EcOrder> ecOrderQueryWrapper = new QueryWrapper<>();
-		if (ecOrderParamDTO.getStartTime() != null) {
+		if (StringUtils.isNotBlank(ecOrderParamDTO.getStartTime()) && StringUtils.isNotEmpty(ecOrderParamDTO.getEndTime())) {
 			ecOrderQueryWrapper.between("import_time", ecOrderParamDTO.getStartTime(), ecOrderParamDTO.getEndTime());
 		}
 		long count = count(ecOrderQueryWrapper);
@@ -132,7 +134,19 @@
 			IPage<EcOrder> resultPage = baseMapper.selectPage(page, objectQueryWrapper);
 			List<EcOrder> records = resultPage.getRecords();
 			List<ECallEventTwoEntity> recordEntityList = BeanUtil.copy(records, ECallEventTwoEntity.class);
-			boolean b = ecOrderService.saveOrUpdateBatch(recordEntityList);
+			List<ECallEventTwoEntity> arrayList = new ArrayList<>();
+			// 过滤出已同步的订单
+			recordEntityList.forEach(record -> {
+				long count1 = ecOrderService.count(Wrappers.<ECallEventTwoEntity>lambdaQuery().eq(ECallEventTwoEntity::getOrderId, record.getOrderId()));
+				if (count1 == 0) {
+					arrayList.add(record);
+				}
+			});
+			// 同步订单
+			boolean b = false;
+			if (arrayList.size() > 0) {
+				b = ecOrderService.saveOrUpdateBatch(arrayList);
+			}
 			System.out.println("更新第" + pageNum + "页" + b);
 		}
 	}

--
Gitblit v1.9.3