From 6e797b6bf65719823a20066f14344e180aff2e33 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 05 十一月 2023 10:55:07 +0800
Subject: [PATCH] 修改CSV数据入库

---
 src/main/java/com/yssh/utils/CsvParser.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/yssh/utils/CsvParser.java b/src/main/java/com/yssh/utils/CsvParser.java
index ff9c396..a5ec335 100644
--- a/src/main/java/com/yssh/utils/CsvParser.java
+++ b/src/main/java/com/yssh/utils/CsvParser.java
@@ -3,18 +3,22 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.yssh.entity.AlertConfig;
 import com.yssh.entity.SuYuan;
+import com.yssh.mapper.AlertConfigMapper;
 import com.yssh.service.SuYuanService;
 
 import com.github.biyanwen.impl.AbstractCsvFileParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.Resource;
+
 public class CsvParser extends AbstractCsvFileParser<SuYuan> {
 	protected final Logger logger = LoggerFactory.getLogger(this.getClass());
 
 	/**
-	 * 姣忛殧3000鏉″瓨鍌ㄦ暟鎹簱锛岀劧鍚庢竻鐞唋ist 锛屾柟渚垮唴瀛樺洖鏀�
+	 * 姣忛殧100000鏉″瓨鍌ㄦ暟鎹簱锛岀劧鍚庢竻鐞唋ist 锛屾柟渚垮唴瀛樺洖鏀�
 	 */
 	public static final int BATCH_COUNT = 100000;
 
@@ -27,9 +31,12 @@
 
 	private String time;
 
+	private double jcyj;
+
 	public CsvParser(SuYuanService suYuanService, String time) {
 		this.suYuanService = suYuanService;
 		this.time = time;
+		this.jcyj = suYuanService.getJcyj();
 	}
 
 	/**
@@ -46,11 +53,13 @@
 
 	protected void invoke(SuYuan t) {
 		t.setId(t.getX() + "_" + t.getY() + "_" + t.getZ());
-		if ("0_0_0".equals(t.getId())) {
+		/*if ("0_0_0".equals(t.getId())) {
 			return; // 瑙e喅涓婚敭閲嶅
+		}*/
+		if (t.getZ() > 0 && t.getC() < jcyj) {
+			return; // 鍙叆绗�0灞傛暟鎹�+Voc鍊煎ぇ浜�1
 		}
 
-		//System.err.println(t.getId());
 		cachedData.add(t);
 		// 杈惧埌BATCH_COUNT浜嗭紝闇�瑕佸幓瀛樺偍涓�娆℃暟鎹簱锛岄槻姝㈡暟鎹嚑涓囨潯鏁版嵁鍦ㄥ唴瀛橈紝瀹规槗OOM
 		if (cachedData.size() >= BATCH_COUNT) {

--
Gitblit v1.9.3