From 5b17ccbbe08971f861ff097c62241d2b79e4b5f6 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 16 六月 2023 15:34:41 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java | 14 ++++++-
src/main/resources/application-scheduled.yml | 8 ++--
src/main/java/com/yssh/scheduled/ReadCsvTask.java | 25 +++++++-----
src/main/java/com/yssh/service/impl/DictRecordServiceImpl.java | 12 ++++--
src/main/resources/application-file.yml | 2
src/main/java/com/yssh/service/IDictRecordService.java | 16 ++++++-
6 files changed, 53 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/yssh/scheduled/ReadCsvTask.java b/src/main/java/com/yssh/scheduled/ReadCsvTask.java
index cd76a01..4c984bb 100644
--- a/src/main/java/com/yssh/scheduled/ReadCsvTask.java
+++ b/src/main/java/com/yssh/scheduled/ReadCsvTask.java
@@ -49,7 +49,7 @@
private int cronMax = 48;
@Value("${csv.voc_max}")
- private int vocMax = 192;
+ private int vocMax = 120;
private final static List<String> md5List = new ArrayList<>();
@@ -88,7 +88,7 @@
try {
logger.info("loadVocSync: " + filePath);
- Date date = (Date)calendar.getTime().clone();
+ Date date = (Date) calendar.getTime().clone();
EasyCsv.read(filePath, VocVals.class, new VocParser(vocValsService, date)).doRead();
// Thread.sleep(3 * 1000);
@@ -127,18 +127,23 @@
}
suYuanService.createNewTable(newTableName);
- dictRecordService.insertDictRecord(new DictRecord(1L, newTableName, Long.parseLong(time), ""));
+
+ Long createTime = Long.parseLong(time);
+ DictRecord dr = dictRecordService.selectByCreateTime(createTime);
+ if (null == dr) {
+ dictRecordService.insertDictRecord(new DictRecord(1L, newTableName, Long.parseLong(time), ""));
+ }
logger.info("loadCsvSync: " + filePath);
EasyCsv.read(filePath, SuYuan.class, new CsvParser(suYuanService, time)).doRead();
- try {
- // 璁＄畻棰勮/鎶ヨ,骞朵笖杩涜鍏ュ簱鎿嶄綔
- Thread.sleep(2 * 60 * 1000);
- } catch (InterruptedException e) {
- logger.error("鐫＄湢涓�鍒嗛挓鍚庢墽琛岄璀�/鎶ヨ璁＄畻,骞朵笖杩涜鍏ュ簱鎿嶄綔鍑虹幇寮傚父锛屽紓甯稿師鍥犳槸锛�", e);
- e.printStackTrace();
- }
+// try {
+// // 璁＄畻棰勮/鎶ヨ,骞朵笖杩涜鍏ュ簱鎿嶄綔
+// Thread.sleep(2 * 60 * 1000);
+// } catch (InterruptedException e) {
+// logger.error("鐫＄湢涓�鍒嗛挓鍚庢墽琛岄璀�/鎶ヨ璁＄畻,骞朵笖杩涜鍏ュ簱鎿嶄綔鍑虹幇寮傚父锛屽紓甯稿師鍥犳槸锛�", e);
+// e.printStackTrace();
+// }
warningAnalyseService.warningOperationStorage(calendar.getTime());
}
}
diff --git a/src/main/java/com/yssh/service/IDictRecordService.java b/src/main/java/com/yssh/service/IDictRecordService.java
index 211732b..d9ed630 100644
--- a/src/main/java/com/yssh/service/IDictRecordService.java
+++ b/src/main/java/com/yssh/service/IDictRecordService.java
@@ -2,7 +2,6 @@
import com.yssh.entity.DictRecord;
-import java.util.Date;
import java.util.List;
/**
@@ -15,21 +14,31 @@
/**
* 鏌ヨ瀛楀吀璁板綍鍒楄〃
+ *
* @param dictRecord 瀛楀吀璁板綍
* @return 瀛楀吀璁板綍闆嗗悎
*/
public List<DictRecord> selectDictRecordList(DictRecord dictRecord);
-
+
+ /**
+ * 鏍规嵁鍒涘缓鏃堕棿鏌ヨ
+ *
+ * @param createTime
+ * @return
+ */
+ public DictRecord selectByCreateTime(Long createTime);
+
/**
* 鏂板瀛楀吀璁板綍
+ *
* @param dictRecord 瀛楀吀璁板綍
* @return 缁撴灉
*/
public int insertDictRecord(DictRecord dictRecord);
-
/**
* 鎵归噺鍒犻櫎瀛楀吀璁板綍
+ *
* @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
* @return 缁撴灉
*/
@@ -37,6 +46,7 @@
/**
* 鍒犻櫎瀛楀吀璁板綍淇℃伅
+ *
* @param id 瀛楀吀璁板綍ID
* @return 缁撴灉
*/
diff --git a/src/main/java/com/yssh/service/impl/DictRecordServiceImpl.java b/src/main/java/com/yssh/service/impl/DictRecordServiceImpl.java
index c99aa7d..995eaad 100644
--- a/src/main/java/com/yssh/service/impl/DictRecordServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/DictRecordServiceImpl.java
@@ -1,17 +1,17 @@
package com.yssh.service.impl;
-import java.util.Date;
import java.util.List;
import lombok.Synchronized;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.yssh.dao.DictRecordMapper;
import com.yssh.entity.DictRecord;
import com.yssh.service.IDictRecordService;
+
+import javax.annotation.Resource;
/**
* 瀛楀吀璁板綍Service涓氬姟灞傚鐞�
@@ -20,8 +20,7 @@
*/
@Service
public class DictRecordServiceImpl implements IDictRecordService {
-
- @Autowired
+ @Resource
private DictRecordMapper dictRecordMapper;
/**
@@ -35,6 +34,11 @@
return dictRecordMapper.selectDictRecordList(dictRecord);
}
+ @Override
+ public DictRecord selectByCreateTime(Long createTime) {
+ return dictRecordMapper.selectByCreateTime(createTime);
+ }
+
/**
* 鏂板瀛楀吀璁板綍
*
diff --git a/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java b/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java
index 08231d2..37e65d5 100644
--- a/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java
@@ -48,9 +48,9 @@
private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHH");
//@Transactional
- @Override
+ //@Override
@Async("threadPoolTaskExecutor")
- public void insertSuYuanDatas(List<SuYuan> lists, String time) throws Exception {
+ public void insertSuYuanDatasAsync(List<SuYuan> lists, String time) throws Exception {
//鎻掑叆鏁版嵁
List<List<SuYuan>> list = Lists.partition(lists, IAsyncService.BATCH_INSERT_NUMBER);
CountDownLatch countDownLatch = new CountDownLatch(list.size());
@@ -62,6 +62,16 @@
}
@Override
+ public void insertSuYuanDatas(List<SuYuan> lists, String time) {
+ List<List<SuYuan>> subLists = Lists.partition(lists, IAsyncService.BATCH_INSERT_NUMBER);
+ for (List<SuYuan> sub : subLists) {
+ suYuanMapper.batchInsert(TableStrategy.getTableStrategy(time), sub);
+ }
+
+ logger.info("------ " + time + ".csv锛�" + lists.size() + " 鏉℃暟鎹凡鍏ュ簱 ------");
+ }
+
+ @Override
public Integer isTableExists(String tableName) {
return suYuanMapper.isTableExists(tableName);
}
diff --git a/src/main/resources/application-file.yml b/src/main/resources/application-file.yml
index 464c7ef..c643df4 100644
--- a/src/main/resources/application-file.yml
+++ b/src/main/resources/application-file.yml
@@ -4,5 +4,5 @@
filePath3d: 'D:\2022\dat\correct_jk_47.dat'
#csv閰嶇疆璺緞
csv:
- filePath: 'D:\2022\yssh'
+ filePath: 'D:\2022\lbm'
vocPath: 'D:\2022\voc_all'
diff --git a/src/main/resources/application-scheduled.yml b/src/main/resources/application-scheduled.yml
index 2b78e25..6952ca7 100644
--- a/src/main/resources/application-scheduled.yml
+++ b/src/main/resources/application-scheduled.yml
@@ -1,5 +1,5 @@
csv:
- cron: '0 1 * * * ? '
- voc: '0 41 * * * ? '
- cron_max: 192
- voc_max: 48
+ cron: '0 33 * * * ? '
+ voc: '0 31 * * * ? '
+ cron_max: 120
+ voc_max: 384
--
Gitblit v1.9.3