From 41c8dd06fe3218e54314a58544d7cefe732fbdfb Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Mon, 22 Apr 2024 16:52:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/impl/SkxsQkTjServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 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..4745bb7 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");
@@ -173,6 +176,8 @@
SkxsQkTj skxs = baseMapper.selectSkxsQkTjBy(res_cd,jsonArray.getJSONObject(i).getString("res_nm"),skxsQkTj.getQueryTime());
if (null!=skxs){
// 跳出本次循环
+ setSkxsQkTjInfo(skxs,jsonArray,i,skxsQkTj.getQueryTime());
+ updateById(skxs);
continue;
}
SkxsQkTj qkTj = new SkxsQkTj();
@@ -181,8 +186,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 +225,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