From 6e797b6bf65719823a20066f14344e180aff2e33 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 05 十一月 2023 10:55:07 +0800
Subject: [PATCH] 修改CSV数据入库
---
说明.txt | 4 ++--
src/main/java/com/yssh/service/SuYuanService.java | 7 +++++++
src/main/java/com/yssh/utils/CsvParser.java | 15 ++++++++++++---
src/main/resources/application-file.yml | 2 +-
4 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/yssh/service/SuYuanService.java b/src/main/java/com/yssh/service/SuYuanService.java
index 8ddd0e5..418c959 100644
--- a/src/main/java/com/yssh/service/SuYuanService.java
+++ b/src/main/java/com/yssh/service/SuYuanService.java
@@ -47,8 +47,15 @@
@Resource
private LocationService locService;
+ @Resource
+ private AlertConfigMapper alertConfigMapper;
+
private static HashMap<String, String> sites = new HashMap<>();
+ public double getJcyj() {
+ return alertConfigMapper.getAll().get(0).getJcyj();
+ }
+
//@Transactional
@Async("threadPoolTaskExecutor")
public void insertSuYuanDatasAsync(List<SuYuan> lists, String time) throws Exception {
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; // 瑙ｅ喅涓婚敭閲嶅
+ }*/
+ 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) {
diff --git a/src/main/resources/application-file.yml b/src/main/resources/application-file.yml
index c35204b..6bd846f 100644
--- a/src/main/resources/application-file.yml
+++ b/src/main/resources/application-file.yml
@@ -4,7 +4,7 @@
filePath3d: E:\yssh_data\dat\correct_jk_47.dat
#csv閰嶇疆璺緞
csv:
- filePath: F:\0911\LBM-NEW
+ filePath: E:\yssh_data\LBM-NEW
vocPath: E:\yssh_data\VOC_ALL
#鏃�/鍛�/鏈堟姤璺緞
report:
diff --git "a/\350\257\264\346\230\216.txt" "b/\350\257\264\346\230\216.txt"
index 3f01a2c..4a6dfa3 100644
--- "a/\350\257\264\346\230\216.txt"
+++ "b/\350\257\264\346\230\216.txt"
@@ -1,4 +1,4 @@
--------------------------------------------------------------------------------
+------------------------------------------------------------------------------- 0-4灞�
http://192.168.20.228:8082/yssh/warning/runWarning?start=2023-08-08+00:00:00&end=2023-08-09+00:00:00
http://192.168.20.228:8082/yssh/suYuan/get100?name=AI-10&date=2023-08-08+23:00:00
@@ -29,7 +29,7 @@
2.澶栫綉浜戠櫥褰曟柟寮忥細
>1.鐧诲綍澶栫綉浜戯紝鐢ㄦ埛鍚嶆槸maxy628 123.114.233.55锛岃緭鍏ラ獙璇佺爜锛宲assd123!@#..
>2.杩涘叆浜戞闈� 锛屾祻瑙堝櫒璁块棶10.101.3.183 杩涘叆鍫″瀿鏈虹郴缁�
- 鐢ㄦ埛璐﹀彿锛歮axy628.yssh 瀵嗙爜锛歽ssh1234@#..锛寉ssh1234@#628
+ 鐢ㄦ埛璐﹀彿锛歮axy628.yssh 瀵嗙爜锛歽ssh1234@#..锛寉ssh1234@#628.
>3. 鍏ㄥ眬鎼滅储 98銆�101銆�102銆�103锛寉ssh123!@#..
3.瀹㈡埛绔湴鍧�锛�
--
Gitblit v1.9.3