From 2bacd2670e0f1b495e9cfda6023d8bccc32a5572 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期一, 11 三月 2024 16:23:28 +0800
Subject: [PATCH] 数据大屏剩余接口
---
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsSceneryOperationDataServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsSceneryOperationDataServiceImpl.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsSceneryOperationDataServiceImpl.java
index f107c12..f473ee3 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsSceneryOperationDataServiceImpl.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsSceneryOperationDataServiceImpl.java
@@ -127,21 +127,25 @@
@Override
public String importExcel(List<RsSceneryOperationData> list) {
- List<String> sceneryInfoNames = new ArrayList<>();
+ Set<String> sceneryInfoNames = new HashSet<>();
// 鏌ヨ鏁版嵁搴撴槸鍚﹀瓨鍦ㄥ鍏ョ殑鏅尯
Map<String, RsSceneryInfo> sceneryInfoMap = sceneryInfoMapper.selectList().stream()
.collect(Collectors.toMap(RsSceneryInfo::getSceneryName, Function.identity()));
for (RsSceneryOperationData operationData : list) {
String sceneryName = operationData.getSceneryInfoName();
RsSceneryInfo sceneryInfo = sceneryInfoMap.get(sceneryName);
+ // 鏅尯宸插瓨鍦紝姝ｅ父瀵煎叆锛岄粯璁ょ鐢�
if (sceneryInfo != null) {
operationData.setSceneryInfoId(sceneryInfo.getId());
+ operationData.setPeriod(operationData.getPeriodDate().length() > 4 ? 1L : 2L);
+ operationData.setCreateTime(new Date());
+ operationData.setStatus(2L);
} else {
sceneryInfoNames.add(operationData.getSceneryInfoName());
}
}
if (!sceneryInfoNames.isEmpty()) {
- return "寰堟姳姝夛紝瀵煎叆澶辫触锛�" + String.join("銆�", sceneryInfoNames) + "鏅尯涓嶅瓨鍦紝璇峰墠寰�銆愭櫙鍖洪厤缃�戞坊鍔犲悗閲嶈瘯锛�";
+ return "寰堟姳姝夛紝瀵煎叆澶辫触锛�" + String.join("銆�", "<" + sceneryInfoNames + ">") + "鏅尯涓嶅瓨鍦紝璇峰墠寰�銆愭櫙鍖洪厤缃�戞坊鍔犲悗閲嶈瘯锛�";
}
baseMapper.insertBatch(list);
return "鎭枩鎮紝鏁版嵁宸插叏閮ㄥ鍏ユ垚鍔燂紒鍏�" + list.size() + "鏉★紒";
--
Gitblit v1.8.0