From 6a58ea0db0bc74f70933ca266d375afd0c287aae Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 24 Nov 2023 17:57:05 +0800
Subject: [PATCH] 蓄水量日报

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/impl/SkxsQkTjServiceImpl.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/impl/SkxsQkTjServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/impl/SkxsQkTjServiceImpl.java
index 8fd9b53..8fcc025 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/impl/SkxsQkTjServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/impl/SkxsQkTjServiceImpl.java
@@ -18,6 +18,7 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -29,6 +30,8 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 
 /**
  * @ClassName SkxsQkTjServiceImpl
@@ -153,7 +156,7 @@
 	 * @param skxsQkTj
 	 */
 	@Override
-	public void saveOrUpdateData(SkxsQkTjVO skxsQkTj) {
+	public String saveOrUpdateData(SkxsQkTjVO skxsQkTj) {
 		// 参数拼接
 		StringBuilder builder = new StringBuilder("?");
 		builder.append("pageNo=1").append("&pageSize=1000");
@@ -181,8 +184,14 @@
 			// 加入集合
 			list.add(qkTj);
 		}
+		//手动去重(需要服务去重)
+		List<SkxsQkTj> distinceList = list.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(p -> p.getResCode()))), ArrayList::new));
 		// 批量插入
-		saveBatch(list);
+		saveBatch(distinceList);
+
+
+		return "中台数据数量:"+jsonArray.size()+",数据库插入数量:"+distinceList.size();
+
 	}
 
 	/**
@@ -214,7 +223,7 @@
 		skxs.setLastYearWs(jsonArray.getJSONObject(i).getDouble("last_year_cap"));
 		skxs.setHisWs(jsonArray.getJSONObject(i).getDouble("avg_cap"));
 		skxs.setUpMonthWs(jsonArray.getJSONObject(i).getDouble("last_month_cap"));
-		skxs.setTotalWsDif(jsonArray.getJSONObject(i).getString("diff_his"));
+		skxs.setTotalWsDif(jsonArray.getJSONObject(i).getDouble("diff_his"));
 	}
 
 	/**

--
Gitblit v1.9.3